micrOSDevToolKit 2.1.3__tar.gz → 2.1.4__tar.gz

{micrOSDevToolKit-2.1.3/micrOSDevToolKit.egg-info → micrOSDevToolKit-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micrOSDevToolKit
-Version: 2.1.3
+Version: 2.1.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-2.1.3 → micrOSDevToolKit-2.1.4}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -38,7 +38,7 @@
         ],
         "Types.py": [
             9.69,
-            10
+            11
         ],
         "Common.py": [
             9.1,
@@ -209,7 +209,7 @@
             0
         ],
         "LM_OV2640.py": [
-            8.86,
+            9.06,
             0
         ],
         "LM_rgb.py": [
@@ -237,8 +237,8 @@
             4
         ],
         "LM_dashboard_be.py": [
-            6.67,
-            1
+            6.5,
+            0
         ],
         "LM_dimmer.py": [
             8.22,
@@ -283,7 +283,7 @@
             20
         ],
         "load": [
-            6842,
+            6822,
             49
         ],
         "core_dep": [
@@ -296,6 +296,6 @@
         ],
         "core_score": 9.21,
         "load_score": 8.01,
-        "version": "2.1.3-1"
+        "version": "2.1.4-0"
     }
 }

{micrOSDevToolKit-2.1.3 → micrOSDevToolKit-2.1.4}/micrOS/source/LM_OV2640.py

@@ -5,11 +5,7 @@ except Exception as e:
 import time
 from Debug import console_write
 from Common import rest_endpoint, syslog
-
-try:
-    from LM_dashboard_be import widget_add
-except:
-    widget_add = None
+from Types import resolve
 
 IN_CAPTURE = False      # Make sure single capture in progress in the same time
 CAM_INIT = False
@@ -62,12 +58,6 @@ def _set_web_endpoints():
     # Register rest endpoint
     rest_endpoint('cam/snapshot', _snapshot_clb)
     rest_endpoint('cam/stream', _image_stream_clb)
-    # Add custom widgets to /dashboard (generated frontend)
-    if widget_add is not None:
-        widget_add({'OV2640': {'settings/saturation=': 'slider',
-                               'settings/brightness=': 'slider',
-                               'settings/contrast=': 'slider',
-                               'flashlight': 'button'}})
 
 
 def settings(quality=None, flip=None, mirror=None, effect=None, saturation=None, brightness=None, contrast=None, whitebalace=None, q=None):
@@ -238,8 +228,14 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return 'load_n_init quality="medium/low/high" freq="default/high"',\
-        'settings quality=None flip=None/True mirror=None/True effect="NONE" saturation brightness contrast',\
-        'capture', 'photo', 'set_photo_endpoint', 'flashlight state=None/True/False',\
-        'Thanks to :) https://github.com/lemariva/micropython-camera-driver',\
-        '[HINT] after load_n_init you can access the /cam/snapshot and /cam/stream endpoints'
+    return resolve(('load_n_init quality="medium/low/high" freq="default/high"',
+        'settings quality=None flip=None mirror=None effect="NONE"',
+        'SLIDER settings saturation=<0-100>',
+        'SLIDER settings brightness=<0-100>',
+        'SLIDER settings contrast=<0-100>',
+        'capture',
+        'photo',
+        'set_photo_endpoint',
+        'BUTTON flashlight state=None',
+        '[HINT] after load_n_init you can access the /cam/snapshot and /cam/stream endpoints',
+        'Thanks to :) https://github.com/lemariva/micropython-camera-driver'), widgets=widgets)

{micrOSDevToolKit-2.1.3/toolkit/workspace/precompiled → micrOSDevToolKit-2.1.4/micrOS/source}/LM_dashboard_be.py

@@ -1,7 +1,5 @@
 from Common import rest_endpoint, syslog
-from sys import modules
 
-WIDGETS={}
 ENDPOINT_INITED = False
 
 def load_n_init():
@@ -29,27 +27,6 @@ def create_dashboard():
     return 'Endpoint created: /dashboard'
 
 
-def widget_list():
-    """
-    API HELPER: return custom widgets dict
-    """
-    return WIDGETS
-
-
-
-def widget_add(widget=None):
-    """
-    :param widget: {'OV2640': {'settings/saturation=': 'slider',
-                               'settings/brightness=': <type>}}
-    <type>: 'slider', 'button', 'box', 'h1', 'h2', 'p', etc...
-    """
-    global WIDGETS
-    if not ENDPOINT_INITED:
-        load_n_init()           # auto-enable dashboard endpoint
-    if isinstance(widget, dict):
-        WIDGETS.update(widget)
-
-
 def help(widgets=False):
     """
     [i] micrOS LM naming convention - built-in help message
@@ -57,4 +34,4 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return 'load_n_init', 'create_dashboard', 'widget_list', 'widget_add', 'help'
+    return 'load_n_init', 'create_dashboard', 'help'

{micrOSDevToolKit-2.1.3 → micrOSDevToolKit-2.1.4}/micrOS/source/LM_neopixel.py

@@ -351,5 +351,5 @@ def help(widgets=False):
                              'BUTTON random smooth=True max_val=254',
                              'status',
                              'subscribe_presence',
-                             'TEXTBOX pinmap',
+                             'pinmap',
                              'help widgets=False'), widgets=widgets)

{micrOSDevToolKit-2.1.3 → micrOSDevToolKit-2.1.4}/micrOS/source/Shell.py

@@ -24,7 +24,7 @@ from Debug import errlog_add
 #################################################################
 
 class Shell:
-    MICROS_VERSION = '2.1.3-1'
+    MICROS_VERSION = '2.1.4-0'
 
     def __init__(self):
         """

{micrOSDevToolKit-2.1.3 → micrOSDevToolKit-2.1.4}/micrOS/source/Types.py

@@ -78,18 +78,15 @@ def resolve(help_data, widgets=False):
     for msg in help_data:
         tag = msg.split()[0].strip()
         # TYPE DECORATION detect in help strings
-        if tag[0].isupper():
+        if tag.isupper():
             resolved_tag = _resolve_key(tag)
             if resolved_tag == tag:
-                # TAG NOT FOUND - keep value
-                help_msg.append(msg)
-                #continue
-            if widgets:
-                # Create json string type + extract widgets from help message
-                help_msg.append(_generate(resolved_tag, msg))
-            else:
-                # Remove tag - Human readable mode (decorated functions)
-                help_msg.append(msg.replace(tag, '').strip())
+                if widgets:
+                    continue                                    # Invalid tag in widget mode
+                help_msg.append(msg.replace(tag, '').strip())   # Invalid tag (OK) in human readable mode
+                continue
+            # Create json string type + extract widgets from help message
+            help_msg.append(_generate(resolved_tag, msg))
         elif not widgets:
             # Human readable mode (non decorated functions)
             help_msg.append(msg)

{micrOSDevToolKit-2.1.3/toolkit/workspace/precompiled → micrOSDevToolKit-2.1.4/micrOS/source}/dashboard.html

@@ -50,8 +50,6 @@
 
             // INIT DASHBOARD (load active modules -> build page)
             DynamicWidgetLoad();
-            // INIT DASHBOARD (load custom widget commands -> build page)
-            CustomWidgetLoad('dashboard_be/widget_list')
 
             // INIT [hidden] debug section
             document.getElementById('toggleDebugSection').addEventListener('click', function() {

{micrOSDevToolKit-2.1.3 → micrOSDevToolKit-2.1.4}/micrOS/source/udashboard.js

@@ -36,27 +36,41 @@ function generateElement(type, data, options={}) {
     // data: rest command
     var container = document.getElementById('dynamicContent');
     var element;
-    paragraph = document.createElement('p');
     if (type.toLowerCase() === 'slider') {
         // Create slider widget
-        sliderWidget(container, paragraph, data, options)
+        sliderWidget(container, data, options)
     } else if (type.toLowerCase() === 'button') {
         // Create button widget
-        buttonWidget(container, paragraph, data, options)
+        buttonWidget(container, data, options)
     } else if (type.toLowerCase() === 'box') {
         // Create textbox widget
-        textBoxWidget(container, paragraph, data, options)
+        textBoxWidget(container, data, options)
     } else if (type.toLowerCase() === 'color') {
         // Create color palette widget
-        colorPaletteWidget(container, paragraph, data, options)
+        colorPaletteWidget(container, data, options)
     } else {
         // Create other elements
+        paragraph = document.createElement('p');
         element = document.createElement(type);
         element.textContent = data;
         containerAppendChild([paragraph, element], container);
     }
 }
 
+function autoTitleLen(widgets, func) {
+    try {
+        // Create function list for comparation
+        const funcNames = widgets.map(command => command.lm_call.split(' ')[0]);
+        // Count the occurrences of the func name
+        const count = funcNames.filter(word => word === func).length;
+        // Return 2 if count is greater than 1, otherwise return 1
+        return count > 1 ? 2 : 1;
+    } catch (error) {
+        console.error(error);
+        return 1;
+    }
+}
+
 function craftModuleWidgets(module, widgets) {
     // Create ALL exposed module function widgets
     if (widgets.length === 0) {
@@ -75,18 +89,26 @@ function craftModuleWidgets(module, widgets) {
         if (type === 'slider') {
             html_type='slider';
             type_options['range'] = item.range;
+            type_options['title_len'] = autoTitleLen(widgets, lm_call.split('/')[0]);
         } else if (type === 'button' || type === 'toggle') {
             html_type='button';
             type_options['range'] = item.range;
+            type_options['title_len'] = autoTitleLen(widgets, lm_call.split('/')[0]);
         } else if (type === 'textbox') {
             html_type = 'box'
+            type_options['title_len'] = autoTitleLen(widgets, lm_call.split('/')[0]);
         } else if (type === 'color') {
             html_type = 'color'
+            type_options['title_len'] = autoTitleLen(widgets, lm_call.split('/')[0]);
         } else {
             console.log(`Unsupported micrOS widget html_type: ${type}`)
             return;
         }
-        generateElement(type=html_type, data=`${module}/${lm_call}`, options=type_options);
+        try {
+            generateElement(type=html_type, data=`${module}/${lm_call}`, options=type_options);
+        } catch (error) {
+            console.error(error);
+        }
     })
 }
 
@@ -111,30 +133,4 @@ function DynamicWidgetLoad() {
     });
 }
 
-
-function CustomWidgetLoad(endpoint) {
-    // INIT DASHBOARD (load custom widget commands -> build page)
-    // endpoint: 'dashboard_be/widget_list' returns special dict
-    restAPI(endpoint).then(commands => {
-        console.log(commands.result)
-        const widget_dict=commands.result;
-        var opts = {};
-        opts.title_len = 3;
-        for (const module in widget_dict) {
-            if (Object.hasOwnProperty.call(widget_dict, module)) {
-                const innerObject = widget_dict[module];
-                generateElement(type='h2', data=`🧬 ${module}`);
-                // Iterate through the inner object
-                for (const func in innerObject) {
-                    if (Object.hasOwnProperty.call(innerObject, func)) {
-                        const api_type = innerObject[func];
-                        const api_cmd = `${module}/${func}`;
-                        console.log(`Gen custom Type: ${api_type} Cmd: ${api_cmd}`);
-                        generateElement(type=api_type, data=api_cmd, options=opts);
-        };};};}
-    }).catch(error => {
-        console.error(error);
-    });
-}
-
 // craftModuleWidgets

{micrOSDevToolKit-2.1.3 → micrOSDevToolKit-2.1.4}/micrOS/source/uwidgets.js

@@ -1,14 +1,19 @@
 // WIDGETS ELEMENTS
 
-function sliderWidget(container, paragraph, command, options={}) {
-        var title_len = options.title_len || 2;
-        paragraph.textContent = command.split('/').slice(1, title_len).join('-').replace(/=/g, '').replace(':range:', '');
+const widget_indent = '40px';
+
+function sliderWidget(container, command, options={}) {
+        var title_len = options.title_len || 1;
+        paragraph = document.createElement('p');
+        paragraph.style.textIndent = widget_indent;
+        paragraph.textContent = command.split('/').slice(1, title_len+1).join('-').replace(/=/g, '').replace(':range:', '');
         // Create a slider
         element = document.createElement('input');
+        element.style.marginLeft = widget_indent;
         element.type = 'range';
-        element.min = options.min || 0;
-        element.max = options.max || 100;
-        element.step = options.step || 5;
+        element.min = options.range[0] || 0;
+        element.max = options.range[1] || 100;
+        element.step = options.range[2] || 5;
         element.value = Math.round((element.max-element.min)/2);
 
         // Create a span to display the slider value
@@ -37,11 +42,14 @@ function sliderWidget(container, paragraph, command, options={}) {
         containerAppendChild([paragraph, element, valueDisplay], container);
 }
 
-function buttonWidget(container, paragraph, command, options={}) {
-        var title_len = options.title_len || 2;
+function buttonWidget(container, command, options={}) {
+        var title_len = options.title_len || 1;
+        paragraph = document.createElement('p');
+        paragraph.style.textIndent = widget_indent;
         // Create a button
         element = document.createElement('button');
-        element.textContent = command.split('/').slice(1, title_len).join('-');
+        element.style.marginLeft = widget_indent;
+        element.textContent = command.split('/').slice(1, title_len+1).join('-');
         // Add an event listener for API CALL
         element.addEventListener('click', function () {
             var call_cmd;
@@ -58,11 +66,14 @@ function buttonWidget(container, paragraph, command, options={}) {
         containerAppendChild([paragraph, element], container);
 }
 
-function textBoxWidget(container, paragraph, command, options={}) {
-        var title_len = options.title_len || 2;
-        paragraph.textContent = command.split('/').slice(1, title_len).join('-');
+function textBoxWidget(container, command, options={}) {
+        var title_len = options.title_len || 1;
+        paragraph = document.createElement('p');
+        paragraph.style.textIndent = widget_indent;
+        paragraph.textContent = command.split('/').slice(1, title_len+1).join('-');
         // Create a small box (div)
         element = document.createElement('div');
+        element.style.marginLeft = widget_indent;
         element.style.width = '30%';
         element.style.height = '60px';
         element.style.paddingTop = '10px';
@@ -81,11 +92,12 @@ function textBoxWidget(container, paragraph, command, options={}) {
         console.log(`[API] textBox exec: ${call_cmd}`);
         restAPI(call_cmd).then(resp => {
             console.log(resp.result);
-            element.textContent = JSON.stringify(resp.result, null, 4);});
+            element.textContent = JSON.stringify(resp.result, null, 4);
         containerAppendChild([paragraph, element], container);
+        });
 }
 
-function colorPaletteWidget(container, paragraph, command, options) {
+function colorPaletteWidget(container, command, options) {
     // TODO
     console.log(`Dummy color widget: ${command}`)
 }

{micrOSDevToolKit-2.1.3 → micrOSDevToolKit-2.1.4/micrOSDevToolKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micrOSDevToolKit
-Version: 2.1.3
+Version: 2.1.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-2.1.3 → micrOSDevToolKit-2.1.4}/micrOSDevToolKit.egg-info/SOURCES.txt

@@ -180,6 +180,7 @@ toolkit/simulator_lib/machine.py
 toolkit/simulator_lib/micropython.py
 toolkit/simulator_lib/neopixel.py
 toolkit/simulator_lib/network.py
+toolkit/simulator_lib/node_config.json
 toolkit/simulator_lib/ntptime.py
 toolkit/simulator_lib/onewire.py
 toolkit/simulator_lib/sim_console.py

{micrOSDevToolKit-2.1.3 → micrOSDevToolKit-2.1.4}/setup.py

@@ -18,7 +18,7 @@ dependencies = ['adafruit-ampy', 'mpremote', 'esptool', 'ipaddress', 'netaddr',
 
 setuptools.setup(
     name='micrOSDevToolKit',
-    version='2.1.3',
+    version='2.1.4',
     author='Marcell Ban',
     author_email='miros.framework@gmail.com',
     description='Development and deployment environment for micrOS, the diy micropython automation OS (IoT)',

{micrOSDevToolKit-2.1.3 → micrOSDevToolKit-2.1.4}/toolkit/lib/file_extensions.py

@@ -11,7 +11,6 @@ def check_all_extensions(path):
 
 def check_web_extensions(path):
     extension = path.split('.')[-1]
-    print(f"|{extension}|")
     if extension in WEB_ONLY:
         return True
     return False

micrOSDevToolKit-2.1.4/toolkit/simulator_lib/node_config.json

@@ -0,0 +1,7 @@
+{"auth": false,
+  "devfid": "simulator",
+  "appwd": "ADmin123",
+  "webui": true,
+  "boothook": "dashboard_be load_n_init; neopixel load_n_init",
+  "aioqueue": 4,
+  "telegram": "n/a"}

{micrOSDevToolKit-2.1.3 → micrOSDevToolKit-2.1.4}/toolkit/simulator_lib/simulator.py

@@ -12,6 +12,15 @@ from sim_console import console
 import micrOSloader
 import LocalMachine
 
+ENABLE_SIM_CONFIG = True
+
+
+def apply_sim_node_config():
+    if ENABLE_SIM_CONFIG:
+        print("Copy SIM config - for testing: enable webui, etc.")
+        sim_config = os.path.join(MYPATH, 'node_config.json')
+        LocalMachine.FileHandler().copy(sim_config, os.path.join(SIM_PATH))
+
 
 class micrOSIM():
     SIM_PROCESS_LIST = []
@@ -47,6 +56,8 @@ class micrOSIM():
         if trace:
             # Trace handling - DEBUG
             sys.settrace(trace_func)
+
+        apply_sim_node_config()
         micrOSloader.main()
 
         console("[micrOSIM] Stop micrOS ({})".format(SIM_PATH))

{micrOSDevToolKit-2.1.3/micrOS/source → micrOSDevToolKit-2.1.4/toolkit/workspace/precompiled}/LM_dashboard_be.py

@@ -1,7 +1,5 @@
 from Common import rest_endpoint, syslog
-from sys import modules
 
-WIDGETS={}
 ENDPOINT_INITED = False
 
 def load_n_init():
@@ -29,27 +27,6 @@ def create_dashboard():
     return 'Endpoint created: /dashboard'
 
 
-def widget_list():
-    """
-    API HELPER: return custom widgets dict
-    """
-    return WIDGETS
-
-
-
-def widget_add(widget=None):
-    """
-    :param widget: {'OV2640': {'settings/saturation=': 'slider',
-                               'settings/brightness=': <type>}}
-    <type>: 'slider', 'button', 'box', 'h1', 'h2', 'p', etc...
-    """
-    global WIDGETS
-    if not ENDPOINT_INITED:
-        load_n_init()           # auto-enable dashboard endpoint
-    if isinstance(widget, dict):
-        WIDGETS.update(widget)
-
-
 def help(widgets=False):
     """
     [i] micrOS LM naming convention - built-in help message
@@ -57,4 +34,4 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return 'load_n_init', 'create_dashboard', 'widget_list', 'widget_add', 'help'
+    return 'load_n_init', 'create_dashboard', 'help'

{micrOSDevToolKit-2.1.3/micrOS/source → micrOSDevToolKit-2.1.4/toolkit/workspace/precompiled}/dashboard.html

@@ -50,8 +50,6 @@
 
             // INIT DASHBOARD (load active modules -> build page)
             DynamicWidgetLoad();
-            // INIT DASHBOARD (load custom widget commands -> build page)
-            CustomWidgetLoad('dashboard_be/widget_list')
 
             // INIT [hidden] debug section
             document.getElementById('toggleDebugSection').addEventListener('click', function() {

{micrOSDevToolKit-2.1.3 → micrOSDevToolKit-2.1.4}/toolkit/workspace/precompiled/udashboard.js

@@ -36,27 +36,41 @@ function generateElement(type, data, options={}) {
     // data: rest command
     var container = document.getElementById('dynamicContent');
     var element;
-    paragraph = document.createElement('p');
     if (type.toLowerCase() === 'slider') {
         // Create slider widget
-        sliderWidget(container, paragraph, data, options)
+        sliderWidget(container, data, options)
     } else if (type.toLowerCase() === 'button') {
         // Create button widget
-        buttonWidget(container, paragraph, data, options)
+        buttonWidget(container, data, options)
     } else if (type.toLowerCase() === 'box') {
         // Create textbox widget
-        textBoxWidget(container, paragraph, data, options)
+        textBoxWidget(container, data, options)
     } else if (type.toLowerCase() === 'color') {
         // Create color palette widget
-        colorPaletteWidget(container, paragraph, data, options)
+        colorPaletteWidget(container, data, options)
     } else {
         // Create other elements
+        paragraph = document.createElement('p');
         element = document.createElement(type);
         element.textContent = data;
         containerAppendChild([paragraph, element], container);
     }
 }
 
+function autoTitleLen(widgets, func) {
+    try {
+        // Create function list for comparation
+        const funcNames = widgets.map(command => command.lm_call.split(' ')[0]);
+        // Count the occurrences of the func name
+        const count = funcNames.filter(word => word === func).length;
+        // Return 2 if count is greater than 1, otherwise return 1
+        return count > 1 ? 2 : 1;
+    } catch (error) {
+        console.error(error);
+        return 1;
+    }
+}
+
 function craftModuleWidgets(module, widgets) {
     // Create ALL exposed module function widgets
     if (widgets.length === 0) {
@@ -75,18 +89,26 @@ function craftModuleWidgets(module, widgets) {
         if (type === 'slider') {
             html_type='slider';
             type_options['range'] = item.range;
+            type_options['title_len'] = autoTitleLen(widgets, lm_call.split('/')[0]);
         } else if (type === 'button' || type === 'toggle') {
             html_type='button';
             type_options['range'] = item.range;
+            type_options['title_len'] = autoTitleLen(widgets, lm_call.split('/')[0]);
         } else if (type === 'textbox') {
             html_type = 'box'
+            type_options['title_len'] = autoTitleLen(widgets, lm_call.split('/')[0]);
         } else if (type === 'color') {
             html_type = 'color'
+            type_options['title_len'] = autoTitleLen(widgets, lm_call.split('/')[0]);
         } else {
             console.log(`Unsupported micrOS widget html_type: ${type}`)
             return;
         }
-        generateElement(type=html_type, data=`${module}/${lm_call}`, options=type_options);
+        try {
+            generateElement(type=html_type, data=`${module}/${lm_call}`, options=type_options);
+        } catch (error) {
+            console.error(error);
+        }
     })
 }
 
@@ -111,30 +133,4 @@ function DynamicWidgetLoad() {
     });
 }
 
-
-function CustomWidgetLoad(endpoint) {
-    // INIT DASHBOARD (load custom widget commands -> build page)
-    // endpoint: 'dashboard_be/widget_list' returns special dict
-    restAPI(endpoint).then(commands => {
-        console.log(commands.result)
-        const widget_dict=commands.result;
-        var opts = {};
-        opts.title_len = 3;
-        for (const module in widget_dict) {
-            if (Object.hasOwnProperty.call(widget_dict, module)) {
-                const innerObject = widget_dict[module];
-                generateElement(type='h2', data=`🧬 ${module}`);
-                // Iterate through the inner object
-                for (const func in innerObject) {
-                    if (Object.hasOwnProperty.call(innerObject, func)) {
-                        const api_type = innerObject[func];
-                        const api_cmd = `${module}/${func}`;
-                        console.log(`Gen custom Type: ${api_type} Cmd: ${api_cmd}`);
-                        generateElement(type=api_type, data=api_cmd, options=opts);
-        };};};}
-    }).catch(error => {
-        console.error(error);
-    });
-}
-
 // craftModuleWidgets