Changeset 5

Timestamp:

01/28/10 15:18:54 (12 years ago)

Author:

sc

Message:

rc:

• modified to use configuration module

server:

• test_drive function added

configuration:

• initial checkin

client:

• initial checkin

Location:

rc

Files:

• puzzlebox_brainstorms_client.py (added)
• puzzlebox_brainstorms_configuration.py (added)
• puzzlebox_brainstorms_rc.py (modified) (4 diffs)
• puzzlebox_brainstorms_server.py (modified) (6 diffs)

rc/puzzlebox_brainstorms_rc.py

@@ -2 +2 @@
 # -*- coding: utf-8 -*-
 #
-# Puzzlebox - Brainstorms - RC
-#
-# Copyright Steven M. Castellotti (2010)
+# Puzzlebox - Brainstorms - Remote Control
+#
+# Copyright Puzzlebox Productions, LLC (2010)
 #
 # Portions of this code have been previously
@@ -11 +11 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 #
-# Last Update: 2010.01.27
+# Last Update: 2010.01.28
 #
 #####################################################################
@@ -19 +19 @@
 import jaraco.nxt
 import jaraco.nxt.messages
+import puzzlebox_brainstorms_configuration as configuration
 
 #####################################################################
@@ -26 +27 @@
 DEBUG = 2
 
-BLUETOOTH_DEVICE='/dev/rfcomm0'
-MOTORS_MOUNTED_BACKWARDS = True
-MOTOR_PORT_RIGHT = 'a'
-MOTOR_PORT_LEFT = 'b'
+BLUETOOTH_DEVICE = configuration.BLUETOOTH_DEVICE
+MOTORS_MOUNTED_BACKWARDS = configuration.MOTORS_MOUNTED_BACKWARDS
+MOTOR_PORT_RIGHT = configuration.MOTOR_PORT_RIGHT
+MOTOR_PORT_LEFT = configuration.MOTOR_PORT_LEFT
 
 #####################################################################

rc/puzzlebox_brainstorms_server.py

@@ -11 +11 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.htm
 #
-# Last Update: 2010.01.27
+# Last Update: 2010.01.28
 #
 #####################################################################
 
-import os, signal, time
+import os, signal, sys, time
 import cPickle as pickle
 
 from twisted.internet import reactor, protocol, defer
 
-#import puzzlebox_configuration
-import puzzlebox_master_control_client
+import puzzlebox_brainstorms_configuration as configuration
+import puzzlebox_brainstorms_client
 #import puzzlebox_logger
 
-
 #####################################################################
 # Globals
@@ -31 +30 @@
 DEBUG = 1
 
-#SERVER_HOST = puzzlebox_configuration.SERVER_HOST
-#SERVER_PORT = puzzlebox_configuration.SERVER_PORT
-SERVER_HOST = '127.0.0.1'
-SERVER_PORT = 8194
+SERVER_HOST = configuration.SERVER_HOST
+SERVER_PORT = configuration.SERVER_PORT
 
 #MAX_COMPONENTS = puzzlebox_configuration.MAX_COMPONENTS
@@ -78 +75 @@
 
                 if 'command' in instruction:
-
                         response = '%s instruction received' % instruction['command']
 
@@ -84 +80 @@
                         if 'information' in instruction:
                                 information = instruction['information']
+
+
+                        if instruction['command'] == 'test_drive':
+                                
+                                command = 'python puzzlebox_brainstorms_rc.py'
+                                
+                                os.system(command)
 
 
@@ -451 +454 @@
         ##################################################################
 
-        #def process_connection_lost(self, instruction):
-
-                #if not instruction:
-
-                        #self.log.debug("Connection lost with no instruction?")
-                        #if self.DEBUG:
-                                #print "Connection lost with no instruction?"
-                        #return
+        def process_connection_lost(self, instruction):
+
+                if not instruction:
+
+                        self.log.debug("Connection lost with no instruction?")
+                        if self.DEBUG:
+                                print "Connection lost with no instruction?"
+                        return
 
                 #else:
@@ -564 +567 @@
                         #if self.DEBUG:
                                 #print "Not spawning process because command is '%s'" % instruction['command']
+
+
+        ##################################################################
+
+        #def spawn_new_process(self, instruction, d):
+
+                #process = reactor.spawnProcess(pp, file, args, os.environ, usePTY=True)
+
+                #if len(self.registry['components']) >= MAX_COMPONENTS and \
+                                #not self.stop_oldest_component():
+                        #self.log.error("Max components exceeded, not spawning any new ones.")
+                        #if self.DEBUG:
+                                #print "Max components exceeded, not spawning any new ones."
+                        #return
+
+                #if instruction['command'] == 'load_url':
+
+                        #information = instruction['information']
+
+##                      command = '/usr/bin/screen -S web_browser ' + \
+##                                              '%s %i %i %i %i %i %i %i %i %i %s' % \
+                        #command = '%s %i %i %i %i %i %i %i %i %i %i %s' % \
+                                                #('/usr/bin/puzzlebox_web_browser.py', \
+                                                #information['window_id'], \
+                                                #information['display_pos_x'], \
+                                                #information['display_pos_y'], \
+                                                #information['window_size_x'], \
+                                                #information['window_size_y'], \
+                                                #information['display_fullscreen'], \
+                                                #information['refresh_interval'], \
+                                                #information['duration'], \
+                                                #information['hide_on_duration_expire'], \
+                                                #information['autobit_white_flash_fix'], \
+                                                #information['url'])
+
+                        #args = command.strip().split()
+                        #file = args[0]
+
+                        #self.log.debug("Spawning process from command: [%s]" % command)
+                        #if self.DEBUG:
+                                #print "Spawning process from command: [%s]" % command
+
+                        #pp = puzzlebox_mcp_browser_pp(self.log, instruction, self.registry, \
+                                                #self.spawn_new_component, self.restart_component, d, self.DEBUG)
+                        #process = reactor.spawnProcess(pp, file, args, os.environ, usePTY=True)
+
+                #else:
+                        #self.log.debug("Not spawning process because command is '%s'" % instruction['command'])
+                        #if self.DEBUG:
+                                #print "Not spawning process because command is '%s'" % instruction['command'