SmartMesh SDK 1.3.0.1

dustcloud · Feb 28, 2018 · 979b23e · 979b23e
1 parent 0180536
commit 979b23e
Show file tree

Hide file tree

Showing 11 changed files with 420 additions and 335 deletions.
diff --git a/PKG-INFO b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: SmartMeshSDK
-Version: 1.1.2.4
+Version: 1.3.0.1
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: Linear Technology

diff --git a/app/HrListener/HrListener.py b/app/HrListener/HrListener.py
@@ -55,16 +55,14 @@ def emit(self, record):
 
 #============================ setup/teardown ==================================
 
+# logging
 def setup_module(function):
-
-    # setup logging
     for loggerName in LOG_MODULES:
         temp = logging.getLogger(loggerName)
         temp.setLevel(logging.DEBUG)
         temp.addHandler(logHandler)
 
 # global
-
 AppUtils.configureLogging()
 
 # HR logs (do last)
@@ -100,12 +98,12 @@ def __init__(self, connector, disconnectedCallback):
 
         # variables
         self.data      = []
-        self.data.append(['mac' , '# Device HRs', '# Neighbors HRs', '# Discovered HRs']) # header
+        self.data.append(['mac' , '# Device HRs', '# Neighbors HRs', '# Discovered HRs', '# RSSI HRs']) # header
         self.dataLock  = threading.Lock()
         self.hrParser  = HrParser.HrParser()
 
         # log
-        hrlog.info("============= START LOGGING HEALTH REPORTS ==============")
+        hrlog.info("========= START LOGGING HEALTH REPORTS =========")
 
         # subscriber
         self.subscriber = IpMgrSubscribe.IpMgrSubscribe(self.connector)
@@ -136,7 +134,7 @@ def getData(self):
     def disconnect(self):
 
         # log
-        hrlog.info("============== STOP LOGGING HEALTH REPORTS =============")
+        hrlog.info("========= STOP LOGGING HEALTH REPORTS ==========")
 
         self.connector.disconnect()
 
@@ -161,9 +159,9 @@ def _notifCallback(self, notifName, notifParams):
             with self.dataLock:
                 # format of data:
                 # [
-                #     [''                        , 'Device', 'Neighbors', 'Discovered'],
-                #     ['11-11-11-11-11-11-11-11' ,        0,           3,            2],
-                #     ['22-22-22-22-22-22-22-22' ,        0,           3,            2],
+                #     [''                        , 'Device', 'Neighbors', 'Discovered', 'RSSI'],
+                #     ['11-11-11-11-11-11-11-11' ,        0,           3,            2,      4],
+                #     ['22-22-22-22-22-22-22-22' ,        0,           3,            2,      5],
                 # ]
 
                 # find notifName row
@@ -175,7 +173,7 @@ def _notifCallback(self, notifName, notifParams):
 
                 # create row if needed
                 if not found:
-                    self.data.append([mac,0,0,0])
+                    self.data.append([mac,0,0,0,0])
                     row = self.data[-1]
 
                 # increment counters
@@ -185,6 +183,8 @@ def _notifCallback(self, notifName, notifParams):
                     row[2] += 1
                 if 'Discovered' in hr:
                     row[3] += 1
+                if 'Extended' in hr:
+                    row[4] += 1
 
         except Exception as err:
             print type(err)