Changeset 206
- Timestamp:
- 11/15/10 17:41:41 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/brainstorms/Puzzlebox/Brainstorms/Helicopter_Control.py
r205 r206 50 50 ##################################################################### 51 51 52 class puzzlebox_brainstorms_helicopter_control: 52 #class puzzlebox_brainstorms_helicopter_control: 53 class puzzlebox_brainstorms_helicopter_control(QtCore.QThread): 53 54 54 55 def __init__(self, \ … … 58 59 parent=None): 59 60 60 #QtCore.QThread.__init__(self,parent)61 QtCore.QThread.__init__(self, parent) 61 62 62 63 self.log = None … … 123 124 self.serial_device.start() 124 125 125 self.protocol = \126 ProtocolHandler( \127 self.log, \128 self.serial_device, \129 DEBUG=self.DEBUG, \130 parent=self)131 132 self.protocol.start()126 #self.protocol = \ 127 #ProtocolHandler( \ 128 #self.log, \ 129 #self.serial_device, \ 130 #DEBUG=self.DEBUG, \ 131 #parent=self) 132 133 #self.protocol.start() 133 134 134 135 … … 422 423 423 424 #class SerialDevice(Protocol.SerialDevice): 424 class SerialDevice: 425 #class SerialDevice: 426 class SerialDevice(QtCore.QThread): 425 427 426 428 def __init__(self, log, \ … … 429 431 parent=None): 430 432 431 #QtCore.QThread.__init__(self, parent)433 QtCore.QThread.__init__(self, parent) 432 434 433 435 self.log = log … … 611 613 def stop(self): 612 614 615 #self.buffer_check_timer.stop() 613 616 self.keep_running = False 614 self.buffer_check_timer.stop()615 617 616 618 … … 659 661 660 662 661 #self.exitThread( )662 self.exitThread( callThreadQuit=False)663 #self.exitThread(callThreadQuit=False) 664 self.exitThread() 663 665 664 666 … … 684 686 685 687 if __name__ == '__main__': 688 689 # Perform correct KeyboardInterrupt handling 690 signal.signal(signal.SIGINT, signal.SIG_DFL) 686 691 687 692 # Collect default settings and command line parameters … … 702 707 703 708 if rc.connection == None: 704 #sys.exit(app.exec_()) 705 sys.exit() 706 707 #rc.start() 708 rc.run(rc.command) 709 #sys.exit() 710 sys.exit(app.exec_()) 711 712 #rc.run(rc.command) 713 rc.start() 714 709 715 #rc.stop() 710 716 sys.exit(app.exec_()) 717
Note: See TracChangeset
for help on using the changeset viewer.