micrOSDevToolKit 3.3.2__tar.gz → 3.3.4__tar.gz

{microsdevtoolkit-3.3.2/micrOSDevToolKit.egg-info → microsdevtoolkit-3.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 3.3.2
+Version: 3.3.4
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -53,7 +53,7 @@
             3
         ],
         "Types.py": [
-            9.09,
+            9.0,
             24
         ],
         "Logger.py": [
@@ -197,11 +197,11 @@
             0
         ],
         "modules/LM_neopixel.py": [
-            7.77,
+            7.72,
             2
         ],
         "modules/LM_cct.py": [
-            9.03,
+            8.98,
             1
         ],
         "modules/LM_L9110_DCmotor.py": [
@@ -253,7 +253,7 @@
             0
         ],
         "modules/LM_rgb.py": [
-            9.01,
+            8.95,
             1
         ],
         "modules/LM_distance.py": [
@@ -277,7 +277,7 @@
             0
         ],
         "modules/LM_dimmer.py": [
-            8.32,
+            8.33,
             1
         ],
         "modules/LM_gameOfLife.py": [
@@ -303,11 +303,11 @@
     },
     "summary": {
         "core": [
-            5477,
+            5479,
             27
         ],
         "load": [
-            7589,
+            7593,
             48
         ],
         "core_dep": [
@@ -318,8 +318,8 @@
             true,
             5
         ],
-        "core_score": 9.29,
+        "core_score": 9.28,
         "load_score": 8.41,
-        "version": "3.3.0-0"
+        "version": "3.3.1-0"
     }
 }

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/source/Shell.py

@@ -28,7 +28,7 @@ IMAGE_MODE = 'rel' if 'micrOS' in uname()[-1] else 'dev'
 
 class Shell:
     __slots__ = ['__devfid', '__auth_mode', '__hwuid', '__auth_ok', '__conf_mode']
-    MICROS_VERSION = '3.3.0-0'
+    MICROS_VERSION = '3.3.1-0'
 
     def __init__(self):
         """

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/source/Types.py

@@ -11,6 +11,8 @@ USAGE:
     SLIDER brightness br
     SLIDER brightness br=<0-100>
     SLIDER brightness br=<0-100-5>
+
+    STATUS status
     GRAPH top
     EMBED{"callback": "/cam/stream", "title": "live stream", "image": true}
 """
@@ -27,15 +29,16 @@ __RANGE_255 = {'range': (0, 255, 2)}
 __OPTIONS = {'options': ("None",)}
 
 # Widget Types - Load Module Callbacks
-BUTTON = lambda: __TEMPLATE | {'type': 'button', 'result': False} | __OPTIONS        # pylint: disable=invalid-name
+BUTTON = lambda: __TEMPLATE | {'type': 'button', 'result': False} | __OPTIONS       # pylint: disable=invalid-name
 SLIDER = lambda: __TEMPLATE | {'type': 'slider'} | __RANGE_100                      # pylint: disable=invalid-name
 TEXTBOX = lambda: __TEMPLATE | {'type': 'textbox', 'refresh': 10000}                # pylint: disable=invalid-name
 COLOR = lambda: __TEMPLATE | {'type': 'color'} | __RANGE_255                        # pylint: disable=invalid-name
 WHITE = lambda: __TEMPLATE | {'type': 'white'} | __RANGE_255                        # pylint: disable=invalid-name
 JOYSTICK = lambda: __TEMPLATE | {'type': 'joystick'} | __RANGE_100                  # pylint: disable=invalid-name
+STATUS = lambda: __TEMPLATE | {'type': 'status', 'wtype': 'auto'}                   # pylint: disable=invalid-name
 GRAPH = lambda: __TEMPLATE | {'type': 'graph', 'refresh': 3000, 'limit': 30}        # pylint: disable=invalid-name
 # Widget Types - Web endpoints
-EMBED = lambda: __TEMPLATE | {'type': 'embed', 'image': False, 'title': None}    # pylint: disable=invalid-name
+EMBED = lambda: __TEMPLATE | {'type': 'embed', 'image': False, 'title': None}       # pylint: disable=invalid-name
 
 
 ########################################################

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/source/modules/LM_cct.py

@@ -322,11 +322,12 @@ def status(lmf=None):
     Show Load Module state machine
     :param lmf str: selected load module function aka (function to show state of): None (show all states)
     - micrOS client state synchronization
-    :return dict: CW, WW, S
+    :return dict: CW, WW, S, BR
     """
     # Cold White / Warm White dedicated widget input - [OK]
     data = Data.CWWW_CACHE
-    return {'CW': data[0], 'WW': data[1], 'S': data[2]}
+    brightness = 0 if data[2] == 0 else int(max(data[:2]) * 100 / Data.CH_MAX + 0.5)
+    return {'CW': data[0], 'WW': data[1], 'S': data[2], 'BR': brightness}
 
 
 def pinmap():
@@ -351,5 +352,6 @@ def help(widgets=False):
                     'SLIDER brightness percent=<0-100> smooth=True wake=True',
                     'transition cw=None ww=None sec=1.0 wake=False',
                     'hue_transition percent=<0-100> sec=1.0 wake=False',
-                    'BUTTON random smooth=True max_val=1000', 'status',
+                    'BUTTON random smooth=True max_val=1000',
+                    'STATUS status',
                     'subscribe_presence', 'pinmap'), widgets=widgets)

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/source/modules/LM_dimmer.py

@@ -97,7 +97,7 @@ def set_value(value=None, smooth=True, force=True):
     :param value: (int) value 0-1000 default: None (set cached value)
     :param smooth: (bool) run channel change with smooth effect
     :param force: (bool) clean fade generators and set value
-    :return dict: X, S
+    :return dict: X, S, BR
     """
 
     def __buttery(from_val, to_val):
@@ -134,7 +134,7 @@ def toggle(state=None, smooth=True):
     Toggle dimmer state based on the stored state
     :param state bool: True(1)/False(0)/None(default - automatic toggle)
     :param smooth bool: run channel change with smooth effect
-    :return dict: X, S
+    :return dict: X, S, BR
     """
     # Set state directly (inverse) + check change
     if state is not None:
@@ -206,11 +206,12 @@ def status(lmf=None):
     Show Load Module state machine
     :param lmf str: selected load module function aka (function to show state of): None (show all states)
     - micrOS client state synchronization
-    :return dict: X, S
+    :return dict: X, S, BR
     """
     # Slider dedicated widget input - [OK]
     data = Data.DIMMER_CACHE
-    return {'X': data[1], 'S': data[0]}
+    brightness = 0 if data[0] == 0 else int(data[1] * 100 / 1000 + 0.5)
+    return {'X': data[1], 'S': data[0], 'BR': brightness}
 
 
 def pinmap():
@@ -234,4 +235,5 @@ def help(widgets=False):
                              'BUTTON toggle state=<True,False> smooth=True',
                              'subscribe_presence',
                              'transition value=<0-1000> sec wake=False',
-                             'status', 'load', 'pinmap'), widgets=widgets)
+                             'STATUS status',
+                             'load', 'pinmap'), widgets=widgets)

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/source/modules/LM_neopixel.py

@@ -313,11 +313,12 @@ def status(lmf=None):
     Show Load Module state machine
     :param lmf str: selected load module function aka (function to show state of): None (show all states)
     - micrOS client state synchronization
-    :return dict: R, G, B, S
+    :return dict: R, G, B, S, BR
     """
     # Neopixel(=RGB) dedicated widget input - [OK]
     data = Data.DCACHE
-    return {'R': data[0], 'G': data[1], 'B': data[2], 'S': data[3]}
+    brightness = 0 if data[3] == 0 else int(max(data[:-1]) * 100 / Data.CH_MAX + 0.5)
+    return {'R': data[0], 'G': data[1], 'B': data[2], 'S': data[3], 'BR': brightness}
 
 
 def pinmap():
@@ -344,7 +345,7 @@ def help(widgets=False):
                              'segment r g b s=<0-n>',
                              'transition r g b sec=1.0 wake=False',
                              'BUTTON random smooth=True max_val=254',
-                             'status',
+                             'STATUS status',
                              'subscribe_presence',
                              'pinmap',
                              'help widgets=False'), widgets=widgets)

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/source/modules/LM_rgb.py

@@ -281,10 +281,11 @@ def status(lmf=None):
     Show Load Module state machine
     :param lmf str: selected load module function aka (function to show state of): None (show all states)
     - micrOS client state synchronization
-    :return dict: R, G, B, S
+    :return dict: R, G, B, S, BR
     """
     data = Data.RGB_CACHE
-    return {'R': data[0], 'G': data[1], 'B': data[2], 'S': data[3]}
+    brightness = 0 if data[3] == 0 else int(max(data[:-1]) * 100 / Data.CH_MAX + 0.5)
+    return {'R': data[0], 'G': data[1], 'B': data[2], 'S': data[3], 'BR': brightness}
 
 
 def pinmap():
@@ -309,4 +310,5 @@ def help(widgets=False):
                               'SLIDER brightness percent=<0-100> smooth=True wake=True',
                               'transition r=None g=None b=None sec=1.0 wake=False',
                               'BUTTON random smooth=True max_val=1000',
-                              'status', 'subscribe_presence', 'pinmap'), widgets=widgets)
+                              'STATUS status',
+                              'subscribe_presence', 'pinmap'), widgets=widgets)

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/source/modules/LM_rgbcct.py

@@ -3,6 +3,15 @@ import LM_cct
 from Types import resolve
 
 
+def __merge_status(rgb, cct):
+    if not isinstance(rgb, dict) or not isinstance(cct, dict):
+        return {'RGB': rgb, 'CCT': cct}
+    rgb.pop('BR', None)
+    cct.pop('BR', None)
+    rgb.update(cct)                         # Merge rgb and cct status
+    return rgb
+
+
 def load(cache=None):
     """
     Unified rgb and cct module usage as one module
@@ -19,18 +28,7 @@ def toggle(state=None, smooth=True):
     rgb = LM_rgb.toggle(state, smooth)
     rgb_state = False if rgb['S'] == 0 else True
     cct = LM_cct.toggle(rgb_state, smooth)  # Set CCT value regarding rgb state (ensure it is in sync)
-    rgb.update(cct)                         # Merge rgb and cct status
-    return rgb
-
-
-def brightness(percent=None, smooth=True, wake=True):
-    """
-    Unified brightness function for rgb and cct control
-    """
-    rgb = LM_rgb.brightness(percent, smooth, wake)
-    cct = LM_cct.brightness(percent, smooth, wake)
-    rgb.update(cct)                         # Merge rgb and cct status
-    return rgb
+    return __merge_status(rgb, cct)
 
 
 def status(lmf=None):
@@ -39,8 +37,7 @@ def status(lmf=None):
     """
     rgb = LM_rgb.status(lmf)
     cct = LM_cct.status(lmf)
-    rgb.update(cct)                         # Merge rgb and cct status
-    return rgb
+    return __merge_status(rgb, cct)
 
 
 def pinmap():
@@ -61,5 +58,5 @@ def help(widgets=False):
     """
     return resolve(('load',
                              'BUTTON toggle state=<True,False> smooth=True',
-                             'SLIDER brightness percent smooth=True wake=True',
-                             'status', 'pinmap'), widgets=widgets)
+                             'STATUS status',
+                             'pinmap'), widgets=widgets)

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/source/modules/LM_roboarm.py

@@ -289,4 +289,4 @@ def help(widgets=False):
                              'record clean=False rec_limit=8',
                              'random x_range=20 y_range=20 speed_ms=5',
                              'load', 'pinmap',
-                             'status'), widgets=widgets)
+                             'STATUS status'), widgets=widgets)

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/source/modules/LM_web.py

@@ -93,18 +93,18 @@ def _cfg_set_clb(_, body):
 @sudo
 def _reboot_clb(*_):
     """
-    Hard reboot system from web endpoint
+    Soft reboot system from web endpoint
     """
     from Common import micro_task
-    from machine import reset
+    from machine import soft_reset
 
     @micro_task("web.reboot", _wrap=True)
-    async def _hard_reboot(tag):
+    async def _soft_reboot(tag):
         with micro_task(tag) as my_task:
             await my_task.feed(1000)
-            reset()
+            soft_reset()
 
-    return _cfg_json({"state": bool(_hard_reboot()), "result": "Hard reboot scheduled"})
+    return _cfg_json({"state": bool(_soft_reboot()), "result": "Soft reboot scheduled"})
 
 #############################################################
 

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/source/web/config.js

@@ -395,26 +395,48 @@ function renderTaskSection() {
   const heading = textElement('h2', categoryTitle('Tasks'), 'config-heading-top');
   container.appendChild(heading);
 
-  const loading = textElement('div', 'Loading task list...');
-  container.appendChild(loading);
+  const taskHost = document.createElement('div');
+  const moduleHost = document.createElement('div');
+  const taskLoading = textElement('div', 'Loading task list...');
+  const moduleLoading = textElement('div', 'Loading modules...');
+  taskHost.appendChild(taskLoading);
+  moduleHost.appendChild(moduleLoading);
+  container.appendChild(taskHost);
+  container.appendChild(moduleHost);
 
   restAPI('task/list', false)
-    .then(response => {
-      container.removeChild(loading);
-      if (!response || !response.result) {
-        container.appendChild(makeError('Unable to load task list.'));
+    .then(taskResponse => {
+      taskHost.removeChild(taskLoading);
+      if (!taskResponse || !taskResponse.result) {
+        taskHost.appendChild(makeError('Unable to load task list.'));
         return;
       }
 
-      const activeTasks = Array.isArray(response.result.active) ? response.result.active : [];
-      const inactiveTasks = Array.isArray(response.result.inactive) ? response.result.inactive : [];
+      const activeTasks = Array.isArray(taskResponse.result.active) ? taskResponse.result.active : [];
+      const inactiveTasks = Array.isArray(taskResponse.result.inactive) ? taskResponse.result.inactive : [];
+
+      renderTaskGroup(taskHost, 'Active Tasks', activeTasks, true);
+      renderTaskGroup(taskHost, 'Inactive Tasks', inactiveTasks, false);
+    })
+    .catch(error => {
+      taskHost.removeChild(taskLoading);
+      taskHost.appendChild(makeError('Failed to load task list: ' + error.message));
+    });
+
+  restAPI('modules', false)
+    .then(modulesResponse => {
+      moduleHost.removeChild(moduleLoading);
+      if (!modulesResponse || !Array.isArray(modulesResponse.result)) {
+        moduleHost.appendChild(makeError('Unable to load module list.'));
+        return;
+      }
 
-      renderTaskGroup(container, 'Active Tasks', activeTasks, true);
-      renderTaskGroup(container, 'Inactive Tasks', inactiveTasks, false);
+      const modules = modulesResponse.result.filter(moduleName => moduleName !== 'task');
+      renderActionList(moduleHost, 'Modules', modules, [{label: 'Help', handler: handleModuleHelp}]);
     })
     .catch(error => {
-      container.removeChild(loading);
-      container.appendChild(makeError('Failed to load task list: ' + error.message));
+      moduleHost.removeChild(moduleLoading);
+      moduleHost.appendChild(makeError('Failed to load module list: ' + error.message));
     });
 }
 
@@ -466,9 +488,7 @@ function renderActionRow(container, labelText, actions) {
 
   const actionGroup = document.createElement('div');
   actionGroup.className = 'config-button-group';
-
   const actionPanels = document.createElement('div');
-
   actions.forEach(action => {
     const button = makeButton(action.label, null, action.className || '');
     if (action.disabled && action.disabled(labelText)) {
@@ -548,6 +568,25 @@ function handleTaskDetails(tag, details) {
     });
 }
 
+function handleModuleHelp(moduleName, details) {
+  if (details.style.display !== 'none' && details.textContent) {
+    details.style.display = 'none';
+    return;
+  }
+  setInlineDetails(details, 'Loading help...');
+  restAPI(`${encodeURIComponent(moduleName)}/help`, false)
+    .then(response => {
+      if (response && response.hasOwnProperty('result')) {
+        setInlineDetails(details, formatResponseBody(response.result));
+      } else {
+        setInlineDetails(details, `No help response: ${JSON.stringify(response)}`);
+      }
+    })
+    .catch(error => {
+      setInlineDetails(details, 'Help error: ' + error.message);
+    });
+}
+
 function makeError(message) {
   return textElement('div', message, 'config-error');
 }

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/source/web/dashboard.html

@@ -6,31 +6,7 @@
     <meta name="theme-color" media="(prefers-color-scheme: dark)" content="black" />
     <title>microWebDashboard</title>
     <link rel="stylesheet" href="ustyle.css">
-    <style>
-        input[type="range"] {
-            -webkit-appearance: none;  /* Override default CSS styles */
-            appearance: none;
-            width: 25%;
-            height: 5px;
-            background: #e7e7e7; /* Gray */
-            outline: none;
-        }
-        input[type="range"]::-webkit-slider-thumb {
-            -webkit-appearance: none; /* Override default look */
-            appearance: none;
-            width: 30px;
-            height: 30px;
-            background: #B0BEC5; /* LightGray */
-            border-radius: 4px;
-            cursor: pointer;
-        }
-        .custom-color-picker {
-            border: 1px solid #000; /* Black border */
-            border-radius: 5px;     /* Rounded corners */
-            cursor: pointer;        /* Pointer cursor on hover */
-            transition: border-color 0.3s ease; /* Smooth transition for border color */
-        }
-    </style>
+    <link rel="stylesheet" href="ubashboard.css">
     <script src="uapi.js" ></script>
     <script src="uwidgets.js" ></script>
     <script src="udashboard.js" ></script>

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/source/web/filesui.html

@@ -10,10 +10,6 @@
 
   <!-- Files UI layout-only CSS -->
   <style>
-    body {
-      min-height: calc(100vh - 32px);
-    }
-
     /* Top tools row */
     #file-topbar {
       display: grid;

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/source/web/index.html

@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
     <meta name="theme-color" media="(prefers-color-scheme: dark)" content="black" />
     <title>microWeb</title>
+    <link rel="icon" href="favicon.ico" sizes="64x64">
     <link rel="stylesheet" href="ustyle.css">
     <style>
       hr {
@@ -58,7 +59,7 @@
     <script src="uapi_widgets.js" defer></script>
 </head>
 <body>
-    <img src="https://github.com/BxNxM/micrOS/blob/master/media/logo_mini.png?raw=true" alt="micrOS Logo" width="60" height="60">
+    <img src="favicon.ico" alt="micrOS Logo" width="60" height="60">
     <h1> microWeb server </h1>
     <div id="restInfo">
         <div id="restInfoHeader"></div>
@@ -73,6 +74,7 @@
         <button onclick="restAPI('system/alarms')">Alarms</button>
         <button onclick="restAPI('system/clock')">Clock</button>
         <button onclick="restAPI('task/list')">Tasks</button>
+        <button onclick="restAPI('web/load')">WebApps</button>
     </div>
     <div id="restWidget"></div>
     <script>

{microsdevtoolkit-3.3.2 → microsdevtoolkit-3.3.4}/micrOS/source/web/uapi_widgets.js

@@ -132,7 +132,7 @@ function renderEndpointGroups(endpoints) {
             container.appendChild(groupBox([button(endpointLabel(group, group), group)]));
             return;
         }
-        const groupEl = groupBox([makeEl('span', {className: 'endpoint-group-title', textContent: endpointLabel(group, group)})]);
+        const groupEl = groupBox([makeEl('span', {className: 'endpoint-group-title', textContent: group})]);
         entries.forEach(entry => groupEl.appendChild(button(endpointLabel(entry === group ? group : entry.replace(`${group}/`, ''), entry), entry)));
         container.appendChild(groupEl);
     });

microsdevtoolkit-3.3.4/micrOS/source/web/ubashboard.css

@@ -0,0 +1,98 @@
+input[type="range"],
+input[type="range"]::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+}
+
+input[type="range"] {
+    width: 25%;
+    height: 5px;
+    background: #e7e7e7;
+    outline: 0;
+}
+
+input[type="range"]::-webkit-slider-thumb {
+    width: 30px;
+    height: 30px;
+    background: #B0BEC5;
+    border-radius: 4px;
+    cursor: pointer;
+}
+
+.custom-color-picker {
+    border: 1px solid #000;
+    border-radius: 5px;
+    cursor: pointer;
+    transition: border-color 0.3s ease;
+}
+
+.dashboard-state-on {
+    border-color: rgba(118,238,150,.42);
+    background: rgba(72,220,108,.24);
+}
+
+.dashboard-state-off {
+    border-color: rgba(255,142,142,.42);
+    background: rgba(255,92,92,.22);
+}
+
+.dashboard-state-on.is-selected {
+    border-color: #76ee96;
+    box-shadow: 0 0 0 2px rgba(118,238,150,.38);
+}
+
+.dashboard-state-off.is-selected {
+    border-color: #ff8e8e;
+    box-shadow: 0 0 0 2px rgba(255,142,142,.34);
+}
+
+#widgets-section {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16px;
+    align-items: start;
+    margin-top: 18px;
+}
+
+ol.widget {
+    position: relative;
+    flex: 0 0 auto;
+    margin: 10px 0 0;
+    padding: 20px 14px 16px;
+    width: fit-content;
+    min-width: 280px;
+    box-sizing: border-box;
+    border: 1px solid #4b376c;
+    border-radius: 12px;
+    background: rgba(31,20,51,.78);
+    box-shadow: 0 16px 34px rgba(0,0,0,.22);
+    backdrop-filter: blur(12px) saturate(1.12);
+    -webkit-backdrop-filter: blur(12px) saturate(1.12);
+}
+
+ol.widget h2 {
+    position: absolute;
+    top: -0.72rem;
+    left: 12px;
+    margin: 0;
+    padding: 0 8px;
+    border: 0;
+    border-radius: 8px;
+    color: #fff;
+    font-size: 1.25rem;
+    font-weight: bold;
+    line-height: 1.2;
+    letter-spacing: 0;
+}
+
+ol.widget p {
+    margin: 10px 0 6px;
+}
+
+ol.widget p.dashboard-single-button-row {
+    margin-top: 16px;
+}
+
+ol.widget :is(input[type="range"], pre, div, label, canvas) {
+    max-width: calc(100% - 40px);
+}