Merge branch 'release/0.1.2'

README.md

@@ -37,7 +37,7 @@ $ ./setup.py test
 
 # Revision history
 
- * 0.1.1
+ * 0.1.1-0.1.2
    - Fix resolve_modem_port()
 
  * 0.1.0

lib/candy_board_amt/__init__.py

@@ -123,19 +123,18 @@ def close(self):
     def resolve_modem_port():
         if platform.system() != 'Linux':
             return None
-        for p in glob.glob("/dev/tty*"):
-            port = SerialPort(p, 115200)
-            port.write("AT\r")
-            time.sleep(0.1)
-            ret = port.read_line() # echo back
-            if ret is None:
-                port.close()
-                continue
-            port.read_line() # empty
-            port.read_line() # empty
-            ret = port.read_line()
-            if ret == "OK":
-                return p
+        for t in ['/dev/ttyUSB*', '/dev/ttyACM*', '/dev/ttyAMA*']:
+            for p in glob.glob(t):
+                port = SerialPort(p, 115200)
+                port.write("AT\r")
+                time.sleep(0.1)
+                ret = port.read_line()
+                if ret is None:
+                    port.close()
+                    continue
+                ret = port.read_line()
+                if ret == "OK":
+                    return p
         return None
 
 class SockServer(threading.Thread):

setup.py

@@ -5,7 +5,7 @@
 from setuptools import setup, find_packages
 from setuptools.command.test import test as TestCommand
 
-version = "0.1.1"
+version = "0.1.2"
 
 class PyTest(TestCommand):
     def finalize_options(self):