micrOSDevToolKit 3.0.7__tar.gz → 3.2.4__tar.gz

{microsdevtoolkit-3.0.7 → microsdevtoolkit-3.2.4}/MANIFEST.in

@@ -12,6 +12,7 @@ graft toolkit/gateway
 recursive-include toolkit/user_data .include
 recursive-include toolkit/user_data/node_config_archive/.include
 include toolkit/LM_to_compile.dat
+include toolkit/micrOSImageConfig.json
 graft toolkit/user_data/webhooks/
 
 include media/dnd.png

{microsdevtoolkit-3.0.7/micrOSDevToolKit.egg-info → microsdevtoolkit-3.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 3.0.7
+Version: 3.2.4
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -77,6 +77,7 @@ Thanks for ![GitHub stars](https://img.shields.io/github/stars/BxNxM/micrOS), fo
 [![Thingiverse](https://img.shields.io/badge/Thingiverse-micrOS_3Dprints-%231489FF?logo=thingiverse&logoColor=white)](https://www.thingiverse.com/micros_framework/designs)
 [![DockerHub](https://img.shields.io/badge/DockerHub-micrOS%20Gateway-blue)](https://hub.docker.com/r/bxnxm/micros-gateway)<br/>
 
+
 [![PyPI Version](https://img.shields.io/pypi/v/micrOSDevToolKit)](https://pypi.org/project/micrOSDevToolKit/)
 
 
@@ -122,6 +123,10 @@ Access rest api over browser: `http://<nodename>.local`
 9. micrOS Gateway server with Prometheus&Grafana: [link](https://github.com/BxNxM/micrOS/#micros-gateway-in-docker)
 10. Release notes: [release-note](https://github.com/BxNxM/micrOS/#release-note)
 
+### AI
+
+[![DockerHub](https://img.shields.io/badge/DockerHub-micrOS%20MCP-blue)](https://hub.docker.com/r/bxnxm/micros-mcp)
+
 ----------------------------------------
 ----------------------------------------
 
@@ -141,7 +146,9 @@ End-to-End solution for deployment, update, monitor and develop micrOS boards.
 
 I would suggest to use micrOS GUI as a primary interface for micrOS development kit, but you can use cli as well if you prefer.
 
-> Note: The main purpose of the USB deployment scripts to install micropython on the board and put all micrOS resources from `micrOS/toolkit/workspace/precompiled` to the connected board.
+> USB deployment supports both stock MicroPython development images and
+> prebuilt `micrOS-*` release images. The selected firmware filename determines
+> which resources are copied from `toolkit/workspace/precompiled/`.
 
 <br/>
 
@@ -228,6 +235,31 @@ It will install your board via USB with default settings. **Continue with micrOS
 
 > Note: At the first USB deployment, devToolKit will ask to install **SerialUSB driver** and it will open the driver installer as well, please follow the steps and install the necessary driver.
 
+### USB deployment and update modes
+
+The selected firmware name controls the deployment mode:
+
+- A stock MicroPython image keeps the legacy full-file deployment.
+- A `micrOS-*` image already contains the core and copies only the configured
+  web assets and minimum LM/IO modules.
+
+USB deploy and update show the selected mode. USB update always restores
+`node_config.json` for both image types. **Skip MicroPython** keeps the current
+firmware and copies only the required files.
+
+Build all configured `micrOS-*` images with:
+
+```bash
+python3 toolkit/micrOSImageBuilder.py
+```
+
+Supported custom targets: `esp32`, `esp32c3`, `esp32c6`, and `esp32s3`.
+
+Image settings and release resources are defined in
+`toolkit/micrOSImageConfig.json`.
+Custom images also add a `[micrOS]` marker to the board shown by `system info`.
+Full OTA reads the `hello` mode and skips frozen core files on `rel` devices.
+
 
 ```
 ╔╗ ╔╗                  ╔═══╗╔╗ ╔╗╔═╗ ╔╗       ╔═══╗
@@ -550,7 +582,7 @@ Official [DockerHub](https://hub.docker.com/repository/docker/bxnxm/micros-gatew
 
 ## FUTURE MAIN RELEASE PLANS
 
-Version **3.1.0-0** `micrOS-Waterbear`
+Version **3.X.0-0** `micrOS-Waterbear`
 
 ```
     Core:
@@ -559,7 +591,7 @@ Version **3.1.0-0** `micrOS-Waterbear`
 ```
 
 
-Version **3.X.0-0** `micrOS-SecurePower`
+Version **3.X+1.0-0** `micrOS-SecurePower`
 
 ```
     Core:
@@ -645,7 +677,7 @@ optional arguments:
 
 Base commands:
   -m, --make            Erase & Deploy & Precompile (micrOS) & Install (micrOS)
-  -r, --update          Update/redeploy connected (usb) micrOS. - node config will be restored
+  -r, --update          Update/redeploy connected (USB) micrOS
   -s, --search_devices  Search devices on connected wifi network.
   -o, --OTA             OTA (OverTheArir update with webrepl)
   -c, --connect         Connect via socketclinet
@@ -703,8 +735,8 @@ micr<ID>cOS            experipurple      10.0.1.94	OFFLINE		<n/a>		n/a
 Development & Deployment & Connection:
   -f, --force_update    Force mode for -r/--update and -o/--OTA
   -e, --erase           Erase device
-  -d, --deploy          Deploy micropython
-  -i, --install         Install micrOS on micropython
+  -d, --deploy          Flash only the selected micropython image
+  -i, --install         Copy the full precompiled micrOS tree
   -l, --list_devs_n_bins
                         List connected devices & micropython binaries.
   -ls, --node_ls        List micrOS node filesystem content.
@@ -714,11 +746,19 @@ Development & Deployment & Connection:
                         Backup usb connected node config.
   -sim, --simulate      start micrOS on your computer in simulated mode
   -cc, --cross_compile_micros
-                        Cross Compile micrOS system [py -> mpy]
+                        Cross Compile micrOS system [py -> mpy] and optimize
+                        precompiled web resources
   -gw, --gateway        Start micrOS Gateway rest-api server
   -v, --version         Get micrOS version - repo + connected device.
 ```
 
+`-cc` copies `micrOS/source/web` into `toolkit/workspace/precompiled/web`,
+then overwrites the copied `.js`, `.css`, and `.html` files with optimized
+versions for deployment. Source web files stay readable.
+
+Optional optimizer dependencies are installed by the normal toolkit bootstrap
+unless `--light` is used:
+
 ## Socket terminal example - non interactive
 
 ### Identify device
@@ -730,7 +770,7 @@ Activate MicrOS device connection address
 [i]         FUID        IP               UID
 [0] Device: slim01 - 10.0.1.73 - 0x500x20x910x680xc0xf7
 Device was found: slim01
-hello:slim01:0x500x20x910x680xc0xf7
+hello:slim01:0x500x20x910x680xc0xf7:dev
 ```
 
 ### Get help
@@ -907,7 +947,7 @@ Bye!
 ├── Common.py
 ├── Config.py
 ├── Debug.py
-├── Espnow.py
+├── mespnow.py
 ├── Files.py
 ├── Hooks.py
 ├── InterConnect.py

{microsdevtoolkit-3.0.7 → microsdevtoolkit-3.2.4}/README.md

@@ -39,6 +39,7 @@ Thanks for ![GitHub stars](https://img.shields.io/github/stars/BxNxM/micrOS), fo
 [![Thingiverse](https://img.shields.io/badge/Thingiverse-micrOS_3Dprints-%231489FF?logo=thingiverse&logoColor=white)](https://www.thingiverse.com/micros_framework/designs)
 [![DockerHub](https://img.shields.io/badge/DockerHub-micrOS%20Gateway-blue)](https://hub.docker.com/r/bxnxm/micros-gateway)<br/>
 
+
 [![PyPI Version](https://img.shields.io/pypi/v/micrOSDevToolKit)](https://pypi.org/project/micrOSDevToolKit/)
 
 
@@ -84,6 +85,10 @@ Access rest api over browser: `http://<nodename>.local`
 9. micrOS Gateway server with Prometheus&Grafana: [link](https://github.com/BxNxM/micrOS/#micros-gateway-in-docker)
 10. Release notes: [release-note](https://github.com/BxNxM/micrOS/#release-note)
 
+### AI
+
+[![DockerHub](https://img.shields.io/badge/DockerHub-micrOS%20MCP-blue)](https://hub.docker.com/r/bxnxm/micros-mcp)
+
 ----------------------------------------
 ----------------------------------------
 
@@ -103,7 +108,9 @@ End-to-End solution for deployment, update, monitor and develop micrOS boards.
 
 I would suggest to use micrOS GUI as a primary interface for micrOS development kit, but you can use cli as well if you prefer.
 
-> Note: The main purpose of the USB deployment scripts to install micropython on the board and put all micrOS resources from `micrOS/toolkit/workspace/precompiled` to the connected board.
+> USB deployment supports both stock MicroPython development images and
+> prebuilt `micrOS-*` release images. The selected firmware filename determines
+> which resources are copied from `toolkit/workspace/precompiled/`.
 
 <br/>
 
@@ -190,6 +197,31 @@ It will install your board via USB with default settings. **Continue with micrOS
 
 > Note: At the first USB deployment, devToolKit will ask to install **SerialUSB driver** and it will open the driver installer as well, please follow the steps and install the necessary driver.
 
+### USB deployment and update modes
+
+The selected firmware name controls the deployment mode:
+
+- A stock MicroPython image keeps the legacy full-file deployment.
+- A `micrOS-*` image already contains the core and copies only the configured
+  web assets and minimum LM/IO modules.
+
+USB deploy and update show the selected mode. USB update always restores
+`node_config.json` for both image types. **Skip MicroPython** keeps the current
+firmware and copies only the required files.
+
+Build all configured `micrOS-*` images with:
+
+```bash
+python3 toolkit/micrOSImageBuilder.py
+```
+
+Supported custom targets: `esp32`, `esp32c3`, `esp32c6`, and `esp32s3`.
+
+Image settings and release resources are defined in
+`toolkit/micrOSImageConfig.json`.
+Custom images also add a `[micrOS]` marker to the board shown by `system info`.
+Full OTA reads the `hello` mode and skips frozen core files on `rel` devices.
+
 
 ```
 ╔╗ ╔╗                  ╔═══╗╔╗ ╔╗╔═╗ ╔╗       ╔═══╗
@@ -512,7 +544,7 @@ Official [DockerHub](https://hub.docker.com/repository/docker/bxnxm/micros-gatew
 
 ## FUTURE MAIN RELEASE PLANS
 
-Version **3.1.0-0** `micrOS-Waterbear`
+Version **3.X.0-0** `micrOS-Waterbear`
 
 ```
     Core:
@@ -521,7 +553,7 @@ Version **3.1.0-0** `micrOS-Waterbear`
 ```
 
 
-Version **3.X.0-0** `micrOS-SecurePower`
+Version **3.X+1.0-0** `micrOS-SecurePower`
 
 ```
     Core:
@@ -607,7 +639,7 @@ optional arguments:
 
 Base commands:
   -m, --make            Erase & Deploy & Precompile (micrOS) & Install (micrOS)
-  -r, --update          Update/redeploy connected (usb) micrOS. - node config will be restored
+  -r, --update          Update/redeploy connected (USB) micrOS
   -s, --search_devices  Search devices on connected wifi network.
   -o, --OTA             OTA (OverTheArir update with webrepl)
   -c, --connect         Connect via socketclinet
@@ -665,8 +697,8 @@ micr<ID>cOS            experipurple      10.0.1.94	OFFLINE		<n/a>		n/a
 Development & Deployment & Connection:
   -f, --force_update    Force mode for -r/--update and -o/--OTA
   -e, --erase           Erase device
-  -d, --deploy          Deploy micropython
-  -i, --install         Install micrOS on micropython
+  -d, --deploy          Flash only the selected micropython image
+  -i, --install         Copy the full precompiled micrOS tree
   -l, --list_devs_n_bins
                         List connected devices & micropython binaries.
   -ls, --node_ls        List micrOS node filesystem content.
@@ -676,11 +708,19 @@ Development & Deployment & Connection:
                         Backup usb connected node config.
   -sim, --simulate      start micrOS on your computer in simulated mode
   -cc, --cross_compile_micros
-                        Cross Compile micrOS system [py -> mpy]
+                        Cross Compile micrOS system [py -> mpy] and optimize
+                        precompiled web resources
   -gw, --gateway        Start micrOS Gateway rest-api server
   -v, --version         Get micrOS version - repo + connected device.
 ```
 
+`-cc` copies `micrOS/source/web` into `toolkit/workspace/precompiled/web`,
+then overwrites the copied `.js`, `.css`, and `.html` files with optimized
+versions for deployment. Source web files stay readable.
+
+Optional optimizer dependencies are installed by the normal toolkit bootstrap
+unless `--light` is used:
+
 ## Socket terminal example - non interactive
 
 ### Identify device
@@ -692,7 +732,7 @@ Activate MicrOS device connection address
 [i]         FUID        IP               UID
 [0] Device: slim01 - 10.0.1.73 - 0x500x20x910x680xc0xf7
 Device was found: slim01
-hello:slim01:0x500x20x910x680xc0xf7
+hello:slim01:0x500x20x910x680xc0xf7:dev
 ```
 
 ### Get help
@@ -869,7 +909,7 @@ Bye!
 ├── Common.py
 ├── Config.py
 ├── Debug.py
-├── Espnow.py
+├── mespnow.py
 ├── Files.py
 ├── Hooks.py
 ├── InterConnect.py

{microsdevtoolkit-3.0.7 → microsdevtoolkit-3.2.4}/devToolKit.py

@@ -12,7 +12,8 @@ else:
     # INSTALL OPTIONAL DEPENDENCIES - PIP HACK
     from toolkit.lib import pip_package_installer as pip_install
     pip_install.install_optional_dependencies(['PyQt5', 'PyQt5-Qt5', 'PyQt5-sip', 'opencv-python',
-                                               'PyAudio', 'mpy-cross==1.27.0.post2', 'matplotlib'])
+                                               'PyAudio', 'mpy-cross==1.27.0.post2', 'matplotlib',
+                                               'rjsmin', 'rcssmin', 'htmlmin'])
     if sys.platform.startswith("win"):
         pip_install.install_optional_dependencies(['pyreadline3'])
 
@@ -53,7 +54,12 @@ def arg_parse():
     base_group = parser.add_argument_group("Base commands")
     base_group.add_argument("-pupdate", "--pip_update", action="store_true", help="Update micrOS devToolKit (pip) package - app")
     base_group.add_argument("-m", "--make", action="store_true", help="Erase & Deploy & Precompile (micrOS) & Install (micrOS)")
-    base_group.add_argument("-r", "--update", action="store_true", help="Update/redeploy connected (usb) micrOS. - node config will be restored")
+    base_group.add_argument(
+        "-r",
+        "--update",
+        action="store_true",
+        help="Update/redeploy connected (USB) micrOS using the selected image mode",
+    )
     base_group.add_argument("-s", "--search_devices", action="store_true", help="Search devices on connected wifi network.")
     base_group.add_argument("-o", "--OTA", action="store_true", help="OTA (OverTheArir update with webrepl)")
     base_group.add_argument("-c", "--connect", action="store_true", help="Connect via socketclinet")
@@ -66,14 +72,14 @@ def arg_parse():
     dev_group = parser.add_argument_group("Development & Deployment & Connection")
     dev_group.add_argument("-f", "--force_update", action="store_true", help="Force mode for -r/--update and -o/--OTA")
     dev_group.add_argument("-e", "--erase", action="store_true", help="Erase device")
-    dev_group.add_argument("-d", "--deploy", action="store_true", help="Deploy micropython binary (image) over usb. After this, python interpreter will be available on the board.")
-    dev_group.add_argument("-i", "--install", action="store_true", help="Install micrOS on micropython, copy all micrOS code to the board after micropython was installed.")
+    dev_group.add_argument("-d", "--deploy", action="store_true", help="Flash only the selected MicroPython image over USB.")
+    dev_group.add_argument("-i", "--install", action="store_true", help="Legacy full copy of the precompiled micrOS tree onto MicroPython.")
     dev_group.add_argument("-l", "--list_devs_n_bins", action="store_true", help="List connected devices & micropython binaries.")
     dev_group.add_argument("-ls", "--node_ls", action="store_true", help="List micrOS node filesystem content.")
     dev_group.add_argument("-u", "--connect_via_usb", action="store_true", help="Connect via serial port - usb")
     dev_group.add_argument("-b", "--backup_node_config", action="store_true", help="Backup usb connected node config.")
     dev_group.add_argument("-sim", "--simulate", action="store_true", help="start micrOS on your computer in simulated mode")
-    dev_group.add_argument("-cc", "--cross_compile_micros", action="store_true", help="Cross Compile micrOS system [py -> mpy], MICROS_DEV env. var: enable compile-> True (disabled for pip deployments)")
+    dev_group.add_argument("-cc", "--cross_compile_micros", action="store_true", help="Cross Compile micrOS system [py -> mpy] and optimize precompiled web resources, MICROS_DEV env. var: enable compile-> True (disabled for pip deployments)")
     dev_group.add_argument("-gw", "--gateway", action="store_true", help="Start micrOS Gateway rest-api server, Env. vars: API_AUTH='username:password' (optional), GATEWAYIP needed for container deployment only.")
     dev_group.add_argument("-v", "--version", action="store_true", help="Get micrOS version - repo + connected device.")
     dev_group.add_argument("-lint", "--linter", action="store_true", help="Run micrOS system linter (pylint+)")

{microsdevtoolkit-3.0.7 → microsdevtoolkit-3.2.4}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -9,7 +9,7 @@
             5
         ],
         "Pacman.py": [
-            9.48,
+            9.31,
             3
         ],
         "Files.py": [
@@ -29,19 +29,23 @@
             3
         ],
         "Web.py": [
-            9.25,
+            9.32,
             2
         ],
         "Tasks.py": [
-            9.34,
+            9.36,
             13
         ],
         "Config.py": [
             9.62,
             18
         ],
+        "mespnow.py": [
+            9.92,
+            4
+        ],
         "Shell.py": [
-            9.36,
+            9.37,
             2
         ],
         "Notify.py": [
@@ -49,8 +53,8 @@
             3
         ],
         "Types.py": [
-            9.04,
-            28
+            9.09,
+            24
         ],
         "Logger.py": [
             8.86,
@@ -58,7 +62,7 @@
         ],
         "Common.py": [
             9.86,
-            33
+            31
         ],
         "InterConnect.py": [
             9.7,
@@ -76,17 +80,13 @@
             9.81,
             8
         ],
-        "Espnow.py": [
-            9.87,
-            4
-        ],
         "Scheduler.py": [
             9.62,
             1
         ],
         "microIO.py": [
             9.37,
-            43
+            38
         ],
         "micrOS.py": [
             9.09,
@@ -121,11 +121,11 @@
             0
         ],
         "modules/LM_pacman.py": [
-            7.62,
+            7.68,
             0
         ],
         "modules/LM_web.py": [
-            8.57,
+            9.13,
             0
         ],
         "modules/LM_genIO.py": [
@@ -138,7 +138,7 @@
         ],
         "modules/LM_system.py": [
             8.87,
-            0
+            3
         ],
         "modules/LM_robustness.py": [
             8.47,
@@ -148,25 +148,13 @@
             9.1,
             0
         ],
-        "modules/LM_co2.py": [
-            8.5,
-            0
-        ],
-        "modules/LM_mh_z19c.py": [
-            9.78,
-            0
-        ],
         "modules/LM_rest.py": [
             8.6,
             0
         ],
-        "modules/LM_tcs3472.py": [
-            9.48,
-            0
-        ],
         "modules/LM_oled.py": [
             9.37,
-            0
+            1
         ],
         "modules/LM_tinyrgb.py": [
             7.95,
@@ -186,11 +174,11 @@
         ],
         "modules/LM_switch.py": [
             8.68,
-            0
+            1
         ],
         "modules/LM_servo.py": [
             7.73,
-            0
+            1
         ],
         "modules/LM_rgbcct.py": [
             8.62,
@@ -198,7 +186,7 @@
         ],
         "modules/LM_oled_sh1106.py": [
             9.2,
-            0
+            1
         ],
         "modules/LM_haptic.py": [
             9.25,
@@ -210,11 +198,11 @@
         ],
         "modules/LM_neopixel.py": [
             7.77,
-            0
+            2
         ],
         "modules/LM_cct.py": [
             9.03,
-            0
+            1
         ],
         "modules/LM_L9110_DCmotor.py": [
             7.69,
@@ -248,16 +236,12 @@
             7.94,
             0
         ],
-        "modules/LM_sound_event.py": [
-            8.52,
-            0
-        ],
         "modules/LM_cluster.py": [
             8.82,
             0
         ],
         "modules/LM_espnow.py": [
-            7.14,
+            7.86,
             0
         ],
         "modules/LM_telegram.py": [
@@ -270,16 +254,12 @@
         ],
         "modules/LM_rgb.py": [
             9.01,
-            0
+            1
         ],
         "modules/LM_distance.py": [
             8.86,
             0
         ],
-        "modules/LM_VL53L0X.py": [
-            9.07,
-            0
-        ],
         "modules/LM_light_sensor.py": [
             9.12,
             0
@@ -290,7 +270,7 @@
         ],
         "modules/LM_presence.py": [
             8.89,
-            0
+            4
         ],
         "modules/LM_trackball.py": [
             8.6,
@@ -298,11 +278,11 @@
         ],
         "modules/LM_dimmer.py": [
             8.32,
-            0
+            1
         ],
         "modules/LM_gameOfLife.py": [
             9.29,
-            0
+            1
         ],
         "modules/LM_ds18.py": [
             6.0,
@@ -310,25 +290,25 @@
         ],
         "modules/LM_i2s_mic.py": [
             8.42,
-            0
+            1
         ],
         "modules/LM_sdcard.py": [
             8.11,
             0
         ],
         "modules/LM_fileserver.py": [
-            9.2,
-            0
+            9.27,
+            1
         ]
     },
     "summary": {
         "core": [
-            5311,
+            5414,
             27
         ],
         "load": [
-            8823,
-            53
+            7569,
+            48
         ],
         "core_dep": [
             true,
@@ -339,7 +319,7 @@
             5
         ],
         "core_score": 9.28,
-        "load_score": 8.46,
-        "version": "3.0.7-0"
+        "load_score": 8.43,
+        "version": "3.2.4-0"
     }
 }

{microsdevtoolkit-3.0.7 → microsdevtoolkit-3.2.4}/micrOS/source/Files.py

@@ -43,7 +43,9 @@ def is_protected(path:str='/') -> bool:
         - protected root folders and files: /*
         - protected system files by name
     """
-    protected_files = ("node_config.json", "LM_system.mpy", "LM_pacman.mpy", "LM_cluster.mpy")
+    protected_files = ("node_config.json",
+                       "LM_system.mpy", "LM_pacman.mpy", "LM_web.mpy",
+                       "LM_fileserver.mpy", "LM_cluster.mpy")
     # Detect parent directory
     parent = "/".join(path.split("/")[:-1]) or "/"
     # Get file/folder name

{microsdevtoolkit-3.0.7 → microsdevtoolkit-3.2.4}/micrOS/source/Hooks.py

@@ -134,7 +134,7 @@ def enableESPNow() -> str:
     """
     if cfgget('espnow'):
         try:
-            from Espnow import ESPNowSS
+            from mespnow import ESPNowSS
             verdict = ESPNowSS().start_server()
             console_write(f"[TASK] Start ESPNow-InterCon server: {verdict}")
         except Exception as e:

{microsdevtoolkit-3.0.7 → microsdevtoolkit-3.2.4}/micrOS/source/InterConnect.py

@@ -22,7 +22,7 @@ from Server import Server
 from Tasks import NativeTask
 
 if cfgget('espnow'):
-    from Espnow import ESPNowSS
+    from mespnow import ESPNowSS
 else:
     ESPNowSS = None