Changeset 14 for rc

Timestamp:

02/01/10 21:08:38 (13 years ago)

Author:

sc

Message:

rc:

• connection handling cleanup

client_interface:

• turn_in_reverse support fixed

Location:

rc

Files:

• puzzlebox_brainstorms_client_interface.py (modified) (3 diffs)
• puzzlebox_brainstorms_rc.py (modified) (5 diffs)

rc/puzzlebox_brainstorms_client_interface.py

@@ -162 +162 @@
                 
                 if self.DEBUG:
-                        print "executing: %s" % commands
+                        print "executing: %s" % command
                 
                 os.system(command)
@@ -228 +228 @@
                                 elif (event.type == pygame.locals.KEYDOWN):
                                         
-                                        print event.dict
+                                        #print event.dict
                                         
                                         if 'key' in event.dict.keys():
@@ -251 +251 @@
                                                         commands.append('turn_right')
                                                 
-                                                elif event.dict['key'] == 'c':
+                                                elif ((event.dict['key'] == pygame.K_PAGEDOWN) or \
+                                                           (event.dict['key'] == pygame.K_c))::
                                                         commands.append('turn_in_reverse')
                         

rc/puzzlebox_brainstorms_rc.py

@@ -17 +17 @@
 import sys, time
 import serial
+
 import jaraco.nxt
 import jaraco.nxt.messages
+
 import puzzlebox_brainstorms_configuration as configuration
 
@@ -49 +51 @@
                 self.command = command
                 
+                self.connection = None
+                
                 try:
                         self.connection = self.connect_to_nxt(self.device)
@@ -54 +58 @@
                         if self.DEBUG:
                                 print "--> [RC] Connection failed to NXT device [%s]" % self.device
-                        sys.exit()
         
         
@@ -63 +66 @@
                 connection = jaraco.nxt.Connection(self.device)
                 
-                if self.DEBUG > 1:
+                if self.DEBUG:
                         battery_voltage = self.get_battery_voltage(connection)
                         print "--> [RC] Battery voltage:",
@@ -303 +306 @@
         rc = puzzlebox_brainstorms_rc(device=device, command=command, DEBUG=DEBUG)
         
+        if rc.connection == None:
+                sys.exit()
+        
         rc.run(rc.command)
         rc.stop()