Merge branch 'release/0.1.1'

README.md

@@ -29,8 +29,18 @@ $ ./setup.py install --record files.txt
 $ cat files.txt | xargs rm -rf
 ```
 
+## Test
+
+```
+$ ./setup.py test
+```
+
 # Revision history
-* 0.1.0
+
+ * 0.1.1
+   - Fix resolve_modem_port()
+
+ * 0.1.0
    - Remove modem_auto_connect()
    - Add a new function to enable ACM, modem_enable_acm()
    - Add a new function delete APN, apn_del()

lib/candy_board_amt/__init__.py

@@ -12,6 +12,7 @@
 import threading
 import time
 import glob
+import platform
 
 # SerialPort class was imported from John Wiseman's https://github.com/wiseman/arduino-serial/blob/master/arduinoserial.py
 
@@ -119,14 +120,21 @@ def close(self):
             pass
 
     @staticmethod
-    def resolve_modem_port(self):
+    def resolve_modem_port():
+        if platform.system() != 'Linux':
+            return None
         for p in glob.glob("/dev/tty*"):
-            port = candy_board_amt.SerialPort(p, 115200)
+            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()
-            port.close()
-            if ret == "AT":
+            if ret == "OK":
                 return p
         return None
 

setup.py

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

tests/sock_server_test.py

@@ -60,3 +60,6 @@ def test_modem_enable_ecm(setup_sock_server):
 def test_service_version(setup_sock_server):
     ret = setup_sock_server.perform({'category':'service', 'action':'version'})
     assert ret == '{"status": "OK", "result": {"version": "devel"}}'
+
+def test_resolve_modem_port(setup_sock_server):
+    candy_board_amt.SerialPort.resolve_modem_port()