Changeset 234
- Timestamp:
- 12/01/10 12:23:34 (12 years ago)
- Location:
- trunk/brainstorms/Puzzlebox/Brainstorms
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/brainstorms/Puzzlebox/Brainstorms/Helicopter_Control.py
r227 r234 59 59 ECHO_ON = False 60 60 61 DEVICE_BUFFER_TIMER = 22 # Frame cycle 22ms 61 #DEVICE_BUFFER_TIMER = 22 # Frame cycle 22ms 62 DEVICE_BUFFER_TIMER = 21 # Frame cycle 22ms 62 63 63 64 COMMAND_PACKET = { … … 225 226 QtCore.QThread.msleep(PROTOCOL_SYNC_TIME * 1000) 226 227 227 self.protocol.command_packet = COMMAND_PACKET['fly_forward svn']228 self.protocol.command_packet = COMMAND_PACKET['fly_forward'] 228 229 QtCore.QThread.msleep(duration * 1000) 229 230 -
trunk/brainstorms/Puzzlebox/Brainstorms/Interface.py
r233 r234 416 416 def connectToRCHelicopter(self): 417 417 418 device_selection = s elf.comboBoxHelicopterPortSelect.currentText()418 device_selection = str(self.comboBoxHelicopterPortSelect.currentText()) 419 419 420 420 self.helicopter = \ … … 422 422 device_address=device_selection, 423 423 command='neutral', \ 424 DEBUG=self.DEBUG) 424 DEBUG=2) 425 #DEBUG=self.DEBUG) 425 426 426 427 self.helicopter.start() … … 463 464 def disconnectFromRCHelicopter(self): 464 465 465 self.helicopter.command = 'neutral' 466 self.helicopter.processCommand() 466 #self.helicopter.command = 'neutral' 467 #self.helicopter.processCommand() 468 self.helicopter.neutral() 467 469 468 470 self.helicopter.stop() … … 1178 1180 if device.startswith('ttyUSB'): 1179 1181 serial_ports.append( DEVICE_PATH + '/' + device ) 1182 for device in device_list: 1180 1183 if device.startswith('rfcomm'): 1181 1184 serial_ports.append( DEVICE_PATH + '/' + device ) 1185 for device in device_list: 1182 1186 if device.startswith('ttyACM'): 1183 1187 serial_ports.append( DEVICE_PATH + '/' + device ) 1188 for device in device_list: 1184 1189 if device.startswith('ttyS'): 1185 1190 serial_ports.append( DEVICE_PATH + '/' + device ) … … 1276 1281 def enableHelicopterHover(self): 1277 1282 1278 self.helicopter.command = 'hover' 1279 self.helicopter.processCommand() 1283 #self.helicopter.command = 'hover' 1284 #self.helicopter.processCommand() 1285 self.helicopter.hover() 1280 1286 1281 1287 self.disconnect(self.pushButtonHelicopterHover, \ … … 1296 1302 def disableHelicopterHover(self): 1297 1303 1298 self.helicopter.command = 'neutral' 1299 self.helicopter.processCommand() 1304 #self.helicopter.command = 'neutral' 1305 #self.helicopter.processCommand() 1306 self.helicopter.neutral() 1300 1307 1301 1308 self.disconnect(self.pushButtonHelicopterHover, \ … … 1312 1319 def enableHelicopterFlyForward(self): 1313 1320 1314 self.helicopter.command = 'fly_forward' 1315 self.helicopter.processCommand() 1321 #self.helicopter.command = 'fly_forward' 1322 #self.helicopter.processCommand() 1323 self.helicopter.fly_forward() 1316 1324 1317 1325 self.disconnect(self.pushButtonHelicopterFlyForward, \ … … 1332 1340 def disableHelicopterFlyForward(self): 1333 1341 1334 self.helicopter.command = 'neutral' 1335 self.helicopter.processCommand() 1342 #self.helicopter.command = 'neutral' 1343 #self.helicopter.processCommand() 1344 self.helicopter.neutral() 1336 1345 1337 1346 self.disconnect(self.pushButtonHelicopterFlyForward, \ … … 1348 1357 def landHelicopter(self): 1349 1358 1350 self.helicopter.command = 'neutral' 1351 self.helicopter.processCommand() 1359 #self.helicopter.command = 'neutral' 1360 #self.helicopter.processCommand() 1361 self.helicopter.neutral() 1352 1362 1353 1363 if self.pushButtonHelicopterHover.isChecked():
Note: See TracChangeset
for help on using the changeset viewer.