Changeset 52 for remote_control

Timestamp:

06/17/10 14:35:37 (11 years ago)

Author:

sc

Message:

client_thinkgear:

• bugfix for client failing to send initial message

server:

• debug/log cleanup
• removed unnecessary client import

server_thinkgear:

• initial checkin
• provide emulator for NeuroSky? ThinkGear? JSON socket server

install.nsi:

• updated to include emokey and emoscripts files

Location:

remote_control

Files:

• PuzzleboxBrainstorms-install.nsi (modified) (3 diffs)
• puzzlebox_brainstorms_client_thinkgear.py (modified) (1 diff)
• puzzlebox_brainstorms_server.py (modified) (2 diffs)
• puzzlebox_brainstorms_server_thinkgear.py (added)

remote_control/PuzzleboxBrainstorms-install.nsi

@@ -4 +4 @@
 
 Name "Puzzlebox Brainstorms"
-OutFile "PuzzleboxBrainstorms-0.1.2-setup.exe"
+OutFile "PuzzleboxBrainstorms-0.1.4-setup.exe"
 
 ; Some default compiler settings (uncomment and change at will):
@@ -93 +93 @@
  File dist\zlib1.dll
 
+SetOutPath $INSTDIR\emokey
+ File emokey\puzzlebox_brainstorms.ekm
+
+SetOutPath $INSTDIR\emoscript
+ File emoscript\puzzlebox_brainstorms-test_drive-push_pull.emo
+ File emoscript\puzzlebox_brainstorms-training-pull.emo
+ File emoscript\puzzlebox_brainstorms-training-push.emo
+
 SetOutPath $INSTDIR\images
  File dist\images\1-upper_left-orange.png
@@ -222 +230 @@
  Delete $INSTDIR\zlib1.dll
 
+ Delete $INSTDIR\emokey\puzzlebox_brainstorms.ekm
+ Delete $INSTDIR\emoscript\puzzlebox_brainstorms-test_drive-push_pull.emo
+ Delete $INSTDIR\emoscript\puzzlebox_brainstorms-training-pull.emo
+ Delete $INSTDIR\emoscript\puzzlebox_brainstorms-training-push.emo
+
  Delete $INSTDIR\images\1-upper_left-orange.png
  Delete $INSTDIR\images\1-upper_left-white.png

remote_control/puzzlebox_brainstorms_client_thinkgear.py

@@ -117 +117 @@
         ##################################################################
         
-##      def connectionMade(self):
-##              
-##              #data = pickle.dumps(self.factory.command)
-##              data = json.dumps(self.factory.command)
-##              self.transport.write(data)
-##              
-##              self.factory.noReply = reactor.callLater(NO_REPLY_WAIT, self.noReply)
-        
-        
-        ##################################################################
-        
-##      def noReply(self):
-##              
-##              try:
-##                      self.factory.replyDefer.callback('NO_REPLY')
-##              except:
-##                      if self.DEBUG:
-##                              print "noReply failed to call callback"
-##                      #self.factory.log.error("noReply failed to call callback")
-##              
-##              self.transport.loseConnection()
+        def connectionMade(self):
+                
+                #data = pickle.dumps(self.factory.command)
+                data = json.dumps(self.factory.command)
+                self.transport.write(data)
+                
+                self.factory.noReply = reactor.callLater(NO_REPLY_WAIT, self.noReply)
+        
+        
+        ##################################################################
+        
+        def noReply(self):
+                
+                try:
+                        self.factory.replyDefer.callback('NO_REPLY')
+                except:
+                        if self.DEBUG:
+                                print "noReply failed to call callback"
+                        #self.factory.log.error("noReply failed to call callback")
+                
+                self.transport.loseConnection()
         
         

remote_control/puzzlebox_brainstorms_server.py

@@ -20 +20 @@
 
 import puzzlebox_brainstorms_configuration as configuration
-import puzzlebox_brainstorms_client
+#import puzzlebox_brainstorms_client
 import puzzlebox_brainstorms_remote_control as remote_control
 #import puzzlebox_logger
@@ -136 +136 @@
                 
                 except Exception, e:
-                        self.factory.log.error("Partial data received (or error: %s)." % e)
+                        #self.factory.log.error("Partial data received (or error: %s)." % e)
+                        if DEBUG:
+                                print "Partial data received (or error:",
+                                print e
+                                print ")."
                 
                 else: