Merge pull request #89 from lwindg/develop

feat: Support secondary APN & retry timeout

Author: imZack

build-deb/debian/changelog

@@ -1,3 +1,11 @@
+sanji-bundle-cellular (3.0.0-1) unstable; urgency=low
+
+  * feat: Support secondary APN.
+  * feat: Support advanced signal information.
+  * feat: Support phone number.
+
+ -- Aeluin Chen <[email protected]>  Wed, 19 Oct 2016 17:24:12 +0800
+
 sanji-bundle-cellular (2.1.0-1) unstable; urgency=low
 
   * fix: sh default timeout

build-deb/debian/control

@@ -13,6 +13,6 @@ X-Python-Version: >= 2.5
 Package: sanji-bundle-cellular
 Section: libs
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python2.7, python-pip, vnstat, moxa-cellular-utils (>= 1.9.4)
+Depends: ${shlibs:Depends}, ${misc:Depends}, python2.7, python-pip, vnstat, moxa-cellular-utils (>= 1.9.6)
 Description: This model provides cellular using QMI.
 

bundle.json

@@ -1,6 +1,6 @@
 {
   "name": "cellular",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "author": "Aeluin Chen",
   "email": "[email protected]",
   "description": "Provides the cellular configuration interface",

cellular_utility/cell_mgmt.py

@@ -214,18 +214,30 @@ class Signal(object):
     def __init__(
             self,
             mode=None,
-            rssi_dbm=None):
+            rssi_dbm=None,
+            ecio_dbm=None,
+            csq=None):
         self._mode = "none" if mode is None else mode
         self._rssi_dbm = 0 if rssi_dbm is None else rssi_dbm
+        self._ecio_dbm = 0.0 if ecio_dbm is None else ecio_dbm
+        self._csq = 0 if csq is None else csq
 
     @property
     def mode(self):
         return self._mode
 
+    @property
+    def csq(self):
+        return self._csq
+
     @property
     def rssi_dbm(self):
         return self._rssi_dbm
 
+    @property
+    def ecio_dbm(self):
+        return self._ecio_dbm
+
 
 class CellularLocation(object):
     def __init__(
@@ -248,6 +260,20 @@ def lac(self):
         return self._lac
 
 
+class CellularNumber(object):
+    def __init__(
+            self,
+            number=None):
+        if not isinstance(number, str):
+            raise ValueError
+
+        self._number = number
+
+    @property
+    def number(self):
+        return self._number
+
+
 class CellMgmt(object):
     """
     cell_mgmt utilty wrapper
@@ -263,6 +289,10 @@ class CellMgmt(object):
         r"DNS=([0-9\. ]*)\n")
     _signal_regex = re.compile(
         r"^([\S]+) (-[0-9]+) dbm\n$")
+    _signal_adv_regex = re.compile(
+        r"^CSQ: ([0-9]+)\n"
+        r"RSSI: ([\S]+) (-[0-9]+) dBm\n"
+        r"EcIo: ([\S]+) (-[0-9.]+) dBm\n")
     _m_info_regex = re.compile(
         r"^Module=([\S ]+)\n"
         r"WWAN_node=([\S]+)\n"
@@ -286,6 +316,9 @@ class CellMgmt(object):
         r"[\n\t ]*PUK1 retries: '([0-9]+)'\n"
     )
 
+    _number_regex = re.compile(
+        r"^([^\n]*)[\n]{0,1}")
+
     _at_response_ok_regex = re.compile(
         r"^[\r\n]*([+\S\s :]*)[\r\n]+OK[\r\n]*$")
     _at_response_err_regex = re.compile(
@@ -475,6 +508,54 @@ def signal(self):
         # signal out of range
         return Signal()
 
+    @critical_section
+    @handle_error_return_code
+    @retry_on_busy
+    def signal_adv(self):
+        """Returns an instance of Signal."""
+
+        _logger.debug("cell_mgmt signal_adv")
+
+        output = self._cell_mgmt("signal_adv")
+        output = str(output)
+
+        if self._invoke_period_sec != 0:
+            sleep(self._invoke_period_sec)
+
+        match = CellMgmt._signal_adv_regex.match(output)
+        if match:
+            return Signal(
+                csq=int(match.group(1)),
+                mode=match.group(2),
+                rssi_dbm=int(match.group(3)),
+                ecio_dbm=float(match.group(5)))
+
+        _logger.warning("unexpected output: " + output)
+        # signal out of range
+        return Signal()
+
+    @critical_section
+    @handle_error_return_code
+    @retry_on_busy
+    def number(self):
+        """Returns an instance of CellularNumber."""
+
+        _logger.debug("cell_mgmt number")
+
+        output = self._cell_mgmt("number")
+        output = str(output)
+
+        if self._invoke_period_sec != 0:
+            sleep(self._invoke_period_sec)
+
+        match = CellMgmt._number_regex.match(output)
+        if match:
+            return CellularNumber(
+                number=match.group(1))
+
+        _logger.warning("unexpected output: " + output)
+        return CellularNumber()
+
     @critical_section
     def status(self):
         """

cellular_utility/event.py

@@ -39,8 +39,8 @@ def log_cellular_information(
         self._log(
             "mode {}, signal {} dBm, rssi {}, lac {}, cell_id {}".format(
                 cellular_information.mode,
-                str(cellular_information.signal_dbm),
-                str(self._rssi_from_dbm(cellular_information.signal_dbm)),
+                str(cellular_information.signal_rssi_dbm),
+                str(cellular_information.signal_csq),
                 cellular_information.lac,
                 cellular_information.cell_id)
         )