Changeset 325

Timestamp:

03/05/12 17:35:37 (9 years ago)

Author:

sc

Message:

Interface:

• support for /dev/rfcomm

Configuration:

• FFT chart style

Location:

trunk/Puzzlebox/Synapse

Files:

• Configuration.py (modified) (1 diff)
• Interface.py (modified) (4 diffs)

trunk/Puzzlebox/Synapse/Configuration.py

@@ -41 +41 @@
         'lowGamma': 'k-', \
         'highGamma': 'k-', \
+        'FFT': 'g-', \
 }
 

trunk/Puzzlebox/Synapse/Interface.py

@@ -50 +50 @@
 
 if (sys.platform == 'win32'):
-        import bluetooth
-        DEFAULT_IMAGE_PATH = '/usr/share/puzzlebox_synapse/images'
-elif (sys.platform == 'darwin'):
-        DEFAULT_IMAGE_PATH = 'images'
-else:
         import _winreg as winreg
         import itertools
@@ -60 +55 @@
         import serial
         DEFAULT_IMAGE_PATH = 'images'
+elif (sys.platform == 'darwin'):
+        DEFAULT_IMAGE_PATH = 'images'
+else:
+        import bluetooth
+        DEFAULT_IMAGE_PATH = '/usr/share/puzzlebox_synapse/images'
 
 
@@ -732 +732 @@
                                 devices.append('/dev/ttyACM4')
                         
+                        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/tty.MindSet-DevB'):
                                 devices.append('/dev/tty.MindSet-DevB')
@@ -816 +825 @@
                                         (address not in thinkgear_devices)):
                                         thinkgear_devices.append(address)
+                                
+                                else:
+                                        if self.DEBUG:
+                                                print 'INFO: Found but not recognized: [%s] %s' % \
+                                                        (address, device_name)