Changeset 332

Timestamp:

03/25/12 10:35:25 (9 years ago)

Author:

sc

Message:

• Inital connection to EmoComposer? successful

Location:

trunk/Puzzlebox/Synapse

Files:

• Emotiv/Protocol.py (modified) (4 diffs)
• Interface.py (modified) (1 diff)

trunk/Puzzlebox/Synapse/Emotiv/Protocol.py

@@ -7 +7 @@
 """
 
+import os
+
+#import Configuration as configuration
+ENABLE_PYSIDE = True
+
+#if configuration.ENABLE_PYSIDE:
+if ENABLE_PYSIDE:
+        try:
+                import PySide as PyQt4
+                from PySide import QtCore, QtGui, QtNetwork
+        except Exception, e:
+                print "ERROR: Exception importing PySide:",
+                print e
+                configuration.ENABLE_PYSIDE = False
+        else:
+                print "INFO: [Synapse:Interface] Using PySide module"
+
+else:
+        print "INFO: [Synapse:Interface] Using PyQt4 module"
+        from PyQt4 import QtCore, QtGui, QtNetwork
+
+
+os.environ['PATH'].join( \
+        os.path.join(os.getcwd(), 'Puzzlebox', 'Synapse', 'Emotiv'))
+
+
 from PyEpoc import *
-
-#####################################################################
-# Globals
-#####################################################################
-
-UserID = 0
 
 EmotivEngine = EpocHandler()
@@ -21 +41 @@
 EmotivEngine.ES_Init(statehandle)
 
+
+#####################################################################
+# Globals
+#####################################################################
+
+DEBUG = 1
+
+UserID = 0
+
+DEFAULT_CHOICE = 'a' # EmoComposer
+#DEFAULT_CHOICE = 'b' # Emotiv Headset
 
 #####################################################################
@@ -40 +71 @@
                 self.DEBUG = DEBUG
                 self.parent = parent
+
+                self.choice = DEFAULT_CHOICE
                 
                 #self.device_id = device_id
@@ -67 +100 @@
         
                 # Menu
-                print "A - Connect to EmoComposer\nB - Connect to Headset\nQ - Quit"
-                while (not isinstance(choice, str)) or ((choice != "a") and (choice != "b") and (choice != "q")):
-                        choice = raw_input("[A,B,Q] : ").lower()
-                        if choice == "q":
-                                quit()
+##              print "A - Connect to EmoComposer\nB - Connect to Headset\nQ - Quit"
+##              while (not isinstance(choice, str)) or ((choice != "a") and (choice != "b") and (choice != "q")):
+##                      choice = raw_input("[A,B,Q] : ").lower()
+##                      if choice == "q":
+##                              quit()
                 
                 # Connect
-                if choice == "a":
+                if self.choice == "a":
                         if EmotivEngine.EE_EngineRemoteConnect("127.0.0.1",1726) != ERRCODE['EDK_OK']:
                                 print "Could not connect!"
                                 quit()
                         else: print "Connected to EmoComposer!"    
-                elif choice == "b":
+                elif self.choice == "b":
                         if EmotivEngine.EE_EngineConnect() != ERRCODE['EDK_OK']:
                                 print "Could not connect!"

trunk/Puzzlebox/Synapse/Interface.py

@@ -381 +381 @@
                 elif (eeg_headset_model == 'Emotiv EPOC'):
                         
-                        import Emotiv.Protocol as emotiv_protocol
-                        
-                        emotiv_protocol.start()
+                        import Emotiv.Protocol
+
+                        self.emotiv_protocol = \
+                           Emotiv.Protocol.ProtocolHandler( \
+                              log=self.log, \
+                              serial_device=device_address, \
+                              device_model=eeg_headset_model, \
+                              parent=self)
+                        
+                        self.emotiv_protocol.start()