Changeset 409

Timestamp:

01/17/15 18:27:06 (6 years ago)

Author:

sc

Message:

• Muse control working for Bloom

Location:

trunk/Puzzlebox/Synapse/Muse

Files:

• Client.py (modified) (2 diffs)
• Server.py (modified) (3 diffs)

trunk/Puzzlebox/Synapse/Muse/Client.py

@@ -130 +130 @@
                         ##self.plugin_session = self.parent.plugin_session # for Jigsaw compatability
                         
-                        #self.protocol.start()
-                        self.protocol.run()
+                        self.protocol.start()
+                        #self.protocol.run()
                         #self.protocol.run(self.protocol)
                         
@@ -145 +145 @@
                 
                 self.packet_count = self.packet_count + 1
+                
+                #print self.packet_count,
+                #print packet
                 
                 # Pass GUI updating to Interface application or parent object

trunk/Puzzlebox/Synapse/Muse/Server.py

@@ -50 +50 @@
 DEBUG = configuration.DEBUG
 
-COMMUNICATION_MODE = 'Emit Signal'
-#COMMUNICATION_MODE = 'Call Parent'
+#COMMUNICATION_MODE = 'Emit Signal'
+COMMUNICATION_MODE = 'Call Parent'
 
 SERVER_INTERFACE = configuration.MUSE_SERVER_HOST
@@ -299 +299 @@
                 
                 
-                #if ('affectiv' in packet.keys()):
-                        
-                        #packet['eSense'] = {}
-                        
-                        #if ('excitement' in packet['affectiv'].keys()):
+                if ('concentration' in packet.keys()):
+                        
+                        packet['eSense'] = {}
+                        packet['eSense']['attention'] = packet['concentration']
+                        
+                if ('relaxation' in packet.keys()):
+                        
+                        packet['eSense'] = {}
+                        packet['eSense']['meditation'] = packet['relaxation']
+                        
+                        
+                        #if ('concentration' in packe.keys()):
                                 ##packet['eSense']['attention'] = int(packet['affectiv']['excitement'] * 100)
                                 #packet['eSense']['attention'] = int(packet['cognitiv']['currentActionPower'] * 100)
@@ -635 +642 @@
                 
                 if muse_protocol != None:
-                        muse_protocol.KEEP_RUNNING = False
+                        #muse_protocol.KEEP_RUNNING = False
+                        muse_protocol.keep_running = False
                         
                         count = 1