micrOSDevToolKit 3.0.0__tar.gz → 3.0.2__tar.gz

{microsdevtoolkit-3.0.0/micrOSDevToolKit.egg-info → microsdevtoolkit-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 3.0.0
+Version: 3.0.2
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -94,11 +94,11 @@ Access rest api over browser: `http://<nodename>.local`
 ----------------------------------------
 
 📲 💻 ShellCli: Generic session-based communication API (OAM Interface) <br/>
-📲 WebCli: Apple shortcuts compatible **REST API** and **HTTP Homepage** <br/>
+📲 WebCli: mini webserver **REST API** and **HTTP Server** <br/>
 &nbsp;&nbsp; ✉️ Expose upython module functions - telnet **TCP/IP** and **REST API** <br/>
 ⚙️ 📝 Device initialization from user config <br/>
 🧩  Codeless end user experience via phone client <br/>
-⚠️  No external server or service required for client-device communication <br/>
+⚠️  No external server or service required for client-device/device-device communication <br/>
 &nbsp;&nbsp; ⚠️ 🛡 Works on Local Network (WiFi-WLAN) <br/>
 🛠 Easy to create custom application(s) aka create your own Load Modules: <br/>
 🦾 Built-in scheduling (IRQs):<br/>
@@ -141,7 +141,7 @@ 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.
+> 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.
 
 <br/>
 
@@ -224,7 +224,7 @@ It will open a graphical user interface for micrOS device management, like usb d
 2. Click on [Deploy (USB)] button -> presss YES
 ```
 
-It will install your board via USB with default settings. **Continue with micrOS Client app...**
+It will install your board via USB with default settings. **Continue with micrOS Client app...** or "devToolKit.py -s -c"
 
 > 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.
 
@@ -384,7 +384,7 @@ Yes       espnow.server
 
 ### Boards and suggestions
 
-There are multiple types of MCU-s (esp32, esp32s3, etc.) available to order, **BUT** to be able to enable **more features** (~2 Load Modules) and **full capable WebUI** interface you need to have more then **190-210kb** of ram (basic boards)(ℹ️).
+There are multiple types of MCU-s (esp32, esp32s3, etc.) available to order, **BUT** to be able to enable **more features** (more then ~2 Load Modules) and **full capable WebUI** interface you need to have more then **150-200kb** of ram (basic boards)(ℹ️).
 
 There is a solution ✅, additinal psram: **~2-4-8Mb** boards are available. It used to name as **psram** or **spiram**, even there is a type **octo-psram**, so check it before buy!!! Psram needs to be **supported on micropython** side as well !!!
 
@@ -398,16 +398,14 @@ There is a solution ✅, additinal psram: **~2-4-8Mb** boards are available. It
 
 **`esp32cam`** it has a custom image and attached 8Mb of ram.
 
-So prefer boards with more psram 2Mb-8Mb, **minumum requirement for the full flatched setup ~400kb** but smallest psram is **2Mb**, in practive:
+So prefer boards with more psram 2Mb-8Mb, **minumum requirement for the full flatched setup ~250kb** but smallest psram is **2Mb**:
 
-- max measured 4Mb is 3.2% 128kb - oled_ui and lot of things loaded...
+- max measured 4Mb is 5.6% 230kb - oled_ui and lot of things loaded...
 - camera stream can use about 50% of ram, that means about 2Mb of ram usage.
 
-ℹ️ With basic 190-210kb of ram you can use the system with ShellCli with no issue, just webUI dashboard cannot be load due to memory limitations..., **under 140kb of system ram the system not reliable**, so these boards are not supported.
-
 > Note:
 
-**`esp32`** also can be totally fine with ShellCli, WebCli and 1 load module or multiple modules based on module size... just can be limited by the available memory soonor the later ... (WebCli javascript, htmls are quite small but can be few tens of kilobytes, also multiple async tasks in the background can take same, and roughly around 80% of memory usage system can be instable and restarts.) **So if you have a spare one try out micrOS with a range of features :)**
+**`esp32`** also can be totally fine with ShellCli, and no WebCli ... (WebCli javascript, htmls are quite small but can be few tens of kilobytes, also multiple async tasks in the background can take same, and roughly around 80% of memory usage system can be instable and restarts.) **So if you have a spare one try out micrOS with a range of features :)**
 
 ----------------------
 
@@ -557,12 +555,7 @@ Version **3.1.0-0** `micrOS-Waterbear`
 ```
     Core:
     - Low power mode (wake on event, hibernate command)?
-    	- Remote controller / Sensor UseCase
-    - WebEngine additional path shering:
-    	- web shared root (already done): /web
-    	- optional additional pathes:
-    		- @modules -> /modules
-    		- @data    -> /data
+    	- Remote controller / Sensor on battery UseCases
 ```
 
 
@@ -573,10 +566,12 @@ Version **3.X.0-0** `micrOS-SecurePower`
     - Async socket servers with SSL/TLS integration (with auth.)
         - ShellCli (with TLS) and InterCon adaptation (default port: 9008, new secure port 9009)
         - WebCli (https) and webUI adaptation
+ 
     - Intercon-Wire (?)
     	- Idea of wired message communication protocol same as Intercon-Shell/Intercon-ESPNow
     	- Possible HW protocols: i2c / onewire / uart BUT it should support bidirectional message transfers
     	- Goal: CoProcessor easy integration feature - Arduino env support
+ 
     - Application deployment automation: /config/compose.json
     	- enables application deployment:
     		- configuration (node_config.json) handling - safe parameter injection (boothook and irqs)
@@ -613,6 +608,14 @@ Note:
 
 > Secure Core (OTA static modules) (GUI): `boot.py`, `micrOSloader.mpy`, `Network.mpy`, `ConfigHandler.mpy`, `Debug.mpy`
 
+Alternative branches:
+
+[micrOS-Core 3.0](https://github.com/BxNxM/micrOS/tree/core) - with minimal set of default Load Modules
+
+[micrOS-develop](https://github.com/BxNxM/micrOS/tree/develop) - for experimentation
+
+[lightweight-for-esp8266](https://github.com/BxNxM/micrOS/tree/lightweight) - really old legacy v1.3
+
 
 #### Erase device & Deploy micropython & Install micrOS 
 
@@ -652,6 +655,8 @@ Base commands:
                         List/Execute frontend applications. [list]
   -stat, --node_status  Show all available micrOS devices status data.
   -cl, --clean          Clean user connection data: device_conn_cache.json
+  
+  ...
 ```
 
 **Search devices**

{microsdevtoolkit-3.0.0 → microsdevtoolkit-3.0.2}/README.md

@@ -56,11 +56,11 @@ Access rest api over browser: `http://<nodename>.local`
 ----------------------------------------
 
 📲 💻 ShellCli: Generic session-based communication API (OAM Interface) <br/>
-📲 WebCli: Apple shortcuts compatible **REST API** and **HTTP Homepage** <br/>
+📲 WebCli: mini webserver **REST API** and **HTTP Server** <br/>
 &nbsp;&nbsp; ✉️ Expose upython module functions - telnet **TCP/IP** and **REST API** <br/>
 ⚙️ 📝 Device initialization from user config <br/>
 🧩  Codeless end user experience via phone client <br/>
-⚠️  No external server or service required for client-device communication <br/>
+⚠️  No external server or service required for client-device/device-device communication <br/>
 &nbsp;&nbsp; ⚠️ 🛡 Works on Local Network (WiFi-WLAN) <br/>
 🛠 Easy to create custom application(s) aka create your own Load Modules: <br/>
 🦾 Built-in scheduling (IRQs):<br/>
@@ -103,7 +103,7 @@ 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.
+> 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.
 
 <br/>
 
@@ -186,7 +186,7 @@ It will open a graphical user interface for micrOS device management, like usb d
 2. Click on [Deploy (USB)] button -> presss YES
 ```
 
-It will install your board via USB with default settings. **Continue with micrOS Client app...**
+It will install your board via USB with default settings. **Continue with micrOS Client app...** or "devToolKit.py -s -c"
 
 > 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.
 
@@ -346,7 +346,7 @@ Yes       espnow.server
 
 ### Boards and suggestions
 
-There are multiple types of MCU-s (esp32, esp32s3, etc.) available to order, **BUT** to be able to enable **more features** (~2 Load Modules) and **full capable WebUI** interface you need to have more then **190-210kb** of ram (basic boards)(ℹ️).
+There are multiple types of MCU-s (esp32, esp32s3, etc.) available to order, **BUT** to be able to enable **more features** (more then ~2 Load Modules) and **full capable WebUI** interface you need to have more then **150-200kb** of ram (basic boards)(ℹ️).
 
 There is a solution ✅, additinal psram: **~2-4-8Mb** boards are available. It used to name as **psram** or **spiram**, even there is a type **octo-psram**, so check it before buy!!! Psram needs to be **supported on micropython** side as well !!!
 
@@ -360,16 +360,14 @@ There is a solution ✅, additinal psram: **~2-4-8Mb** boards are available. It
 
 **`esp32cam`** it has a custom image and attached 8Mb of ram.
 
-So prefer boards with more psram 2Mb-8Mb, **minumum requirement for the full flatched setup ~400kb** but smallest psram is **2Mb**, in practive:
+So prefer boards with more psram 2Mb-8Mb, **minumum requirement for the full flatched setup ~250kb** but smallest psram is **2Mb**:
 
-- max measured 4Mb is 3.2% 128kb - oled_ui and lot of things loaded...
+- max measured 4Mb is 5.6% 230kb - oled_ui and lot of things loaded...
 - camera stream can use about 50% of ram, that means about 2Mb of ram usage.
 
-ℹ️ With basic 190-210kb of ram you can use the system with ShellCli with no issue, just webUI dashboard cannot be load due to memory limitations..., **under 140kb of system ram the system not reliable**, so these boards are not supported.
-
 > Note:
 
-**`esp32`** also can be totally fine with ShellCli, WebCli and 1 load module or multiple modules based on module size... just can be limited by the available memory soonor the later ... (WebCli javascript, htmls are quite small but can be few tens of kilobytes, also multiple async tasks in the background can take same, and roughly around 80% of memory usage system can be instable and restarts.) **So if you have a spare one try out micrOS with a range of features :)**
+**`esp32`** also can be totally fine with ShellCli, and no WebCli ... (WebCli javascript, htmls are quite small but can be few tens of kilobytes, also multiple async tasks in the background can take same, and roughly around 80% of memory usage system can be instable and restarts.) **So if you have a spare one try out micrOS with a range of features :)**
 
 ----------------------
 
@@ -519,12 +517,7 @@ Version **3.1.0-0** `micrOS-Waterbear`
 ```
     Core:
     - Low power mode (wake on event, hibernate command)?
-    	- Remote controller / Sensor UseCase
-    - WebEngine additional path shering:
-    	- web shared root (already done): /web
-    	- optional additional pathes:
-    		- @modules -> /modules
-    		- @data    -> /data
+    	- Remote controller / Sensor on battery UseCases
 ```
 
 
@@ -535,10 +528,12 @@ Version **3.X.0-0** `micrOS-SecurePower`
     - Async socket servers with SSL/TLS integration (with auth.)
         - ShellCli (with TLS) and InterCon adaptation (default port: 9008, new secure port 9009)
         - WebCli (https) and webUI adaptation
+ 
     - Intercon-Wire (?)
     	- Idea of wired message communication protocol same as Intercon-Shell/Intercon-ESPNow
     	- Possible HW protocols: i2c / onewire / uart BUT it should support bidirectional message transfers
     	- Goal: CoProcessor easy integration feature - Arduino env support
+ 
     - Application deployment automation: /config/compose.json
     	- enables application deployment:
     		- configuration (node_config.json) handling - safe parameter injection (boothook and irqs)
@@ -575,6 +570,14 @@ Note:
 
 > Secure Core (OTA static modules) (GUI): `boot.py`, `micrOSloader.mpy`, `Network.mpy`, `ConfigHandler.mpy`, `Debug.mpy`
 
+Alternative branches:
+
+[micrOS-Core 3.0](https://github.com/BxNxM/micrOS/tree/core) - with minimal set of default Load Modules
+
+[micrOS-develop](https://github.com/BxNxM/micrOS/tree/develop) - for experimentation
+
+[lightweight-for-esp8266](https://github.com/BxNxM/micrOS/tree/lightweight) - really old legacy v1.3
+
 
 #### Erase device & Deploy micropython & Install micrOS 
 
@@ -614,6 +617,8 @@ Base commands:
                         List/Execute frontend applications. [list]
   -stat, --node_status  Show all available micrOS devices status data.
   -cl, --clean          Clean user connection data: device_conn_cache.json
+  
+  ...
 ```
 
 **Search devices**

{microsdevtoolkit-3.0.0 → microsdevtoolkit-3.0.2}/devToolKit.py

@@ -11,7 +11,8 @@ if len(sys.argv) > 1 and sys.argv[1] in ['light', '--light']:
 else:
     # INSTALL OPTIONAL DEPENDENCIES - PIP HACK
     from toolkit.lib import pip_package_installer as pip_install
-    pip_install.install_optional_dependencies(['PyQt5', 'opencv-python', 'PyAudio', 'mpy-cross==1.27.0.post2', 'matplotlib'])
+    pip_install.install_optional_dependencies(['PyQt5', 'PyQt5-Qt5', 'PyQt5-sip', 'opencv-python',
+                                               'PyAudio', 'mpy-cross==1.27.0.post2', 'matplotlib'])
     if sys.platform.startswith("win"):
         pip_install.install_optional_dependencies(['pyreadline3'])
 

{microsdevtoolkit-3.0.0 → microsdevtoolkit-3.0.2}/micrOS/micropython/board_commands.json

@@ -1,55 +1,55 @@
 {"esp32":
-     {"erase": "{esptool_interface} --port {dev} erase_flash",
+     {"erase": "{esptool_interface} --port {dev} erase-flash",
       "deploy": "{esptool_interface} --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}",
       "ampy_cmd": "ampy -p {dev} -b 115200 -d 2 {args}",
       "mpremote_cmd": null,
       "cmd_line_info": "[!HINT!] PRESS [EN] BUTTON TO ENABLE DEVICE ERASE...",
       "url": "https://micropython.org/download/ESP32_GENERIC/"},
  "esp32cam":
-      {"erase": "{esptool_interface} --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "*** [!DISCLAIMER!] ***\n\tUSB copy not works with some serial interface\n\tCopy manually: toolkit/workspace/precompiled/micrOSloader.mpy\n\tNetwork.mpy Debug.mpy ConfigHandler.mpy main.py\n\tThen push OTA update over AP mode... Then you are done",
        "url": "https://github.com/lemariva/micropython-camera-driver/tree/master/firmware"},
  "esp32s2":
-      {"erase": "{esptool_interface} --chip esp32s2 --port {dev} --after no_reset erase_flash",
+      {"erase": "{esptool_interface} --chip esp32s2 --port {dev} --after no_reset erase-flash",
        "deploy": "{esptool_interface} --chip esp32s2 --port {dev} --after no_reset --baud 460800 write_flash -z 0x1000 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "[!HINT!] Hold on Button 0 -> Press Button Reset -> Release Button 0 TO ENABLE DEVICE ERASE...",
        "url": "https://micropython.org/download/ESP32_GENERIC_S2/"},
  "tinypico":
-      {"erase": "{esptool_interface} --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32 --port {dev} --baud 921600 write_flash -z 0x1000 {micropython}",
        "mpremote_cmd": null,
        "ampy_cmd": "ampy -p {dev} -b 115200 -d 2 {args}",
        "cmd_line_info": "",
        "url": "https://micropython.org/download/UM_TINYPICO/"},
  "esp32s3_spiram_oct":
-      {"erase": "{esptool_interface} --chip esp32s3 --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --chip esp32s3 --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32s3 --port {dev} write_flash -z 0 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "[!HINNT!] Press boot button under connecting the board over USB: enables flash erase",
        "url": "https://micropython.org/download/ESP32_GENERIC_S3/"},
  "esp32s3":
-     {"erase": "{esptool_interface} --chip esp32s3 --port {dev} erase_flash",
+     {"erase": "{esptool_interface} --chip esp32s3 --port {dev} erase-flash",
       "deploy": "{esptool_interface} --chip esp32s3 --port {dev} write_flash -z 0 {micropython}",
       "mpremote_cmd": "mpremote",
       "cmd_line_info": "[!HINNT!] Press boot button under connecting board over USB: enables flash erase",
       "url": "https://micropython.org/download/ESP32_GENERIC_S3/"},
  "esp32c3":
-      {"erase": "{esptool_interface} --chip esp32c3 --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --chip esp32c3 --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32c3 --port {dev} --baud 460800 write_flash -z 0x0 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "[!HINT!] Fully automatic deployment...",
        "url": "https://micropython.org/download/ESP32_GENERIC_C3/"},
  "esp32c6":
-      {"erase": "{esptool_interface} --chip esp32c6 --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --chip esp32c6 --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32c6 --port {dev} --baud 460800 write_flash -z 0x0 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "[!HINT!] Fully automatic deployment...",
        "url": "https://micropython.org/download/ESP32_GENERIC_C6/"},
   "esp32c5":
-      {"erase": "{esptool_interface} --chip esp32c5 --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --chip esp32c5 --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32c5 --port {dev} --baud 460800 write_flash 0x2000 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "[!HINT!] Fully automatic deployment...",

{microsdevtoolkit-3.0.0 → microsdevtoolkit-3.0.2}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -41,7 +41,7 @@
             17
         ],
         "Shell.py": [
-            9.37,
+            9.36,
             2
         ],
         "Notify.py": [
@@ -323,7 +323,7 @@
     },
     "summary": {
         "core": [
-            5303,
+            5306,
             27
         ],
         "load": [

{microsdevtoolkit-3.0.0 → microsdevtoolkit-3.0.2}/micrOS/source/Auth.py

@@ -1,5 +1,5 @@
 """
-micrOS Load Module Authentication features
+micrOS Load Module Authentication/Access feature
     Designed by Marcell Ban aka BxNxM
 """
 from Config import cfgget as __cfgget
@@ -8,21 +8,20 @@ PWD_KEY = "pwd"
 def sudo(_f=None, *, _when_true=None):
     """
     Decorator for password-protected functions.
-      his decorator can be used with or without arguments:
+    Usage:
         @sudo
         def fn(...): ...
-
+    Or:
         @sudo(_when_true=("flag", 0))
         def fn(flag, ...): ...
 
-    :param _f: Internal use only.
-        The decorated function when the decorator is used without parentheses.
-        If None, the decorator is being configured and will return a wrapper.
+    :param _f: Internal use only. When decorator is used without parentheses.
+        If None, the decorator is being configured, return a wrapper.
     :param _when_true: optional pwd check
       - _when_true=None: always require pwd
       - _when_true=(keyword:str, position:int): require pwd only when keyword/position is True
     Password check:
-      - pwd is checked against node_config appwd value, and is not passed to the decorated function
+      - pwd check against node_config 'appwd' value
     """
 
     def deco(f):

{microsdevtoolkit-3.0.0 → microsdevtoolkit-3.0.2}/micrOS/source/Buffer.py

@@ -1,5 +1,6 @@
 """
 Data structures for buffered processing & streaming
+    Designed by szeka9 (GitHub)
 """
 
 class BufferFullError(RuntimeError):

{microsdevtoolkit-3.0.0 → microsdevtoolkit-3.0.2}/micrOS/source/Common.py

@@ -12,6 +12,8 @@ from machine import Pin, ADC
 from Notify import Notify
 
 
+MISSING_METHOD = "Child class must implement method.: "
+
 #####################################################################################
 #                                     SYSTEM                                        #
 #####################################################################################
@@ -451,16 +453,16 @@ class AnimationPlayer:
         """
         Child class must implement this method to handle drawing logic.
         """
-        raise NotImplementedError("Child class must implement update method.")
+        raise NotImplementedError(MISSING_METHOD + "update")
 
     def draw(self):
         """
         Draw the current frame.
         """
-        raise NotImplementedError("Child class must implement draw method.")
+        raise NotImplementedError(MISSING_METHOD + "draw")
 
     def clear(self):
         """
         Clear the display.
         """
-        raise NotImplementedError("Child class must implement clear method.")
+        raise NotImplementedError(MISSING_METHOD + "clear")

{microsdevtoolkit-3.0.0 → microsdevtoolkit-3.0.2}/micrOS/source/Hooks.py

@@ -87,11 +87,11 @@ def _tune_performance():
     # Set boosted (boost mode)
     if cfgget('boostmd'):
         max_hz = cpu_min_max[1]
-        console_write(f"[BOOT HOOKS] CPU boost mode ON: {max_hz} Hz")
+        console_write(f"[BOOT HOOKS] CPU boost: ON - {max_hz} Hz")
         freq(max_hz)
     else:
         min_hz = cpu_min_max[0]
-        console_write(f"[BOOT HOOKS] CPU boost mode OFF: {min_hz} Hz")
+        console_write(f"[BOOT HOOKS] CPU boost: OFF - {min_hz} Hz")
         freq(min_hz)
 
 

{microsdevtoolkit-3.0.0 → microsdevtoolkit-3.0.2}/micrOS/source/Network.py

@@ -26,6 +26,9 @@ from microIO import detect_platform
 class NW:
     NIF = None          # NETWORK INTERFACE STA/AP OBJECT
 
+STA_TAG = "[NW: STA] "
+AP_TAG = "[NW: AP] "
+
 #################################################################
 #                 NW INTERFACE STATUS FUNCTIONS                 #
 #################################################################
@@ -87,17 +90,17 @@ def _select_available_wifi_nw(raw_essid:str, raw_pwd:str):
         # Scan wifi network - retry workaround
         for _ in range(0, 2):
             if essid in (wifispot[0].decode('utf-8') for wifispot in NW.NIF.scan()):
-                console_write(f'\t| - [NW: STA] ESSID WAS FOUND: {essid}')
+                console_write(f'\t| - {STA_TAG}ESSID WAS FOUND: {essid}')
                 try:
                     return essid, str(raw_pwd.split(';')[idx]).strip()
                 except Exception as e:
-                    syslog(f'[ERR][SET STA] stapwd config error: {e}')
+                    syslog(f'[ERR]{STA_TAG}stapwd config error: {e}')
             sleep_ms(400)
     return None, ''
 
 
 def set_wifi(essid:str, pwd:str, timeout=60):
-    console_write('[NW: STA] Enable')
+    console_write(f'{STA_TAG}Enable')
 
     # Disable AP mode
     ap_if = WLAN(AP_IF)
@@ -123,19 +126,19 @@ def set_wifi(essid:str, pwd:str, timeout=60):
             syslog(f"[ERR] ESPNow STA PM_NONE: {e}")
     # Check are we already connected
     if sta_if.isconnected():
-        console_write(f"\t| [NW: STA] ALREADY CONNECTED TO {essid}")
+        console_write(f"\t| {STA_TAG}ALREADY CONNECTED TO {essid}")
     else:
         # Multiple essid and pwd handling with retry mechanism
         essid, pwd = _select_available_wifi_nw(essid, pwd)
 
         # Connect to the located wifi network
         if essid is not None:
-            console_write(f'\t| [NW: STA] CONNECT TO NETWORK {essid}')
+            console_write(f'\t| {STA_TAG}CONNECT TO NETWORK {essid}')
             # connect to network
             sta_if.connect(essid, pwd)
             # wait for connection, with timeout set
             while not sta_if.isconnected() and timeout > 0:
-                console_write(f"\t| [NW: STA] Waiting for connection... {timeout} sec")
+                console_write(f"\t| {STA_TAG}Waiting for connection... {timeout} sec")
                 timeout -= 1
                 sleep_ms(500)
             # Set static IP - here because some data comes from connection. (subnet, etc.)
@@ -144,10 +147,10 @@ def set_wifi(essid:str, pwd:str, timeout=60):
                 del sta_if
                 return set_wifi(essid, pwd)
         else:
-            console_write(f"\t| [NW: STA] Wifi network was NOT found: {essid}")
+            console_write(f"\t| {STA_TAG}Wifi network was NOT found: {essid}")
             return False
-        console_write(f"\t|\t| [NW: STA] network config: {str(sta_if.ifconfig())}")
-        console_write(f"\t|\t| [NW: STA] CONNECTED: {str(sta_if.isconnected())}")
+        console_write(f"\t|\t| {STA_TAG}network config: {str(sta_if.ifconfig())}")
+        console_write(f"\t|\t| {STA_TAG}CONNECTED: {str(sta_if.isconnected())}")
 
     # Store STA IP (make it static ip)
     cfgput("devip", str(sta_if.ifconfig()[0]))
@@ -156,13 +159,13 @@ def set_wifi(essid:str, pwd:str, timeout=60):
 
 
 def _set_wifi_dev_static_ip(sta_if:STA_IF):
-    console_write("[NW: STA] Set device static IP.")
+    console_write(f"{STA_TAG}Set device static IP.")
     stored_ip = cfgget('devip')
     if 'n/a' not in stored_ip.lower() and '.' in stored_ip:
         conn_ips = list(sta_if.ifconfig())
         # Check ip type before change, conn_ip structure: 10.0.1.X
         if conn_ips[0] != stored_ip and conn_ips[-1].split('.')[0:3] == stored_ip.split('.')[0:3]:
-            console_write(f"\t| [NW: STA] micrOS dev. StaticIP request: {stored_ip}")
+            console_write(f"\t| {STA_TAG}micrOS dev. StaticIP request: {stored_ip}")
             conn_ips[0] = stored_ip
             try:
                 # IP address, subnet mask, gateway and DNS server
@@ -171,9 +174,9 @@ def _set_wifi_dev_static_ip(sta_if:STA_IF):
             except Exception as e:
                 syslog(f"[ERR][STA] StaticIP conf failed: {e}")
         else:
-            console_write(f"[NW: STA][SKIP] StaticIP conf.: {stored_ip} ? {conn_ips[0]}")
+            console_write(f"{STA_TAG}[SKIP] StaticIP conf.: {stored_ip} ? {conn_ips[0]}")
     else:
-        console_write(f"[NW: STA] IP was not stored: {stored_ip}")
+        console_write(f"{STA_TAG}IP was not stored: {stored_ip}")
     return False   # was not reconfigured
 
 
@@ -183,7 +186,7 @@ def _set_wifi_dev_static_ip(sta_if:STA_IF):
 
 
 def set_access_point(_essid:str, _pwd:str, _authmode:int=3):
-    console_write(f"[NW: AP] SET AP MODE: {_essid} - {_pwd} - auth mode: {_authmode} (if possible)")
+    console_write(f"{AP_TAG}SET AP MODE: {_essid} - {_pwd} - auth mode: {_authmode} (if possible)")
 
     sta_if = WLAN(STA_IF)
     if sta_if.isconnected():
@@ -195,11 +198,11 @@ def set_access_point(_essid:str, _pwd:str, _authmode:int=3):
     # Set WiFi access point name (formally known as ESSID) and WiFi authmode (3): WPA2-PSK
     try:
         # Config #1 (esp)
-        console_write("[NW: AP] Configure")
+        console_write(f"{AP_TAG}Configure")
         ap_if.config(essid=_essid, password=_pwd, authmode=_authmode, max_clients=5)
     except Exception as e1:
         # Correction because rp2-w network interface limitation (parameter mismatch)
-        console_write(f"[NW: AP] Config Error: {e1}")
+        console_write(f"{AP_TAG}Config Error: {e1}")
         try:
             console_write("|- Simplified config...")
             # Config #2 (rp2-w)???
@@ -208,7 +211,7 @@ def set_access_point(_essid:str, _pwd:str, _authmode:int=3):
             syslog(f"[ERR][AP] config failed: {e2}")
     if not (ap_if.active() and str(ap_if.config('essid')) == str(_essid)):
         syslog("[ERR][AP] error")
-    console_write(f"\t|\t| [NW: AP] network config: {str(ap_if.ifconfig())}")
+    console_write(f"\t|\t| {AP_TAG}network config: {str(ap_if.ifconfig())}")
     set_dev_uid()
     return ap_if.active()
 

{microsdevtoolkit-3.0.0 → microsdevtoolkit-3.0.2}/micrOS/source/Server.py

@@ -267,7 +267,7 @@ class ShellCli(Client, Shell):
             try:
                 # Read request msg from client
                 state, request = await self.read()
-                if state or request in ('exit', ''):
+                if state or request.strip() in ('exit', ''):
                     break
                 # Run micrOS shell with request string
                 Client.console("[ShellCli] --- #Run shell")
@@ -333,7 +333,7 @@ class Server:
             self._timeout = 5 if soc_timeout < 5 else soc_timeout
             # ---         ----
             self._initialized = True
-            Client.console("[ socket server ] <<constructor>>")
+            Client.console("[ socket server ] <<init>>")
 
     #####################################
     #       Socket Server Methods       #
@@ -436,7 +436,7 @@ class Server:
                 cli.send(f"~~~ {msg}")
 
     def __del__(self):
-        Client.console("[ socket server ] <<destructor>>")
+        Client.console("[ socket server ] <<del>>")
         if self.server:
             self.server.close()
         if self.web:

{microsdevtoolkit-3.0.0 → microsdevtoolkit-3.0.2}/micrOS/source/Shell.py

@@ -293,7 +293,6 @@ class Shell:
         from Network import ifconfig
 
         await msg_obj(" Start micropython WEBREPL - file transfer and debugging")
-        await msg_obj("  [i] restart machine shortcut: import reset")
         await msg_obj(f"  Connect over http://micropython.org/webrepl/#{ifconfig()[1][0]}:8266/")
         await msg_obj(f"  \t[!] webrepl password: {cfgget('appwd')}")
         if update: