Changeset 274
- Timestamp:
- 03/11/11 12:38:29 (10 years ago)
- Location:
- trunk/synapse/Puzzlebox/Synapse
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/synapse/Puzzlebox/Synapse/Interface.py
r272 r274 697 697 if os.path.exists('/dev/ttyUSB1'): 698 698 self.comboBoxDeviceSelect.addItem('/dev/ttyUSB1') 699 if os.path.exists('/dev/ttyUSB2'): 700 self.comboBoxDeviceSelect.addItem('/dev/ttyUSB2') 701 if os.path.exists('/dev/ttyUSB3'): 702 self.comboBoxDeviceSelect.addItem('/dev/ttyUSB3') 703 if os.path.exists('/dev/ttyUSB4'): 704 self.comboBoxDeviceSelect.addItem('/dev/ttyUSB4') 699 705 700 706 -
trunk/synapse/Puzzlebox/Synapse/Protocol.py
r273 r274 11 11 12 12 __changelog__ = """\ 13 Last Update: 2011.03. 0213 Last Update: 2011.03.11 14 14 15 15 """ … … 105 105 THINKGEAR_DEVICE_BLUETOOTH_CHANNEL = 3 106 106 107 THINKGEAR_DEVICE_AUTOCONNECT_INTERVAL = 4 # seconds between attempting auto-connect packets 107 THINKGEAR_DEVICE_AUTOCONNECT_INTERVAL = 4 # seconds between attempting 108 # to send auto-connect packets 108 109 THINKGEAR_DEVICE_ID = configuration.THINKGEAR_DEVICE_ID 109 110 #THINKGEAR_DEFAULT_DEVICE_ID = '\x7d\x68' … … 116 117 117 118 DEVICE_BUFFER_CHECK_TIMER = 60 * 1000 # Check buffer size once every minute 119 DEVICE_READ_BUFFER_CHECK_TIMER = 10 * 1000 # Check buffer size once x seconds 118 120 DEVICE_BUFFER_MAX_SIZE = 180 # Reset buffer if it grow this large 119 121 # as this would indicate the processing … … 151 153 self.device = None 152 154 self.buffer = '' 155 self.payload_timestamp = time.time() 153 156 154 157 self.device = serial_device … … 631 634 continue 632 635 633 payload_timestamp = time.time()636 self.payload_timestamp = time.time() 634 637 635 638 # Parse [PLENGTH] byte … … 706 709 707 710 708 self.processDataPayload(data_payload, payload_timestamp)711 self.processDataPayload(data_payload, self.payload_timestamp) 709 712 710 713 … … 780 783 parent=None): 781 784 782 QtCore.QThread.__init__(self, parent)785 QtCore.QThread.__init__(self, parent) 783 786 784 787 self.log = log 785 788 self.DEBUG = DEBUG 789 self.parent = parent 786 790 787 791 self.device_address = device_address … … 808 812 self.buffer_check_timer.start(DEVICE_BUFFER_CHECK_TIMER) 809 813 814 self.read_buffer_check_timer = QtCore.QTimer() 815 QtCore.QObject.connect(self.read_buffer_check_timer, \ 816 QtCore.SIGNAL("timeout()"), \ 817 self.checkReadBuffer) 818 self.read_buffer_check_timer.start(DEVICE_READ_BUFFER_CHECK_TIMER) 819 810 820 self.keep_running = True 811 821 … … 947 957 ################################################################## 948 958 959 def checkReadBuffer(self): 960 961 if self.DEBUG > 1: 962 print "INFO: Read buffer timer check" 963 964 current_time = time.time() 965 966 if ((self.parent != None) and \ 967 (self.parent.protocol != None)): 968 969 if (current_time - self.parent.protocol.payload_timestamp > \ 970 DEVICE_BUFFER_CHECK_TIMER): 971 972 if self.DEBUG: 973 print "ERROR: Read buffer timer has expired, resetting connection" 974 975 self.parent.resetDevice() 976 977 978 ################################################################## 979 949 980 def reset(self): 950 981 … … 975 1006 self.keep_running = False 976 1007 self.buffer_check_timer.stop() 1008 self.read_buffer_check_timer.stop() 977 1009 978 1010 -
trunk/synapse/Puzzlebox/Synapse/Server.py
r272 r274 9 9 10 10 __changelog__ = """\ 11 Last Update: 2011.03. 0111 Last Update: 2011.03.11 12 12 13 13 """ … … 596 596 self.exec_() 597 597 598 598 599 599 ################################################################## 600 600 … … 619 619 if self.parent == None: 620 620 sys.exit() 621 622 623 ################################################################## 624 625 def resetDevice(self): 626 627 if self.serial_device != None: 628 self.serial_device.exitThread() 629 630 if self.protocol != None: 631 self.protocol.exitThread() 632 633 self.configureEEG() 634
Note: See TracChangeset
for help on using the changeset viewer.