micrOSDevToolKit 2.10.5__tar.gz → 2.10.6__tar.gz

{microsdevtoolkit-2.10.5/micrOSDevToolKit.egg-info → microsdevtoolkit-2.10.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 2.10.5
+Version: 2.10.6
 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.10.5 → microsdevtoolkit-2.10.6}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -69,7 +69,7 @@
             8
         ],
         "Espnow.py": [
-            9.49,
+            9.5,
             1
         ],
         "Scheduler.py": [
@@ -113,7 +113,7 @@
             0
         ],
         "LM_oled_ui.py": [
-            8.64,
+            8.65,
             0
         ],
         "LM_system.py": [
@@ -129,7 +129,7 @@
             0
         ],
         "LM_rest.py": [
-            7.95,
+            8.18,
             0
         ],
         "LM_oled.py": [
@@ -323,11 +323,11 @@
     },
     "summary": {
         "core": [
-            3550,
+            3554,
             24
         ],
         "load": [
-            9217,
+            9227,
             56
         ],
         "core_dep": [
@@ -340,6 +340,6 @@
         ],
         "core_score": 9.24,
         "load_score": 8.23,
-        "version": "2.10.5-0"
+        "version": "2.10.5-1"
     }
 }

{microsdevtoolkit-2.10.5 → microsdevtoolkit-2.10.6}/micrOS/source/LM_oled_ui.py

@@ -15,6 +15,7 @@ try:
 except:
     gol_nextgen = None          # Optional function handling
 
+from utime import ticks_ms, ticks_diff     # For IRQ joystick handling
 
 #################################
 # PAGE MANAGER CLASS DEFINITION #
@@ -157,11 +158,23 @@ class PageUI:
                 # [IRQ] - event type setup
                 pin_obj.irq(trigger=Pin.IRQ_FALLING, handler=callback)
 
-        _set("js_right", lambda pin: self.control('next'))
-        _set("js_left", lambda pin: self.control('prev'))
-        _set("js_up", lambda pin: self.control('on'))
-        _set("js_down", lambda pin: self.control('off'))
-        _set("js_press", lambda pin: self.control('press'))
+        def _event_handler(control_command, prell_ms=150):
+            nonlocal  _p_last
+            _last = _p_last.get(control_command)
+            last = 0 if _last is None else _last
+            # Calculate time difference between last trigger action and now tick.
+            diff = ticks_diff(ticks_ms(), last)
+            if abs(diff) > prell_ms:
+                # Save now tick - last trigger action
+                _p_last[control_command] = ticks_ms()
+                self.control(control_command)
+
+        _p_last = {}
+        _set("js_right", lambda pin: _event_handler('next'))
+        _set("js_left", lambda pin: _event_handler('prev'))
+        _set("js_up", lambda pin: _event_handler('on'))
+        _set("js_down", lambda pin: _event_handler('off'))
+        _set("js_press", lambda pin: _event_handler('press'))
         self.irq_ok = True
 
     def __power_save(self):

{microsdevtoolkit-2.10.5 → microsdevtoolkit-2.10.6}/micrOS/source/LM_rest.py

@@ -10,7 +10,7 @@ class Rest:
 def load(gateway_url=None):
     """
     Set gateway url aka main domain
-    :param gateway_url: base url of gateway, like: http://gateway.local:5000
+    :param gateway_url: base url of gateway, like: http://gateway.local:5005
     """
     if gateway_url is None:
         if Rest.GATEWAY_HOST is None:
@@ -77,6 +77,6 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return ('load gateway_url=<http://gateway.local:5000>',
+    return ('load gateway_url=<http://gateway.local:5005>',
             'url subdomain=</webhooks/template>',
-            'aurl subdomain=</webhooks/template>')
+            'aurl subdomain=</webhooks/template>')

{microsdevtoolkit-2.10.5 → microsdevtoolkit-2.10.6}/micrOS/source/Shell.py

@@ -25,7 +25,7 @@ from Debug import errlog_add
 
 class Shell:
     __slots__ = ['__devfid', '__auth_mode', '__hwuid', '__auth_ok', '__conf_mode']
-    MICROS_VERSION = '2.10.5-0'
+    MICROS_VERSION = '2.10.5-1'
 
     def __init__(self):
         """
@@ -106,7 +106,8 @@ class Shell:
             # No msg to work with
             return True
         msg_list = msg.strip().split()
-        local_cmd = not msg_list[-1].startswith(">>")   # intercon request check for shell commands
+        # INTERCON embedding: conf mode and remote call request check
+        is_local_cmd = self.__conf_mode or not msg_list[-1].startswith(">>")
 
         ##########################################
         #   [1] Handle built-in shell commands   #
@@ -114,7 +115,7 @@ class Shell:
         ##########################################
 
         # Hello message
-        if local_cmd and msg_list[0] == 'hello':
+        if is_local_cmd and msg_list[0] == 'hello':
             # For low level device identification - hello msg
             await self.a_send(f"hello:{self.__devfid}:{self.__hwuid}")
             return True
@@ -127,34 +128,34 @@ class Shell:
             return True
 
         # Version handling
-        if local_cmd and msg_list[0] == 'version':
+        if is_local_cmd and msg_list[0] == 'version':
             # For micrOS system version info
             await self.a_send(str(Shell.MICROS_VERSION))
             return True
 
         # Reboot micropython VM
-        if local_cmd and msg_list[0] == 'reboot':
+        if is_local_cmd and msg_list[0] == 'reboot':
             hard = False
             if len(msg_list) >= 2 and "-h" in msg_list[1]:
                 # reboot / reboot -h
                 hard = True
             await self.reboot(hard)
 
-        if local_cmd and msg_list[0].startswith('webrepl'):
+        if is_local_cmd and msg_list[0].startswith('webrepl'):
             if len(msg_list) == 2 and '-u' in msg_list[1]:
                 await Shell.webrepl(msg_obj=self.a_send, update=True)
             return await Shell.webrepl(msg_obj=self.a_send)
 
         # CONFIGURE MODE STATE: ACCESS FOR NODE_CONFIG.JSON
-        if local_cmd and msg_list[0].startswith('conf'):
+        if is_local_cmd and msg_list[0].startswith('conf'):
             self.__conf_mode = True
             return True
-        if local_cmd and msg_list[0].startswith('noconf'):
+        if is_local_cmd and msg_list[0].startswith('noconf'):
             self.__conf_mode = False
             return True
 
         # HELP MSG
-        if local_cmd and msg_list[0] == "help":
+        if is_local_cmd and msg_list[0] == "help":
             await self.a_send("[MICROS]")
             await self.a_send("   hello     - hello msg - for device identification")
             await self.a_send("   modules   - show active Load Modules")
@@ -185,7 +186,7 @@ class Shell:
 
         # [2] EXECUTE:
         # @1 Configure mode
-        if local_cmd and self.__conf_mode and len(msg_list) > 0:
+        if is_local_cmd and self.__conf_mode and len(msg_list) > 0:
             # Lock thread under config handling is threads available
             return await Shell._configure(self.a_send, msg_list)
         # @2 Command mode

{microsdevtoolkit-2.10.5 → microsdevtoolkit-2.10.6/micrOSDevToolKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 2.10.5
+Version: 2.10.6
 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.10.5 → microsdevtoolkit-2.10.6}/setup.py

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

{microsdevtoolkit-2.10.5 → microsdevtoolkit-2.10.6}/toolkit/Gateway.py

@@ -154,7 +154,7 @@ class Hello(Resource):
 
 class SendCmd(Resource):
     """
-    http://127.0.0.1:5000/sendcmd/micr240ac4f679e8OS/rgb+toggle
+    http://127.0.0.1:5005/sendcmd/micr240ac4f679e8OS/rgb+toggle
         {
           "cmd": [
             "rgb",
@@ -621,11 +621,11 @@ api.add_resource(WebHook, '/webhooks', '/webhooks/<string:payload>', '/webhooks/
 
 def gateway(debug=True):
     global API_URL_CACHE
-    API_URL_CACHE = f"http://{my_local_ip()}:5000"
+    API_URL_CACHE = f"http://{my_local_ip()}:5005"
     print("\n############### START MICROS GATEWAY ###############")
     print("#             {}            #".format(API_URL_CACHE))
     print("####################################################\n")
-    app.run(debug=debug, use_reloader=debug, host='0.0.0.0', port=5000)     # host='0.0.0.0' automatic, manual: host=my_local_ip()
+    app.run(debug=debug, use_reloader=debug, host='0.0.0.0', port=5005)     # host='0.0.0.0' automatic, manual: host=my_local_ip()
 
 
 # driver function

{microsdevtoolkit-2.10.5 → microsdevtoolkit-2.10.6}/toolkit/user_data/webhooks/generic.py

@@ -2,7 +2,7 @@
 
 """
 Generic webhook for socketClient that can invoke LoadModule calls remotely from any device.
-Example: http://10.0.1.61:5000/webhooks/generic/TinyDevBoard+system+clock
+Example: http://10.0.1.61:5005/webhooks/generic/TinyDevBoard+system+clock
 """
 
 import sys, os

{microsdevtoolkit-2.10.5 → microsdevtoolkit-2.10.6}/toolkit/user_data/webhooks/macro.py

@@ -3,7 +3,7 @@
 """
 Template for webhook creation
 - replies with basic response message
-Example: http://10.0.1.61:5000/webhooks/template
+Example: http://10.0.1.61:5005/webhooks/template
 """
 
 import sys, os

{microsdevtoolkit-2.10.5 → microsdevtoolkit-2.10.6}/toolkit/user_data/webhooks/template.py

@@ -3,7 +3,7 @@
 """
 Template for webhook creation
 - replies with basic response message
-Example: http://10.0.1.61:5000/webhooks/template
+Example: http://10.0.1.61:5005/webhooks/template
 """
 
 import sys, os