Changeset 369

Timestamp:

03/31/12 05:20:22 (8 years ago)

Author:

sc

Message:

• 0.8.0 release

Location:

trunk

Files:

• Puzzlebox-Synapse.nsi (modified) (3 diffs)
• Puzzlebox/Synapse/Emotiv/Client.py (modified) (1 diff)
• Puzzlebox/Synapse/Interface.py (modified) (2 diffs)
• scripts/build-debug-exe.bat (modified) (1 diff)
• scripts/build-exe.bat (modified) (2 diffs)

trunk/Puzzlebox-Synapse.nsi

@@ -4 +4 @@
 
 Name "Puzzlebox Synapse"
-OutFile "Puzzlebox-Synapse-0.5.2-setup.exe"
+OutFile "Puzzlebox-Synapse-0.8.0-setup.exe"
 
 ; Some default compiler settings (uncomment and change at will):
@@ -38 +38 @@
 ; File dist\synapse-server.exe
 ; File dist\w9xpopen.exe
+ File dist\Puzzlebox.Synapse.Emotiv.Protocol.pyd
 
 
@@ -1359 +1360 @@
  Delete $INSTDIR\synapse-gui.exe
  Delete $INSTDIR\puzzlebox_synapse_configuration.ini
+ Delete $INSTDIR\Puzzlebox.Synapse.Emotiv.Protocol.pyd
 
  Delete $INSTDIR\bz2.pyd

trunk/Puzzlebox/Synapse/Emotiv/Client.py

@@ -92 +92 @@
         def configureNetwork(self):
                 
+                print self.server_port
+                
                 if emotiv_protocol != None:
                         

trunk/Puzzlebox/Synapse/Interface.py

@@ -543 +543 @@
                 #server_host = configuration.EMOTIV_SERVER_HOST
                 
-                if device_address == 'Emotiv EPOC':
+                if device_address == 'Emotiv Control Panel':
                         #server_port = configuration.EMOTIV_SERVER_PORT_CONTROL_PANEL
                         device_address = configuration.EMOTIV_SERVER_PORT_CONTROL_PANEL
@@ -1261 +1261 @@
                         
                         devices.insert(0, 'EmoComposer')
-                        devices.insert(0, 'Emotiv Headset')
+                        devices.insert(0, 'Emotiv Control Panel')
                 
                 

trunk/scripts/build-debug-exe.bat

@@ -5 +5 @@
 
 rem ***Output to Console for Debugging
-\Python27\Scripts\cxfreeze synapse-gui.py --compress --target-dir dist --base-name Console --include-modules PySide.QtNetwork --icon=images\puzzlebox.ico
+\Python27\Scripts\cxfreeze synapse-gui.py --compress --target-dir dist --base-name Console --include-modules PySide.QtNetwork,serial.win32 --icon=images\puzzlebox.ico
 
 rem ***GUI Mode only for Distribution
-rem \Python27\Scripts\cxfreeze synapse-gui.py --compress --target-dir dist --base-name Win32GUI --include-modules PySide.QtNetwork --icon=images\puzzlebox.ico
+rem \Python27\Scripts\cxfreeze synapse-gui.py --compress --target-dir dist --base-name Win32GUI --include-modules PySide.QtNetwork,serial.win32 --icon=images\puzzlebox.ico
 
 

trunk/scripts/build-exe.bat

@@ -5 +5 @@
 
 rem ***Output to Console for Debugging
-rem \Python27\Scripts\cxfreeze synapse-gui.py --compress --target-dir dist --base-name Console --include-modules PySide.QtNetwork --icon=images\puzzlebox.ico
+rem \Python27\Scripts\cxfreeze synapse-gui.py --compress --target-dir dist --base-name Console --include-modules PySide.QtNetwork,serial.win32 --icon=images\puzzlebox.ico
 
 rem ***GUI Mode only for Distribution
-\Python27\Scripts\cxfreeze synapse-gui.py --compress --target-dir dist --base-name Win32GUI --include-modules PySide.QtNetwork --icon=images\puzzlebox.ico
+\Python27\Scripts\cxfreeze synapse-gui.py --compress --target-dir dist --base-name Win32GUI --include-modules PySide.QtNetwork,serial.win32 --icon=images\puzzlebox.ico
 
 
@@ -14 +14 @@
 rem \Python27\python.exe \Development\pyinstaller-1.5.1\Makespec.py --onefile --windowed --icon=images\puzzlebox.ico --name=PuzzleboxSynapse synapse-gui.py
 
-\Python27\python.exe \Development\pyinstaller-1.5.1\Build.py PuzzleboxSynapse.spec
+rem \Python27\python.exe \Development\pyinstaller-1.5.1\Build.py PuzzleboxSynapse.spec