micrOSDevToolKit 2.4.0__tar.gz → 2.4.1__tar.gz

{micrOSDevToolKit-2.4.0/micrOSDevToolKit.egg-info → micrOSDevToolKit-2.4.1}/PKG-INFO

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

@@ -5,7 +5,7 @@
             6
         ],
         "micrOSloader.py": [
-            7.59,
+            7.85,
             1
         ],
         "Hooks.py": [
@@ -13,7 +13,7 @@
             1
         ],
         "Server.py": [
-            9.38,
+            8.59,
             3
         ],
         "Tasks.py": [
@@ -73,7 +73,7 @@
             1
         ],
         "Interrupts.py": [
-            9.05,
+            8.38,
             2
         ],
         "main.py": [
@@ -81,7 +81,7 @@
             0
         ],
         "urequests.py": [
-            8.83,
+            8.94,
             4
         ],
         "LM_roboarm.py": [
@@ -173,7 +173,7 @@
             0
         ],
         "LM_neoeffects.py": [
-            6.89,
+            6.75,
             0
         ],
         "LM_i2c.py": [
@@ -201,7 +201,7 @@
             0
         ],
         "LM_keychain.py": [
-            9.14,
+            9.2,
             0
         ],
         "LM_dht11.py": [
@@ -213,7 +213,7 @@
             0
         ],
         "LM_OV2640.py": [
-            9.06,
+            9.21,
             0
         ],
         "LM_rgb.py": [
@@ -273,7 +273,7 @@
             2
         ],
         "LM_i2s_mic.py": [
-            8.71,
+            8.39,
             1
         ],
         "LM_sdcard.py": [
@@ -287,7 +287,7 @@
             21
         ],
         "load": [
-            6927,
+            6929,
             49
         ],
         "core_dep": [
@@ -298,7 +298,7 @@
             true,
             7
         ],
-        "core_score": 9.17,
+        "core_score": 9.12,
         "load_score": 8.07,
         "version": "2.4.0-0"
     }

{micrOSDevToolKit-2.4.0 → micrOSDevToolKit-2.4.1}/micrOS/source/LM_keychain.py

@@ -126,10 +126,9 @@ async def _main_page():
     return "Display show"
 
 
-async def _ui_task(period_ms):
-    """
-    Async display refresh task
-    - main page    (main mode)  - auto sleep after 30 sec
+async def _ui_task(period_ms, tts_ms):
+    """Async display refresh task
+    - main page    (main mode)
     - screen saver (sleep mode)
     """
     # Auto init keychain module (if needed) - failsafe
@@ -138,7 +137,7 @@ async def _ui_task(period_ms):
         if not KC.INITED:
             return _v
 
-    KC.DP_cnt_default = int(30_000 / period_ms)     # After 30 sec go to sleep mode
+    KC.DP_cnt_default = int(tts_ms / period_ms)     # After 30 sec go to sleep mode
     KC.DP_cnt = KC.DP_cnt_default                   # Set sleep counter
     fast_period = int(period_ms/3)                  # Calculate faster refresh period
     fast_period = fast_period if fast_period > 100 else 100
@@ -200,14 +199,16 @@ def load(width=64, height=32, bootmsg="micrOS"):
         return f"OLED INIT NOK: {e}"
 
 
-def display(period=1000):
+def display(period=1000, tts=30):
     """
     Create kc._display task - refresh loop
     :param period: display refresh period in ms (min. 500ms)
+    :param tts: time to sleep (in seconds)
     """
     # [!] ASYNC TASK CREATION [1*] with async task callback + taskID (TAG) handling
     period_ms = 500 if period < 500 else period
-    state = micro_task(tag="kc._display", task=_ui_task(period_ms=period_ms))
+    tts_ms = 5000 if tts < 5 else tts*1000
+    state = micro_task(tag="kc._display", task=_ui_task(period_ms, tts_ms))
     return "Starting" if state else "Already running"
 
 
@@ -280,7 +281,7 @@ def button():
         return neopixel_toggle()
     # Wake display
     KC.DP_main_page = True
-    return f"Display mode: main view"
+    return "Display mode: main view"
 
 
 def lmdep():
@@ -310,7 +311,8 @@ def help(widgets=False):
         (widgets=True) list of widget json for UI generation
     """
     return ('load width=64 height=32 bootmsg="micrOS"',
-            'temperature', 'display period>=1000',
+            'temperature', 
+            'display period>=1000 tts=30',
             'button',
             'display_toggle',
             'neopixel_toggle',

{micrOSDevToolKit-2.4.0 → micrOSDevToolKit-2.4.1}/micrOS/source/Shell.py

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

{micrOSDevToolKit-2.4.0 → micrOSDevToolKit-2.4.1/micrOSDevToolKit.egg-info}/PKG-INFO

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

@@ -28,16 +28,17 @@ media/usb_port_icon.png
 media/wifi_icon.png
 micrOS/__init__.py
 micrOS/micropython/esp32-20231005-v1.21.0.bin
-micrOS/micropython/esp32c3-GENERIC-20240105-v1.22.1.bin
+micrOS/micropython/esp32-GENERIC-20240602-v1.23.0.bin
 micrOS/micropython/esp32c3-GENERIC-20240222-v1.22.2.bin
 micrOS/micropython/esp32cam-v1.21.0_camera.bin
-micrOS/micropython/esp32s2-GENERIC-20240105-v1.22.1.bin
+micrOS/micropython/esp32s2-GENERIC-20240602-v1.23.0.bin
 micrOS/micropython/esp32s2-LOLIN_MINI-20220618-v1.19.1.bin
+micrOS/micropython/esp32s2-LOLIN_MINI-20240602-v1.23.0.bin
 micrOS/micropython/esp32s3-GENERIC-20240105-v1.22.1.bin
 micrOS/micropython/esp32s3_spiram_oct-20231005-v1.21.0.bin
-micrOS/micropython/rpi-pico-w-20231005-v1.21.0.uf2
+micrOS/micropython/rpi-pico-w-20240602-v1.23.0.uf2
 micrOS/micropython/tinypico-20231005-v1.21.0.bin
-micrOS/micropython/tinypico-usbc-UM-20240105-v1.22.1.bin
+micrOS/micropython/tinypico_usbc-UM-20240105-v1.22.1.bin
 micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json
 micrOS/source/.DS_Store
 micrOS/source/Common.py

{micrOSDevToolKit-2.4.0 → micrOSDevToolKit-2.4.1}/setup.py

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

{micrOSDevToolKit-2.4.0 → micrOSDevToolKit-2.4.1}/toolkit/DevEnvOTA.py

@@ -386,6 +386,17 @@ class OTA(Compile):
         self.execution_verdict.append("[OK] ota_update was finished")
         return up_again_status
 
+    @staticmethod
+    def sim_ota_update(file_list, force_lm):
+        sim_path = os.path.join(MYPATH, "workspace/simulator")
+        for source in file_list:
+            f_name = os.path.basename(source)
+            if force_lm and not f_name.startswith('LM_') and f_name.endswith('.py'):
+                f_name = 'LM_{}'.format(f_name)
+            target = os.path.join(sim_path, f_name)
+            print(f"[SIM] 'OTA' COPY FILES... {source} -> {target}")
+            LocalMachine.FileHandler().copy(source, target)
+
     def ota_webrepl_update_core(self, device=None, upload_path_list=[], ota_password='ADmin123', force_lm=False):
         """
         Generic file uploader for micrOS - over webrepl
@@ -396,6 +407,9 @@ class OTA(Compile):
         ota_password - accessing webrepl to upload files
         force_lm - use prefix as 'LM_' for every file - for user file upload / GUI drag n drop
         """
+        if device[0] == "__simulator__":
+            OTA.sim_ota_update(upload_path_list, force_lm)
+            return
 
         # GET webrepl repo
         if not self.__clone_webrepl_repo():

{micrOSDevToolKit-2.4.0 → micrOSDevToolKit-2.4.1}/toolkit/DevEnvUSB.py

@@ -53,7 +53,7 @@ class USB(Compile):
                   'deploy': 'esptool.py --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}',
                   'mpremote_cmd': 'mpremote',
                   'cmd_line_info': ''},
-             'tinypico-usbc':
+             'tinypico_usbc':
                  {'erase': 'esptool.py --port {dev} erase_flash',
                   'deploy': 'esptool.py --chip esp32 --port {dev} --baud 921600 write_flash -z 0x1000 {micropython}',
                   'ampy_cmd': 'ampy -p {dev} -b 115200 -d 2 {args}',

{micrOSDevToolKit-2.4.0 → micrOSDevToolKit-2.4.1}/toolkit/micrOSdashboard.py

@@ -609,7 +609,7 @@ class QuickOTAUpload(QLabel):
         width = 200
         height = 15
         label = QLabel(self.parent_obj)
-        label.setText("Quick LM OTA Upload")
+        label.setText("Drag-n-Drop OTA file upload")
         label.setGeometry(start_x, start_y, width, height)
         label.setStyleSheet("background-color: white")
 
@@ -638,14 +638,14 @@ class QuickOTAUpload(QLabel):
         pixmap = QPixmap(logo_path)
         pixmap = pixmap.scaled(100, 100)
         self.setPixmap(pixmap)
-        self.setToolTip(f"Direct LM module upload to micrOS board via webrepl\nSimulator path: {os.path.join(MYPATH, 'workspace/simulator')}")
+        self.setToolTip(f"OTA File (py,mpy,js,html,css) upload to micrOS board via webrepl\nSimulator path: {os.path.join(MYPATH, 'workspace/simulator')}")
         self.setAcceptDrops(True)
 
     def get_upload_callback(self):
         if len(self.contents_path) == 0:
             self.parent_obj.console.append_output(f"Empty upload list.")
         else:
-            if not self.parent_obj.start_bg_application_popup(text="QUICK LM OTA UPLOAD?",
+            if not self.parent_obj.start_bg_application_popup(text="OTA UPLOAD?",
                                                               verify_data_dict={i+1: path for i, path in enumerate(self.contents_path)}):
                 return
             self.parent_obj.on_click_lm_quick_update(upload_path_list=self.contents_path)
@@ -1064,7 +1064,7 @@ class micrOSGUI(QWidget):
                                                                  'forced LM_ prefix': not self.modifiers_obj.unsafe_ota_enabled}):
             return
 
-        self.console.append_output('[quick_ota] Update Load Modules over wifi')
+        self.console.append_output('[quick_ota] Module upload over wifi')
         # Start init_progressbar
         pth = ProgressbarUpdateThread()
         pth.eta_sec = ProgressbarTimers.quick_ota

{micrOSDevToolKit-2.4.0 → micrOSDevToolKit-2.4.1}/toolkit/simulator_lib/machine.py

@@ -175,6 +175,17 @@ class SoftSPI:
         pass
 
 
+class UART:
+
+    def __init__(self, pin, baudrate, tx, rx, timeout=1):
+        pass
+
+    def write(self, frame):
+        pass
+
+    def read(self, *args, **kwargs):
+        pass
+
 def freq(*args, **kwargs):
     return 1
 

micrOSDevToolKit-2.4.1/toolkit/workspace/precompiled/node_config.json

@@ -0,0 +1 @@
+{"version": "n/a", "auth": false, "staessid": "your_wifi_name", "stapwd": "your_wifi_passwd", "devfid": "keychain08", "appwd": "ADmin123", "dbg": true, "nwmd": "STA", "hwuid": "n/a", "soctout": 30, "socport": 9008, "webui": false, "devip": "n/a", "cron": false, "crontasks": "n/a", "timirq": false, "timirqcbf": "n/a", "timirqseq": 1000, "irq1": false, "irq1_cbf": "n/a", "irq1_trig": "n/a", "irq2": false, "irq2_cbf": "n/a", "irq2_trig": "n/a", "irq3": false, "irq3_cbf": "n/a", "irq3_trig": "n/a", "irq4": false, "irq4_cbf": "n/a", "irq4_trig": "n/a", "irq_prell_ms": 300, "boothook": "keychain load bootmsg='micrOS'; keychain display", "aioqueue": 4, "utc": 60, "boostmd": true, "guimeta": "...", "cstmpmap": "n/a", "telegram": "n/a"}

micrOSDevToolKit-2.4.0/toolkit/workspace/precompiled/node_config.json

@@ -1 +0,0 @@
-{"irq2": false, "irq2_cbf": "n/a", "irq3_cbf": "n/a", "timirq": false, "irq4": false, "auth": false, "irq4_cbf": "n/a", "devip": "10.0.1.232", "soctout": 100, "appwd": "ADmin123", "timirqcbf": "n/a", "timirqseq": 60000, "hwuid": "micr3c61052fa788OS", "staessid": "elektroncsakpozitivan_2G", "irq1_cbf": "n/a", "cron": true, "irq4_trig": "n/a", "nwmd": "STA", "boothook": "roboarm boot_move &", "version": "2.3.0-0", "irq_prell_ms": 300, "crontasks": "*:21:0:0!roboarm play delay=1500 deinit=True", "aioqueue": 3, "utc": 120, "boostmd": true, "irq1_trig": "n/a", "guimeta": "...", "socport": 9008, "webui": false, "cstmpmap": "n/a", "telegram": "5878434165:AAFqTfjh60XKlyW6Bi41yIoYkxzlrID2OWU", "irq3_trig": "n/a", "dbg": true, "irq2_trig": "n/a", "irq3": false, "devfid": "RoboArm", "stapwd": "BNM3,1415", "irq1": false}