Changeset 53 for remote_control

Timestamp:

06/18/10 14:41:18 (12 years ago)

Author:

sc

Message:

client_thinkgear:

• code cleanups
• enhanced debugging
• need to fix Deferred error on ^{C terminated connections}

client_server:

• good progress towards basic signal generator

Location:

remote_control

Files:

• puzzlebox_brainstorms_client_thinkgear.py (modified) (7 diffs)
• puzzlebox_brainstorms_server_thinkgear.py (modified) (10 diffs)

remote_control/puzzlebox_brainstorms_client_thinkgear.py

@@ -9 +9 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 #
-# Last Update: 2010.06.16
+# Last Update: 2010.06.18
 #
 #####################################################################
@@ -34 +34 @@
 NO_REPLY_WAIT = configuration.NO_REPLY_WAIT
 
+THINKGEAR_DELIMITER = '\r'
 
 AUTHORIZATION_REQUEST = configuration.THINKGEAR_AUTHORIZATION_REQUEST
@@ -108 +109 @@
         basic.LineReceiver):
 
-        delimiter='\r'
+        delimiter = THINKGEAR_DELIMITER
         
         def __init__(self):
@@ -119 +120 @@
         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)
+                self.sendLine(data)
+                
+##              self.factory.noReply = reactor.callLater(NO_REPLY_WAIT, self.noReply)
         
         
@@ -137 +137 @@
                         #self.factory.log.error("noReply failed to call callback")
                 
-                self.transport.loseConnection()
+##              self.transport.loseConnection()
         
         
@@ -147 +147 @@
                 if not line:
                         return
-                
-
-                data = json.loads(line)
+
+                try:
+                        data = json.loads(line)
+                except Exception, e:
+                        if DEBUG:
+                                print "Partial data received (or error:",
+                                print e
+                                print ")."
+
+                                print "line:",
+                                print line
+                                
 
                 if self.DEBUG:
@@ -160 +169 @@
                                 print data
 
-
+##                self.factory.send_command_and_print_response(data)
+
+
+        ##################################################################
+
+        def connectionLost(self, reason):
+
+                if self.DEBUG > 1:
+                        print "Connection lost:",
+                        print reason
+
+        
 #####################################################################
 # ThinkGear Client Factory class

remote_control/puzzlebox_brainstorms_server_thinkgear.py

@@ -9 +9 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 #
-# Last Update: 2010.06.16
+# Last Update: 2010.06.18
 #
 #####################################################################
@@ -17 +17 @@
 
 from twisted.internet import reactor, protocol, defer, task
+from twisted.protocols import basic
 
 import puzzlebox_brainstorms_configuration as configuration
@@ -30 +31 @@
 SERVER_INTERFACE = configuration.SERVER_INTERFACE
 SERVER_PORT = configuration.THINKGEAR_SERVER_PORT
+
+THINKGEAR_DELIMITER = '\r'
 
 MESSAGE_FREQUENCY_TIMER = 1 # 1 Hz
@@ -52 +55 @@
                 'theta': 0, \
                 }, \
-         }
+         } # A container for the EEG powers. These may
+           # be either integer or floating-point values.
 
 DEFAULT_ESENSE_MESSAGE = \
@@ -59 +63 @@
                 'attention': 0, \
                 }, \
-        }
+        } # A container for the eSense™ attributes.
+          # These are integer values between 0 and 100,
+          # where 0 is perceived as a lack of that attribute
+          # and 100 is an excess of that attribute.
                
 DEFAULT_BLINK_MESSAGE = {"blinkStrength": 100}
+        # The strength of a detected blink. This is
+        # an integer in the range of 0-255.
 
 DEFAULT_RAWEEG_MESSAGE = {"rawEeg": 255}
+        # The raw data reading off the forehead sensor.
+        # This may be either an integer or a floating-point value.
 
 DEFAULT_PACKET = {}
@@ -97 +108 @@
                 
                 if self.DEBUG:
-                        print '--> [ThinkGear Emulator] %s data received' % data
+                        print "--> [ThinkGear Emulator] Received:",
+                        print data
                 
                 
@@ -156 +168 @@
         def send_packet(self):
 
+##              print dir(self.protocol)
+##              print self.protocol.connected
+##              if self.protocol.transport != None:
+##                      data = json.dumps(DEFAULT_SIGNAL_LEVEL_MESSAGE)
+##                      self.transport.write(data)
+
                 pass
 
@@ -171 +189 @@
 #####################################################################
 
-class puzzlebox_brainstorms_server_protocol(protocol.Protocol):
+class puzzlebox_brainstorms_server_protocol(basic.LineReceiver):
+
+        delimiter='\r'
         
         def __init__(self):
                 
+                self.DEBUG = DEBUG
                 self.data = None
                 self.data_chunk = ""
-        
+
+        
+        ##################################################################
+        
+        def connectionMade(self):
+                
+##              data = json.dumps(self.factory.command)
+##              self.transport.write(data)
+##              
+##              self.factory.noReply = reactor.callLater(NO_REPLY_WAIT, self.noReply)
+
+
+                if self.DEBUG:
+                        print "connectionMade"
+
+
+                response = DEFAULT_RESPONSE_MESSAGE
+
+
+                if self.DEBUG:
+                        print "--> [ThinkGear Emulator] Sending:",
+                        print response
+                        
+                response = json.dumps(response)
+##              self.transport.write(response)
+                self.sendLine(response)
+
+        ##################################################################
+        
+        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 lineReceived(self, line):
+
+                # Ignore blank lines
+                if not line:
+                        return
+                
+                self.data = json.loads(line)
+
+                if self.DEBUG:
+                        print "line received:",
+                        print self.data
+
+                d = self.factory.process_data("%s" % self.data)
+                d.addCallback(self.send_response)
+
         
         ##################################################################
@@ -183 +261 @@
         def dataReceived(self, data):
 
-                print data
+##              if self.DEBUG:
+##                      print "data received:",
+##                      print data
                 
                 self.data_chunk += data
@@ -208 +288 @@
         
         def send_response(self, response):
-                
+
+                if self.DEBUG:
+                        print "--> [ThinkGear Emulator] Sending:",
+                        print response
+                        
                 response = json.dumps(response)
-                
-                self.transport.write(response)
+##              self.transport.write(response)
+                self.sendLine(response)
+
+##              reactor.callLater(MESSAGE_FREQUENCY_TIMER, self.send_response, DEFAULT_RESPONSE_MESSAGE)
+                reactor.callLater(MESSAGE_FREQUENCY_TIMER, self.send_response, DEFAULT_PACKET)
+