Changeset 234

Timestamp:

12/01/10 12:23:34 (12 years ago)

Author:

sc

Message:

Brainstorms/Helicopter_Control.py:

• DEVICE_BUFFER_TIMER set to 21ms

Brainstorms/Interface?.py:

• hover and fly_forward working

Location:

trunk/brainstorms/Puzzlebox/Brainstorms

Files:

• Helicopter_Control.py (modified) (2 diffs)
• Interface.py (modified) (9 diffs)

trunk/brainstorms/Puzzlebox/Brainstorms/Helicopter_Control.py

@@ -59 +59 @@
 ECHO_ON = False
 
-DEVICE_BUFFER_TIMER = 22  # Frame cycle 22ms
+#DEVICE_BUFFER_TIMER = 22  # Frame cycle 22ms
+DEVICE_BUFFER_TIMER = 21  # Frame cycle 22ms
 
 COMMAND_PACKET = {
@@ -225 +226 @@
                 QtCore.QThread.msleep(PROTOCOL_SYNC_TIME * 1000)
                 
-                self.protocol.command_packet = COMMAND_PACKET['fly_forwardsvn']
+                self.protocol.command_packet = COMMAND_PACKET['fly_forward']
                 QtCore.QThread.msleep(duration * 1000)
                 

trunk/brainstorms/Puzzlebox/Brainstorms/Interface.py

@@ -416 +416 @@
         def connectToRCHelicopter(self):
                 
-                device_selection = self.comboBoxHelicopterPortSelect.currentText()
+                device_selection = str(self.comboBoxHelicopterPortSelect.currentText())
                 
                 self.helicopter = \
@@ -422 +422 @@
                       device_address=device_selection,
                       command='neutral', \
-                      DEBUG=self.DEBUG)
+                      DEBUG=2)
+                      #DEBUG=self.DEBUG)
                 
                 self.helicopter.start()
@@ -463 +464 @@
         def disconnectFromRCHelicopter(self):
                 
-                self.helicopter.command = 'neutral'
-                self.helicopter.processCommand()
+                #self.helicopter.command = 'neutral'
+                #self.helicopter.processCommand()
+                self.helicopter.neutral()
                 
                 self.helicopter.stop()
@@ -1178 +1180 @@
                                         if device.startswith('ttyUSB'):
                                                 serial_ports.append( DEVICE_PATH + '/' + device )
+                                for device in device_list:
                                         if device.startswith('rfcomm'):
                                                 serial_ports.append( DEVICE_PATH + '/' + device )
+                                for device in device_list:
                                         if device.startswith('ttyACM'):
                                                 serial_ports.append( DEVICE_PATH + '/' + device )
+                                for device in device_list:
                                         if device.startswith('ttyS'):
                                                 serial_ports.append( DEVICE_PATH + '/' + device )
@@ -1276 +1281 @@
         def enableHelicopterHover(self):
                 
-                self.helicopter.command = 'hover'
-                self.helicopter.processCommand()
+                #self.helicopter.command = 'hover'
+                #self.helicopter.processCommand()
+                self.helicopter.hover()
                 
                 self.disconnect(self.pushButtonHelicopterHover, \
@@ -1296 +1302 @@
         def disableHelicopterHover(self):
                 
-                self.helicopter.command = 'neutral'
-                self.helicopter.processCommand()
+                #self.helicopter.command = 'neutral'
+                #self.helicopter.processCommand()
+                self.helicopter.neutral()
                 
                 self.disconnect(self.pushButtonHelicopterHover, \
@@ -1312 +1319 @@
         def enableHelicopterFlyForward(self):
                 
-                self.helicopter.command = 'fly_forward'
-                self.helicopter.processCommand()
+                #self.helicopter.command = 'fly_forward'
+                #self.helicopter.processCommand()
+                self.helicopter.fly_forward()
                 
                 self.disconnect(self.pushButtonHelicopterFlyForward, \
@@ -1332 +1340 @@
         def disableHelicopterFlyForward(self):
                 
-                self.helicopter.command = 'neutral'
-                self.helicopter.processCommand()
+                #self.helicopter.command = 'neutral'
+                #self.helicopter.processCommand()
+                self.helicopter.neutral()
                 
                 self.disconnect(self.pushButtonHelicopterFlyForward, \
@@ -1348 +1357 @@
         def landHelicopter(self):
                 
-                self.helicopter.command = 'neutral'
-                self.helicopter.processCommand()
+                #self.helicopter.command = 'neutral'
+                #self.helicopter.processCommand()
+                self.helicopter.neutral()
                 
                 if self.pushButtonHelicopterHover.isChecked():