Changeset 274

Timestamp:

03/11/11 12:38:29 (10 years ago)

Author:

sc

Message:

Interface:

• support for ttyUSB0-4 added

Protocol:

• read_buffer_check_timer added
• checkReadBuffer added

Server:

• resetDevice added

Location:

trunk/synapse/Puzzlebox/Synapse

Files:

• Interface.py (modified) (1 diff)
• Protocol.py (modified) (10 diffs)
• Server.py (modified) (3 diffs)

trunk/synapse/Puzzlebox/Synapse/Interface.py

@@ -697 +697 @@
                         if os.path.exists('/dev/ttyUSB1'):
                                 self.comboBoxDeviceSelect.addItem('/dev/ttyUSB1')
+                        if os.path.exists('/dev/ttyUSB2'):
+                                self.comboBoxDeviceSelect.addItem('/dev/ttyUSB2')
+                        if os.path.exists('/dev/ttyUSB3'):
+                                self.comboBoxDeviceSelect.addItem('/dev/ttyUSB3')
+                        if os.path.exists('/dev/ttyUSB4'):
+                                self.comboBoxDeviceSelect.addItem('/dev/ttyUSB4')
                 
                 

trunk/synapse/Puzzlebox/Synapse/Protocol.py

@@ -11 +11 @@
 
 __changelog__ = """\
-Last Update: 2011.03.02
+Last Update: 2011.03.11
 
 """
@@ -105 +105 @@
 THINKGEAR_DEVICE_BLUETOOTH_CHANNEL = 3
 
-THINKGEAR_DEVICE_AUTOCONNECT_INTERVAL = 4 # seconds between attempting auto-connect packets
+THINKGEAR_DEVICE_AUTOCONNECT_INTERVAL = 4 # seconds between attempting
+                                          # to send auto-connect packets
 THINKGEAR_DEVICE_ID = configuration.THINKGEAR_DEVICE_ID
 #THINKGEAR_DEFAULT_DEVICE_ID = '\x7d\x68'
@@ -116 +117 @@
 
 DEVICE_BUFFER_CHECK_TIMER = 60 * 1000 # Check buffer size once every minute
+DEVICE_READ_BUFFER_CHECK_TIMER = 10 * 1000 # Check buffer size once x seconds
 DEVICE_BUFFER_MAX_SIZE = 180 # Reset buffer if it grow this large
                              # as this would indicate the processing
@@ -151 +153 @@
                 self.device = None
                 self.buffer = ''
+                self.payload_timestamp = time.time()
                 
                 self.device = serial_device
@@ -631 +634 @@
                                 continue
                         
-                        payload_timestamp = time.time()
+                        self.payload_timestamp = time.time()
                         
                         # Parse [PLENGTH] byte
@@ -706 +709 @@
                                 
                                 
-                                self.processDataPayload(data_payload, payload_timestamp)
+                                self.processDataPayload(data_payload, self.payload_timestamp)
                                 
                                 
@@ -780 +783 @@
                                parent=None):
                 
-                QtCore.QThread.__init__(self,parent)
+                QtCore.QThread.__init__(self, parent)
                 
                 self.log = log
                 self.DEBUG = DEBUG
+                self.parent = parent
                 
                 self.device_address = device_address
@@ -808 +812 @@
                 self.buffer_check_timer.start(DEVICE_BUFFER_CHECK_TIMER)
                 
+                self.read_buffer_check_timer = QtCore.QTimer()
+                QtCore.QObject.connect(self.read_buffer_check_timer, \
+                                       QtCore.SIGNAL("timeout()"), \
+                                       self.checkReadBuffer)
+                self.read_buffer_check_timer.start(DEVICE_READ_BUFFER_CHECK_TIMER)
+                
                 self.keep_running = True
         
@@ -947 +957 @@
         ##################################################################
         
+        def checkReadBuffer(self):
+                
+                if self.DEBUG > 1:
+                        print "INFO: Read buffer timer check"
+                
+                current_time = time.time()
+                
+                if ((self.parent != None) and \
+                    (self.parent.protocol != None)):
+                        
+                        if (current_time - self.parent.protocol.payload_timestamp > \
+                                 DEVICE_BUFFER_CHECK_TIMER):
+                                
+                                if self.DEBUG:
+                                        print "ERROR: Read buffer timer has expired, resetting connection"
+                                
+                        self.parent.resetDevice()
+        
+        
+        ##################################################################
+        
         def reset(self):
                 
@@ -975 +1006 @@
                 self.keep_running = False
                 self.buffer_check_timer.stop()
+                self.read_buffer_check_timer.stop()
         
         

trunk/synapse/Puzzlebox/Synapse/Server.py

@@ -9 +9 @@
 
 __changelog__ = """\
-Last Update: 2011.03.01
+Last Update: 2011.03.11
 
 """
@@ -596 +596 @@
                 self.exec_()
         
-        
+                
         ##################################################################
         
@@ -619 +619 @@
                 if self.parent == None:
                         sys.exit()
+        
+        
+        ##################################################################
+        
+        def resetDevice(self):
+                
+                if self.serial_device != None:
+                        self.serial_device.exitThread()
+                
+                if self.protocol != None:
+                        self.protocol.exitThread()
+                
+                self.configureEEG()
+