micrOSDevToolKit 2.9.8__py3-none-any.whl → 2.9.11__py3-none-any.whl

toolkit/dashboard_apps/CCTTest.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):
@@ -30,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], smooth) for k in cct_list])
-    args = base_cmd() + [cmd_list_str]
+    args = [cmd_list_str]
     print("{} Generated command {} - multi message single connection single connection: {} cold warm {}\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
@@ -51,14 +48,14 @@ def test_random_colors(test_len=8, smooth=False):
 
 def test_toogle():
     main_function = 'cct 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)
@@ -66,24 +63,23 @@ def test_toogle():
 
 def test_brightness():
     main_function = 'cct 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/CamStream.py

@@ -2,14 +2,10 @@ 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, '_capture.py'), DEVICE])
+    result = subprocess.run([f'{sys.executable}', os.path.join(MYPATH, '_capture.py'), devfid])
     print(result)

toolkit/dashboard_apps/CatGame.py

@@ -1,28 +1,26 @@
 #!/usr/bin/env python3
 
 import os
-import sys
 import atexit
 from random import randint
 MYPATH = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.dirname(MYPATH))
-import socketClient
 
-DEVICE = 'ImpiGamePro'
+try:
+    from ._app_base import AppBase
+except:
+    from _app_base import AppBase
+
+CLIENT = None
 CMD_PIPE_SEP = '<a>'
 SERVO_CENTER_VAL = 77
 
 
-def base_cmd():
-    return ['--dev', DEVICE]
-
-
 def play_game(iteration=30, devfid=None):
     global CMD_PIPE_SEP
     for _ in range(iteration):
         piped_commands = []
 
-        args = base_cmd() + ['servo sduty {} '.format(SERVO_CENTER_VAL)]
+        args = ['servo sduty {} '.format(SERVO_CENTER_VAL)]
         print("CMD: {}".format(args))
         args.append(CMD_PIPE_SEP)
         piped_commands += args
@@ -39,19 +37,19 @@ def play_game(iteration=30, devfid=None):
         piped_commands += args
 
         print("CMD PIPE: {}".format(piped_commands))
-        socketClient.run(piped_commands)
+        CLIENT.run(piped_commands)
 
 
 def deinit_servo():
     print("DEINIT SERVO, SET TO {} and DEINIT".format(SERVO_CENTER_VAL))
-    args = base_cmd() + ['servo sduty {}'.format(SERVO_CENTER_VAL)]
-    socketClient.run(args)
+    args = ['servo sduty {}'.format(SERVO_CENTER_VAL)]
+    CLIENT.run(args)
+
 
+def app(devfid=None, pwd=None):
+    global CLIENT
+    CLIENT = AppBase(device=devfid, password=pwd)
 
-def app(devfid=None):
-    global DEVICE
-    if devfid is not None:
-        DEVICE = devfid
     atexit.register(deinit_servo)
     play_game()
     deinit_servo()

toolkit/dashboard_apps/Dimmer.py

@@ -1,43 +1,33 @@
 #!/usr/bin/env python3
 
 import os
-import sys
 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 = 'CamLed'
+CLIENT = None
 
 
-def base_cmd():
-    return ['--dev', DEVICE]
+def app(devfid=None, pwd=None, itr=80):
+    global CLIENT
+    CLIENT = AppBase(device=devfid, password=pwd)
 
-
-def app(devfid=None, itr=80):
-    global DEVICE
-    if devfid is not None:
-        DEVICE = devfid
     # EDIT YOUR COMMAND
     cmd_list = []
     for k in range(0, itr, 2):
         cmd_list += ['dimmer set_value {} smooth=False >json'.format(k)]
-    execute(cmd_list)
+    CLIENT.run(cmd_list)
 
     cmd_list = []
     for k in range(itr, 0, -2):
         cmd_list += ['dimmer set_value {} smooth=False >json'.format(k)]
-    execute(cmd_list)
+    CLIENT.run(cmd_list)
 
     cmd_list = ['dimmer set_value 300', 'dimmer toggle False', 'dimmer toggle True']
-    execute(cmd_list)
-
-
-def execute(cmd_list):
-    cmd_args = base_cmd() + cmd_list
-    print("DIMMER TEST: {}".format(cmd_args))
-    socketClient.run(cmd_args)
+    CLIENT.run(cmd_list)
 
 
 if __name__ == "__main__":

toolkit/dashboard_apps/GetVersion.py

@@ -4,31 +4,23 @@ import os
 import sys
 import time
 MYPATH = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.dirname(MYPATH))
-import socketClient
 
-# FILL OUT
-DEVICE = 'node01'
-PASSWD = None
-
-
-def base_cmd():
-    if PASSWD is None:
-        return ['--dev', DEVICE]
-    return ['--dev', DEVICE, '--password', PASSWD]
+try:
+    from ._app_base import AppBase
+except:
+    from _app_base import AppBase
 
+CLIENT = None
 
 
 def app(devfid=None, pwd=None):
-    global DEVICE, PASSWD
-    if devfid is not None:
-        DEVICE = devfid
-    if pwd is not None:
-        PASSWD = pwd
+    global CLIENT
+    CLIENT = AppBase(device=devfid, password=pwd)
+
     # EDIT YOUR COMMAND
-    args = base_cmd() + ['version']
-    status, answer = socketClient.run(args)
-    print("[micrOS] {}: {}".format(DEVICE, answer).upper())
+    args = ['version']
+    status, answer = CLIENT.run(args)
+    print("[micrOS] {}: {}".format(CLIENT.get_device(), answer).upper())
 
 
 if __name__ == "__main__":

toolkit/dashboard_apps/MicrophoneTest.py

@@ -2,15 +2,10 @@ import sys, os
 import subprocess
 MYPATH = os.path.dirname(os.path.abspath(__file__))
 
-DEVICE = "node01"
-
 
 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, '_micPlotting.py'), DEVICE])
+    result = subprocess.run([f'{sys.executable}', os.path.join(MYPATH, '_micPlotting.py'), devfid])
     print(result)

toolkit/dashboard_apps/NeoEffectsDemo.py

@@ -1,72 +1,66 @@
 #!/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
-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
 
+CLIENT = None
 
-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)]
         list load module commands and send in single connection
     """
-    global DEVICE
-    if devfid is not None:
-        DEVICE = devfid
+    global CLIENT
+    CLIENT = AppBase(device=devfid, password=pwd)
 
-    args = base_cmd() + ['task kill neoeffects.*', 'neopixel toggle False', 'neopixel toggle True']
-    status, answer = socketClient.run(args)
+    args = ['task kill neoeffects.*', 'neopixel toggle False', 'neopixel toggle True']
+    status, answer = CLIENT.run(args)
     time.sleep(2)
 
-    status, answer = socketClient.run(base_cmd() + ['neoeffects rainbow &&'])
+    status, answer = CLIENT.run(['neoeffects rainbow &&'])
     time.sleep(2)
-    status, answer = socketClient.run(base_cmd() + ['task kill neoeffects.rainbow'])
+    status, answer = CLIENT.run(['task kill neoeffects.rainbow'])
 
-    status, answer = socketClient.run(base_cmd() + ['neoeffects color 122 18 0'])
+    status, answer = CLIENT.run(['neoeffects color 122 18 0'])
 
-    status, answer = socketClient.run(base_cmd() + ['neoeffects cycle &&'])
+    status, answer = CLIENT.run(['neoeffects cycle &&'])
     time.sleep(2)
-    status, answer = socketClient.run(base_cmd() + ['task kill neoeffects.cycle'])
+    status, answer = CLIENT.run(['task kill neoeffects.cycle'])
 
-    status, answer = socketClient.run(base_cmd() + ['neoeffects meteor &&'])
+    status, answer = CLIENT.run(['neoeffects meteor &&'])
     time.sleep(2)
-    status, answer = socketClient.run(base_cmd() + ['task kill neoeffects.meteor'])
+    status, answer = CLIENT.run(['task kill neoeffects.meteor'])
 
-    status, answer = socketClient.run(base_cmd() + ['neoeffects fire &&'])
+    status, answer = CLIENT.run(['neoeffects fire &&'])
     time.sleep(2)
-    status, answer = socketClient.run(base_cmd() + ['task kill neoeffects.fire'])
+    status, answer = CLIENT.run(['task kill neoeffects.fire'])
 
     time.sleep(1)
 
-    status, answer = socketClient.run(base_cmd() + ['neoeffects random &&500'])
+    status, answer = CLIENT.run(['neoeffects random &&500'])
 
-    status, answer = socketClient.run(base_cmd() + ['neoeffects cycle &&'])
+    status, answer = CLIENT.run(['neoeffects cycle &&'])
     time.sleep(3)
-    status, answer = socketClient.run(base_cmd() + ['task kill neoeffects.cycle'])
+    status, answer = CLIENT.run(['task kill neoeffects.cycle'])
 
-    status, answer = socketClient.run(base_cmd() + ['neoeffects meteor &&'])
+    status, answer = CLIENT.run(['neoeffects meteor &&'])
     time.sleep(3)
-    status, answer = socketClient.run(base_cmd() + ['task kill neoeffects.meteor'])
+    status, answer = CLIENT.run(['task kill neoeffects.meteor'])
 
-    status, answer = socketClient.run(base_cmd() + ['neoeffects fire &&'])
+    status, answer = CLIENT.run(['neoeffects fire &&'])
     time.sleep(3)
-    status, answer = socketClient.run(base_cmd() + ['task kill neoeffects.fire'])
+    status, answer = CLIENT.run(['task kill neoeffects.fire'])
 
-    status, answer = socketClient.run(base_cmd() + ['task kill neoeffects.random'])
-    status, answer = socketClient.run(base_cmd() + ['neopixel color 122 18 0'])
+    status, answer = CLIENT.run(['task kill neoeffects.random'])
+    status, answer = CLIENT.run(['neopixel color 122 18 0'])
 
 
 if __name__ == "__main__":

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),