Changeset 328

Timestamp:

03/13/12 13:06:16 (9 years ago)

Author:

sc

Message:

Configuration:

• THINKGEAR_BLUETOOTH_SEARCH = False
• THINKGEAR_BLUETOOTH_DISCOVER_DEVICES_TIMEOUT = 8 # default 8
• THINKGEAR_BLUETOOTH_LOOKUP_NAME_TIMEOUT = 10 # default 10

Interface:

• Support for NeuroSky? MindWave? Mobile under Linux

Location:

trunk/Puzzlebox/Synapse

Files:

• Configuration.py (modified) (3 diffs)
• Interface.py (modified) (3 diffs)

trunk/Puzzlebox/Synapse/Configuration.py

@@ -2 +2 @@
 # -*- coding: utf-8 -*-
 
-# Copyright Puzzlebox Productions, LLC (2010-2011)
+# Copyright Puzzlebox Productions, LLC (2010-2012)
 #
 # This code is released under the GNU Pulic License (GPL) version 2
@@ -8 +8 @@
 
 __changelog__ = """\
-Last Update: 2011.12.04
+Last Update: 2012.03.13
 """
 
@@ -115 +115 @@
 THINKGEAR_DEVICE_ID = None
 
+# Timeouts sent to PyBluez
+
+#THINKGEAR_BLUETOOTH_SEARCH = True
+THINKGEAR_BLUETOOTH_SEARCH = False
+THINKGEAR_BLUETOOTH_DISCOVER_DEVICES_TIMEOUT = 8 # default 8
+THINKGEAR_BLUETOOTH_LOOKUP_NAME_TIMEOUT = 10 # default 10
+
 #####################################################################
 # Server configuration

trunk/Puzzlebox/Synapse/Interface.py

@@ -755 +755 @@
                                 devices.append('/dev/ttyUSB9')
                         
+                        if os.path.exists('/dev/rfcomm0'):
+                                devices.append('/dev/rfcomm0')
+                        if os.path.exists('/dev/rfcomm1'):
+                                devices.append('/dev/rfcomm1')
+                        if os.path.exists('/dev/rfcomm2'):
+                                devices.append('/dev/rfcomm2')
+                        if os.path.exists('/dev/rfcomm3'):
+                                devices.append('/dev/rfcomm3')
+                        if os.path.exists('/dev/rfcomm4'):
+                                devices.append('/dev/rfcomm4')
+                        
                         if os.path.exists('/dev/ttyACM0'):
                                 devices.append('/dev/ttyACM0')
@@ -917 +928 @@
                 #self.pushButtonBluetoothSearch.setText('Searching')
                 
-                if (sys.platform != 'win32' and sys.platform != 'darwin'):
+                if ((sys.platform != 'win32' and sys.platform != 'darwin') and \
+                     configuration.THINKGEAR_BLUETOOTH_SEARCH):
                         
                         # Bluetooth module doesn't compile properly under Windows
                         # and doesn't exist under OS X
+                        
+                        # PyBluez API Documentation
+                        # http://pybluez.googlecode.com/svn/www/docs-0.7/index.html
                         
                         bluetooth_devices = []
@@ -932 +947 @@
                                         
                                         bluetooth_devices = bluetooth.discover_devices( \
-                                                               duration=5, \
+                                              duration=configuration.THINKGEAR_BLUETOOTH_DISCOVER_DEVICES_TIMEOUT, \
                                                                flush_cache=True, \
                                                                lookup_names=False)
                                         
                                         for address in bluetooth_devices:
-                                                device_name = bluetooth.lookup_name(address)
+                                                
+                                                if self.DEBUG:
+                                                        print "INFO: Device discovered",
+                                                        print address
+                                                
+                                                device_name = bluetooth.lookup_name(address, \
+                                                                 configuration.THINKGEAR_BLUETOOTH_LOOKUP_NAME_TIMEOUT)
                                                 if ((device_name == 'MindSet' or device_name == 'MindWave Mobile') and \
                                                         (address not in thinkgear_devices)):