Changeset 242 for trunk/brainstorms/Puzzlebox/Brainstorms/Wheelchair_Control.py

Timestamp:

12/04/10 15:50:04 (12 years ago)

Author:

sc

Message:

trunk/brainstorms/Puzzlebox/Brainstorms/Wheelchair_Control.py:

• function name capitalization consistency fix

trunk/brainstorms/Puzzlebox/Brainstorms/Interface.py:

• Wheelchair control now working from GUI buttons

File:

• trunk/brainstorms/Puzzlebox/Brainstorms/Wheelchair_Control.py (modified) (4 diffs)

trunk/brainstorms/Puzzlebox/Brainstorms/Wheelchair_Control.py

@@ -193 +193 @@
                 
                 
-                self.send_command(self.wheelchair_speed, self.wheelchair_command)
+                self.sendCommand(self.wheelchair_speed, self.wheelchair_command)
                 
                 time.sleep(ARDUINO_INITIALIZATION_TIME)
-                
-                return(device)
-        
-        
-        ##################################################################
-        
-        def send_command(self, speed, command):
+        
+        
+        ##################################################################
+        
+        def sendCommand(self, speed, command):
         
                 self.device.write('%s%s' % (COMMAND_CHARACTER, \
@@ -263 +261 @@
         ##################################################################
 
-        def console_control(self):
+        def consoleControl(self):
 
                 if (sys.platform == 'win32'):
@@ -297 +295 @@
         ##################################################################
         
-        #def gui_control(self):
+        #def guiControl(self):
                 
                 #while self.keep_running:
@@ -309 +307 @@
                 
                 if (self.command == 'console'):
-                        self.console_control()
+                        self.consoleControl()
                 
                 #elif (self.command == 'gui'):