Changeset 48 for remote_control

Timestamp:

06/16/10 13:56:29 (12 years ago)

Author:

sc

Message:

client:

• Switched to JSON from Pickle for message encodings
• Fixed but with command line client not respecting custom server host/port settings

configuration.ini:

• thinkgear server settings added

configuration.py

• thinkgear server settings added

server:

• Switched to JSON from Pickle for message encodings

client_thinkgear:

• intial checkin
• adds support for NeuroSky? MindSet? ThinkGear? Socket Protocol

Location:

remote_control

Files:

• puzzlebox_brainstorms_client.py (modified) (4 diffs)
• puzzlebox_brainstorms_client_thinkgear.py (added)
• puzzlebox_brainstorms_configuration.ini (modified) (1 diff)
• puzzlebox_brainstorms_configuration.py (modified) (3 diffs)
• puzzlebox_brainstorms_server.py (modified) (3 diffs)

remote_control/puzzlebox_brainstorms_client.py

@@ -9 +9 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 #
-# Last Update: 2010.02.03
+# Last Update: 2010.06.16
 #
 #####################################################################
 
 import os, sys
-import cPickle as pickle
+#import cPickle as pickle
+import simplejson as json
 
 from twisted.internet import reactor, protocol, defer
@@ -84 +85 @@
         def connectionMade(self):
                 
-                data = pickle.dumps(self.factory.command)
+                #data = pickle.dumps(self.factory.command)
+                data = json.dumps(self.factory.command)
                 self.transport.write(data)
                 
@@ -118 +120 @@
                 
                 try:
-                        reply = pickle.loads(self.data_chunk)
+                        #reply = pickle.loads(self.data_chunk)
+                        reply = json.loads(self.data_chunk)
                 except Exception, e:
                         if self.DEBUG:
@@ -218 +221 @@
                 
                 self.command_parameters = command_parameters
-                self.server_host = SERVER_HOST
-                self.server_port = SERVER_PORT
+                self.server_host = server_host
+                self.server_port = server_port
                 self.max_connection_attempts = MAX_CONNECTION_ATTEMPTS
         

remote_control/puzzlebox_brainstorms_configuration.ini

@@ -16 +16 @@
 SERVER_PORT = 8194
 
+THINKGEAR_SERVER_HOST = '127.0.0.1'
+THINKGEAR_SERVER_PORT = 13854
+
 
 #####################################################################

remote_control/puzzlebox_brainstorms_configuration.py

@@ -9 +9 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 #
-# Last Update: 2010.06.10
+# Last Update: 2010.06.16
 #
 #####################################################################
@@ -61 +61 @@
 SERVER_PORT = 8194
 
+THINKGEAR_SERVER_HOST = '127.0.0.1'
+THINKGEAR_SERVER_PORT = 13854
+
 
 #####################################################################
@@ -91 +94 @@
 HEALTH_CHECK_CONNECTION_ATTEMPTS = 5
 NO_REPLY_WAIT = 10 # how many seconds before considering a component dead
+
+
+#####################################################################
+# ThinkGear Connect configuration
+#####################################################################
+
+THINKGEAR_AUTHORIZATION_REQUEST = { \
+        "appName": "Puzzlebox Brainstorms", \
+        "appKey": "2e285d7bd5565c0ea73e7e265c73f0691d932408"
+        }
 
 

remote_control/puzzlebox_brainstorms_server.py

@@ -9 +9 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 #
-# Last Update: 2010.06.01
+# Last Update: 2010.06.16
 #
 #####################################################################
 
 import os, signal, sys, time
-import cPickle as pickle
+#import cPickle as pickle
+import simplejson as json
 
 from twisted.internet import reactor, protocol, defer
@@ -131 +132 @@
                 
                 try:
-                        self.command = pickle.loads(self.data_chunk)
+                        #self.command = pickle.loads(self.data_chunk)
+                        self.command = json.loads(self.data_chunk)
                 
                 except Exception, e:
@@ -147 +149 @@
         def send_response(self, response):
                 
-                response = pickle.dumps(response)
+                #response = pickle.dumps(response)
+                response = json.dumps(response)
                 
                 self.transport.write(response)