Changeset 42 for remote_control

Timestamp:

05/18/10 03:42:20 (11 years ago)

Author:

sc

Message:

• initial support for discrete control commands

Location:

remote_control

Files:

• puzzlebox_brainstorms_client_interface.py (modified) (3 diffs)
• puzzlebox_brainstorms_configuration.py (modified) (3 diffs)
• puzzlebox_brainstorms_remote_control.py (modified) (5 diffs)
• puzzlebox_brainstorms_server.py (modified) (3 diffs)

remote_control/puzzlebox_brainstorms_client_interface.py

@@ -9 +9 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 #
-# Last Update: 2010.02.04
+# Last Update: 2010.05.03
 #
 #####################################################################
@@ -35 +35 @@
 
 FLIP = 1
+
+DISCRETE_CONTROL_COMMANDS = configuration.DISCRETE_CONTROL_COMMANDS
 
 SERVER_HOST = configuration.SERVER_HOST
@@ -87 +89 @@
                 self.screen = None
                 self.FLIP = FLIP
+                self.DISCRETE_CONTROL_COMMANDS = DISCRETE_CONTROL_COMMANDS
                 self.image_directory = IMAGE_DIRECTORY
                 

remote_control/puzzlebox_brainstorms_configuration.py

@@ -9 +9 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 #
-# Last Update: 2010.02.03
+# Last Update: 2010.05.03
 #
 #####################################################################
@@ -21 +21 @@
 
 DEBUG = 1
+
+DISCRETE_CONTROL_COMMANDS = False
 
 #####################################################################
@@ -50 +52 @@
 
 SERVER_INTERFACE = '' # listen on all of server's network interfaces
-SERVER_HOST = '192.168.1.150'
+#SERVER_HOST = '192.168.1.150'
+SERVER_HOST = '127.0.0.1' # localhost
 SERVER_PORT = 8194
 

remote_control/puzzlebox_brainstorms_remote_control.py

@@ -9 +9 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 #
-# Last Update: 2010.02.05
+# Last Update: 2010.05.03
 #
 #####################################################################
@@ -26 +26 @@
 
 DEBUG = 2
+
+DISCRETE_CONTROL_COMMANDS = configuration.DISCRETE_CONTROL_COMMANDS
 
 BLUETOOTH_DEVICE = configuration.BLUETOOTH_DEVICE
@@ -155 +157 @@
                 
                 # Continue operating motors while control program pauses
-                time.sleep(duration)
+                if DISCRETE_CONTROL_COMMANDS:
+                        time.sleep(duration)
+                        
+                        self.stop_motors(connection)
+        
+        
+        ##################################################################
+        
+        def stop_motors(self, connection):
+                
+                "Stop both motors"
+                
+                left_motor = self.connect_to_port(MOTOR_PORT_LEFT)
+                right_motor = self.connect_to_port(MOTOR_PORT_RIGHT)
                 
                 # Issue command to stop both motors
@@ -266 +281 @@
         def run(self, command):
                 
-                if (command == 'test_drive'):
-                        self.test_drive(self.connection)
-                
-                elif (command == 'drive_forward'):
+                if (command == 'drive_forward'):
                         self.drive_forward(self.connection, duration=3)
                 
@@ -286 +298 @@
                 elif (command == 'turn_right_in_reverse'):
                         self.turn_right_in_reverse(self.connection)
+                
+                elif (command == 'stop_motors'):
+                        self.stop_motors(self.connection)
+                
+                elif (command == 'test_drive'):
+                        self.test_drive(self.connection)
         
         

remote_control/puzzlebox_brainstorms_server.py

@@ -9 +9 @@
 # For more information please refer to http://www.gnu.org/copyleft/gpl.html
 #
-# Last Update: 2010.02.05
+# Last Update: 2010.05.03
 #
 #####################################################################
@@ -27 +27 @@
 
 DEBUG = 1
+
+DISCRETE_CONTROL_COMMANDS = configuration.DISCRETE_CONTROL_COMMANDS
 
 SERVER_INTERFACE = configuration.SERVER_INTERFACE
@@ -57 +59 @@
                 
                 
-                command_line = 'python puzzlebox_brainstorms_remote_control.py --command=%s' % command
-                
-                os.system(command_line)
+                if DISCRETE_CONTROL_COMMANDS:
+                        
+                        command_line = 'python puzzlebox_brainstorms_remote_control.py --command=%s' % command
+                        
+                        os.system(command_line)