Changeset 324

Timestamp:

03/02/12 17:40:22 (9 years ago)

Author:

sc

Message:

Interface:

• Support for MindSet? under OS X added
• Support for MindWave? under OS X added
• Support for MindWave? Mobile under OS X added

Protocol:

• images directory fix for OS X

Location:

trunk/Puzzlebox/Synapse

Files:

• Interface.py (modified) (5 diffs)
• Protocol.py (modified) (1 diff)

trunk/Puzzlebox/Synapse/Interface.py

@@ -10 +10 @@
 
 __changelog__ = """\
-Last Update: 2011.12.07
+Last Update: 2012.03.02
 """
 
@@ -49 +49 @@
 
 
-if (sys.platform != 'win32'):
+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
@@ -729 +731 @@
                         if os.path.exists('/dev/ttyACM4'):
                                 devices.append('/dev/ttyACM4')
+                        
+                        if os.path.exists('/dev/tty.MindSet-DevB'):
+                                devices.append('/dev/tty.MindSet-DevB')
+                        
+                        if os.path.exists('/dev/tty.MindWave'):
+                                devices.append('/dev/tty.MindWave')
+                        if os.path.exists('/dev/tty.MindWave1'):
+                                devices.append('/dev/tty.MindWave1')
+                        if os.path.exists('/dev/tty.MindWave2'):
+                                devices.append('/dev/tty.MindWave2')
+                        if os.path.exists('/dev/tty.MindWave3'):
+                                devices.append('/dev/tty.MindWave3')
+                        if os.path.exists('/dev/tty.MindWave4'):
+                                devices.append('/dev/tty.MindWave4')
+                        if os.path.exists('/dev/tty.MindWave5'):
+                                devices.append('/dev/tty.MindWave5')
+                        
+                        if os.path.exists('/dev/tty.MindWaveMobile-SPPDev'):
+                                devices.append('/dev/tty.MindWaveMobile-SPPDev')
                 
                 
@@ -748 +769 @@
                 output = os.popen(command, 'r')
                 
-                for line in output.readlines():
+                try:
+                        result = output.readlines()
+                except Exception, e:
+                        if self.DEBUG:
+                                print "ERROR [Synapse-Interface]: Failed reading result from call to hcitool:",
+                                print e
+                        result = ''
+
+                if result == '':
+                        return([]) # Under OS X hcitool doesn't exist so we don't see any devices
+
+                for line in result:
                         line = line.strip()
                         if line == '' or line == 'Scanning ...':
@@ -803 +835 @@
                 output = os.popen(command, 'r')
                 
-                for line in output.readlines():
+                try:
+                        result = output.readlines()
+                except Exception, e:
+                        if self.DEBUG:
+                                print "ERROR [Synapse-Interface]: Failed reading result from call to hcitool:",
+                                print e
+                        result = ''
+
+                if result == '':
+                        return([]) # Under OS X hcitool doesn't exist so we don't see any devices
+
+                for line in result:
                         line = line.strip()
                         if line == '' or line == 'Connections:':

trunk/Puzzlebox/Synapse/Protocol.py

@@ -91 +91 @@
 import serial
 
-if (sys.platform != 'win32'):
+if ((sys.platform != 'win32') and \
+    (sys.platform != 'darwin')):
         import bluetooth