micrOSDevToolKit 2.9.9__py3-none-any.whl → 2.9.10__py3-none-any.whl

toolkit/dashboard_apps/NeopixelTest.py

@@ -5,19 +5,15 @@ import sys
 import time
 import random
 MYPATH = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.dirname(MYPATH))
-import socketClient
-import time
 sys.path.append(os.path.join(MYPATH, '../lib/'))
 from TerminalColors import Colors
 
-# FILL OUT
-DEVICE = 'node01'
-
-
-def base_cmd():
-    return ['--dev', DEVICE]
+try:
+    from ._app_base import AppBase
+except:
+    from _app_base import AppBase
 
+CLIENT = None
 
 def test_random_colors(test_len=8, smooth=False):
     main_function = 'neopixel color'
@@ -31,12 +27,12 @@ def test_random_colors(test_len=8, smooth=False):
 
     # Generate command
     cmd_list_str = " <a> ".join(["{} {} {} {} {} >json".format(main_function, k[0], k[1], k[2], smooth) for k in color_list])
-    args = base_cmd() + [cmd_list_str]
+    args = [cmd_list_str]
     print("{} Generated command {} - multi message single connection single connection: {} r g b {}\n{}".format(Colors.HEADER, Colors.NC, main_function, smooth, args))
 
     start_t = time.time()
     # SEND MESSSAGE OVER micrOS client
-    status, answer = socketClient.run(args)
+    status, answer = CLIENT.run(args)
     delta_t = round((time.time() - start_t)/test_len, 1)
 
     #Evaluate last message
@@ -53,14 +49,14 @@ def test_random_colors(test_len=8, smooth=False):
 
 def test_toogle():
     main_function = 'neopixel toggle'
-    args_on = base_cmd() + [f'{main_function} True >json']
-    args_toggle = base_cmd() + [f'{main_function} >json']
+    args_on = [f'{main_function} True >json']
+    args_toggle = [f'{main_function} >json']
 
     # SEND MESSSAGE OVER micrOS client
-    status, answer = socketClient.run(args_on)
+    status, answer = CLIENT.run(args_on)
     if status and '"S": 1' in answer:
         # SEND MESSSAGE OVER micrOS client
-        status, answer = socketClient.run(args_toggle)
+        status, answer = CLIENT.run(args_toggle)
         if status and '"S": 0' in answer:
             return True, '{} works {}OK{}'.format(main_function, Colors.OK, Colors.NC)
     return False, '{} not works {}NOK{}: {}'.format(main_function, Colors.ERR, Colors.NC, answer)
@@ -68,24 +64,23 @@ def test_toogle():
 
 def test_brightness():
     main_function = 'neopixel brightness'
-    args_10 = base_cmd() + [f'{main_function} 10 >json']
-    args_50 = base_cmd() + [f'{main_function} 50 >json']
-    args_actual_br = base_cmd() + [f'{main_function} >json']
+    args_10 = [f'{main_function} 10 >json']
+    args_50 = [f'{main_function} 50 >json']
+    args_actual_br = [f'{main_function} >json']
 
-    status, answer = socketClient.run(args_10)
+    status, answer = CLIENT.run(args_10)
     if status:
-        status, answer = socketClient.run(args_50)
+        status, answer = CLIENT.run(args_50)
         if status:
-            status, answer = socketClient.run(args_actual_br)
+            status, answer = CLIENT.run(args_actual_br)
             if status and "50.0 %" in answer:
                 return True, "{} function {}OK{} (50.0 % == {})".format(main_function, Colors.OK, Colors.NC, answer)
     return False, "{} function {}NOK{} (50.0 % == {})".format(main_function, Colors.ERR, Colors.NC, answer)
 
 
-def app(devfid=None):
-    global DEVICE
-    if devfid is not None:
-        DEVICE = devfid
+def app(devfid=None, pwd=None):
+    global CLIENT
+    CLIENT = AppBase(device=devfid, password=pwd)
 
     test_pool = { 'Color change test': test_random_colors(test_len=8, smooth=False),
                   'Color smooth test': test_random_colors(test_len=4, smooth=True),

toolkit/dashboard_apps/PresenceTest.py

@@ -2,15 +2,9 @@ import sys, os
 import subprocess
 MYPATH = os.path.dirname(os.path.abspath(__file__))
 
-DEVICE = "node01"
-
-
-def app(devfid=None):
+def app(devfid=None, pwd=None):
     """
     Wrapper function to start subprocess plotting... (threading limitation)
     """
-    global DEVICE
-    if devfid is not None:
-        DEVICE = devfid
-    result = subprocess.run([f'{sys.executable}', os.path.join(MYPATH, '_presencePlotting.py'), DEVICE])
+    result = subprocess.run([f'{sys.executable}', os.path.join(MYPATH, '_presencePlotting.py'), devfid])
     print(result)

toolkit/dashboard_apps/RGBTest.py

@@ -5,18 +5,15 @@ import sys
 import time
 import random
 MYPATH = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.dirname(MYPATH))
-import socketClient
-import time
 sys.path.append(os.path.join(MYPATH, '../lib/'))
 from TerminalColors import Colors
 
-# FILL OUT
-DEVICE = 'node01'
-
+try:
+    from ._app_base import AppBase
+except:
+    from _app_base import AppBase
 
-def base_cmd():
-    return ['--dev', DEVICE]
+CLIENT = None
 
 
 def test_random_colors(test_len=8, smooth=False):
@@ -31,12 +28,12 @@ def test_random_colors(test_len=8, smooth=False):
 
     # Generate command
     cmd_list_str = " <a> ".join(["{} {} {} {} {} >json".format(main_function, k[0], k[1], k[2], smooth) for k in color_list])
-    args = base_cmd() + [cmd_list_str]
+    args = [cmd_list_str]
     print("{} Generated command {} - multi message single connection single connection: {} r g b {}\n{}".format(Colors.HEADER, Colors.NC, main_function, smooth, args))
 
     start_t = time.time()
     # SEND MESSSAGE OVER micrOS client
-    status, answer = socketClient.run(args)
+    status, answer = CLIENT.run(args)
     delta_t = round((time.time() - start_t)/test_len, 1)
 
     #Evaluate last message
@@ -53,14 +50,14 @@ def test_random_colors(test_len=8, smooth=False):
 
 def test_toogle():
     main_function = 'rgb toggle'
-    args_on = base_cmd() + [f'{main_function} True >json']
-    args_toggle = base_cmd() + [f'{main_function} >json']
+    args_on = [f'{main_function} True >json']
+    args_toggle = [f'{main_function} >json']
 
     # SEND MESSSAGE OVER micrOS client
-    status, answer = socketClient.run(args_on)
+    status, answer = CLIENT.run(args_on)
     if status and '"S": 1' in answer:
         # SEND MESSSAGE OVER micrOS client
-        status, answer = socketClient.run(args_toggle)
+        status, answer = CLIENT.run(args_toggle)
         if status and '"S": 0' in answer:
             return True, '{} works {}OK{}'.format(main_function, Colors.OK, Colors.NC)
     return False, '{} not works {}NOK{}: {}'.format(main_function, Colors.ERR, Colors.NC, answer)
@@ -68,24 +65,23 @@ def test_toogle():
 
 def test_brightness():
     main_function = 'rgb brightness'
-    args_10 = base_cmd() + [f'{main_function} 10 >json']
-    args_50 = base_cmd() + [f'{main_function} 50 >json']
-    args_actual_br = base_cmd() + [f'{main_function} >json']
+    args_10 = [f'{main_function} 10 >json']
+    args_50 = [f'{main_function} 50 >json']
+    args_actual_br = [f'{main_function} >json']
 
-    status, answer = socketClient.run(args_10)
+    status, answer = CLIENT.run(args_10)
     if status:
-        status, answer = socketClient.run(args_50)
+        status, answer = CLIENT.run(args_50)
         if status:
-            status, answer = socketClient.run(args_actual_br)
+            status, answer = CLIENT.run(args_actual_br)
             if status and "50.0 %" in answer:
                 return True, "{} function {}OK{} (50.0 % == {})".format(main_function, Colors.OK, Colors.NC, answer)
     return False, "{} function {}NOK{} (50.0 % == {})".format(main_function, Colors.ERR, Colors.NC, answer)
 
 
-def app(devfid=None):
-    global DEVICE
-    if devfid is not None:
-        DEVICE = devfid
+def app(devfid=None, pwd=None):
+    global CLIENT
+    CLIENT = AppBase(device=devfid, password=pwd)
 
     test_pool = { 'Color change test': test_random_colors(test_len=8, smooth=False),
                   'Color smooth test': test_random_colors(test_len=4, smooth=True),

toolkit/dashboard_apps/RoboArm.py

@@ -1,15 +1,12 @@
 #!/usr/bin/env python3
 
-import os
-import sys
-import time
-MYPATH = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.dirname(MYPATH))
-import socketClient
+try:
+    from ._app_base import AppBase
+except:
+    from _app_base import AppBase
 
 
-# FILL OUT
-DEVICE = 'RoboArm'
+CLIENT = None
 __TEST_DATA = {'ok': 0, 'err': 0}
 
 
@@ -22,58 +19,53 @@ def test_eval(state, msg):
         __TEST_DATA['err'] += 1
 
 
-def base_cmd():
-    return ['--dev', DEVICE]
-
-
-def app(devfid=None):
+def app(devfid=None, pwd=None):
     """
     devfid: selected device input
         send command(s) over socket connection [socketClient.run(args)]
         <a> command separator in single connection
     """
-    global DEVICE
-    if devfid is not None:
-        DEVICE = devfid
+    global CLIENT
+    CLIENT = AppBase(device=devfid, password=pwd)
 
     def home():
-        args = base_cmd() + ['roboarm control 75 70']
-        status, answer = socketClient.run(args)
+        args = ['roboarm control 75 70']
+        status, answer = CLIENT.run(args)
         test_eval(status, answer)
 
     def switch(state=False):
-        args = base_cmd() + ['switch set_state {}'.format(state)]
-        status, answer = socketClient.run(args)
+        args = ['switch set_state {}'.format(state)]
+        status, answer = CLIENT.run(args)
         print(answer)
 
     home()
     switch(True)
 
-    args = base_cmd() + ['roboarm control 40 40 speed_ms=7']
-    status, answer = socketClient.run(args)
+    args = ['roboarm control 40 40 speed_ms=7']
+    status, answer = CLIENT.run(args)
     test_eval(status, answer)
 
     home()
 
-    args = base_cmd() + ['roboarm control 115 115']
-    status, answer = socketClient.run(args)
+    args = ['roboarm control 115 115']
+    status, answer = CLIENT.run(args)
     test_eval(status, answer)
 
-    args = base_cmd() + ['roboarm control 40 115']
-    status, answer = socketClient.run(args)
+    args = ['roboarm control 40 115']
+    status, answer = CLIENT.run(args)
     test_eval(status, answer)
 
-    args = base_cmd() + ['roboarm control 115 40']
-    status, answer = socketClient.run(args)
+    args = ['roboarm control 115 40']
+    status, answer = CLIENT.run(args)
     test_eval(status, answer)
 
-    args = base_cmd() + ['roboarm control 40 40']
-    status, answer = socketClient.run(args)
+    args = ['roboarm control 40 40']
+    status, answer = CLIENT.run(args)
     test_eval(status, answer)
 
     # Move back to home pos
-    args = base_cmd() + ['roboarm control 75 70 speed_ms=3']
-    status, answer = socketClient.run(args)
+    args = ['roboarm control 75 70 speed_ms=3']
+    status, answer = CLIENT.run(args)
     test_eval(status, answer)
 
     switch(False)

toolkit/dashboard_apps/SED_test.py

@@ -3,18 +3,15 @@
 import os
 import sys
 import time
+
 MYPATH = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.dirname(MYPATH))
-import socketClient
 sys.path.append(os.path.join(MYPATH, '../lib/'))
 from TerminalColors import Colors
 
-# FILL OUT
-DEVICE = 'node01'
-
-
-def base_cmd():
-    return ['--dev', DEVICE]
+try:
+    from ._app_base import AppBase
+except:
+    from _app_base import AppBase
 
 
 def test():
@@ -68,22 +65,21 @@ def test():
     return status
 
 
-def app(devfid=None):
+def app(devfid=None, pwd=None):
     """
     devfid: selected device input
         send command(s) over socket connection [socketClient.run(args)]
     """
-    global DEVICE
-    if devfid is not None:
-        DEVICE = devfid
+    global CLIENT
+    CLIENT = AppBase(device=devfid, password=pwd)
+
     verdict = test()
     col = Colors.OK if verdict else Colors.ERR
     print("VERDICT: {}{}{}".format(col, verdict, Colors.NC))
 
 
 def send_cmd(cmd_list):
-    args = base_cmd() + cmd_list
-    status, answer = socketClient.run(args)
+    status, answer = CLIENT.run(cmd_list)
     col = Colors.OK if status else Colors.ERR
     print("CMDS: {}\n{}{}{}\n".format(cmd_list, col, answer, Colors.NC))
     return status

toolkit/dashboard_apps/SensorsTest.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+
+import os
+MYPATH = os.path.dirname(os.path.abspath(__file__))
+
+try:
+    from ._app_base import AppBase
+except:
+    from _app_base import AppBase
+
+CLIENT = None
+
+def measure(args, req_cnt=5):
+    verdict = f"Measure with {args[0]}"
+    print(verdict)
+    err_cnt = 0
+    for k in range(0, req_cnt):
+        try:
+            status, answer = CLIENT.run(args)
+            if status:
+                print(f"\t|- [{k+1}/{req_cnt}] OK")
+            else:
+                print(f"\t|- [{k+1}/{req_cnt}] ERR")
+                err_cnt += 1
+        except KeyboardInterrupt:
+            break
+    verdict = f"{verdict}\t" + "[OK]" if err_cnt == 0 else f"[ERR] {err_cnt}"
+    return verdict
+
+
+def app(devfid=None, pwd=None):
+    global CLIENT
+    CLIENT = AppBase(device=devfid, password=pwd)
+    report = []
+
+    state, result = CLIENT.run(['modules'])
+    if not state:
+        return "Error getting models."
+
+    if "bme280" in result:
+        args = ['bme280 measure']
+        report.append(measure(args))
+
+    if "dht22" in result:
+        args = ['dht22 measure']
+        report.append(measure(args))
+
+    if "dht11" in result:
+        args = ['dht22 measure']
+        report.append(measure(args))
+
+    if "ds18" in result:
+        args = ['ds18 measure']
+        report.append(measure(args))
+
+    print(f"\n======== Sensor test report {CLIENT.get_device()} ========")
+    for r in report:
+        print(f"\t{r}")
+
+if __name__ == "__main__":
+    app()