micropython-stubber 1.20.0__py3-none-any.whl → 1.20.1__py3-none-any.whl

mpflash/mpflash/mpboard_id/board_id.py

@@ -18,20 +18,23 @@ HERE = Path(__file__).parent
 def find_board_id(
     descr: str, short_descr: str, board_info: Optional[Path] = None, version: str = "stable"
 ) -> Optional[str]:
-    # TODO: use the json file instead of the csv and get the cpu
-    boards = find_board_by_description(
-        descr=descr,
-        short_descr=short_descr,
-        board_info=board_info,
-        version=clean_version(version),
-    )
-    return boards[-1]["board"]
+    """Find the MicroPython BOARD_ID based on the description in the firmware"""
+    try:
+        boards = find_board_id_by_description(
+            descr=descr,
+            short_descr=short_descr,
+            board_info=board_info,
+            version=clean_version(version),
+        )
+        return boards[-1]["board"]
+    except MPFlashError:
+        return "UNKNOWN_BOARD"
 
 
 @functools.lru_cache(maxsize=20)
-def find_board_by_description(*, descr: str, short_descr: str, version="v1.21.0", board_info: Optional[Path] = None):
+def find_board_id_by_description(*, descr: str, short_descr: str, version="v1.21.0", board_info: Optional[Path] = None):
     """
-    Find the MicroPython BOARD designator based on the description in the firmware
+    Find the MicroPython BOARD_ID based on the description in the firmware
     using the pre-built board_info.json file
     """
     if not board_info:
@@ -52,7 +55,7 @@ def find_board_by_description(*, descr: str, short_descr: str, version="v1.21.0"
     if not matches and short_descr:
         matches = [b for b in version_matches if b["description"] == short_descr]
     if not matches:
-        raise MPFlashError(f"No board info found for description {descr}")
+        raise MPFlashError(f"No board info found for description '{descr}' or '{short_descr}'")
     return sorted(matches, key=lambda x: x["version"])
 
 

mpflash/mpflash/mpremoteboard/runner.py

@@ -21,6 +21,17 @@ class LogTags:
     ignore_tags: LogTagList
 
 
+DEFAULT_RESET_TAGS = [
+    # ESP32 reset causes
+    "rst cause:1, boot mode:",  # 1 -> hardware watch dog reset
+    "rst cause:2, boot mode:",  # 2 -> software watch dog reset (From an exception)
+    "rst cause:3, boot mode:",  # 3 -> software watch dog reset system_restart (Possibly unfed watchdog got angry)
+    "rst cause:4, boot mode:",  # 4 -> soft restart (Possibly with a restart command)
+    "boot.esp32: PRO CPU has been reset by WDT.",
+    "rst:0x10 (RTCWDT_RTC_RESET)",
+]
+
+
 def run(
     cmd: List[str],
     timeout: int = 60,
@@ -57,18 +68,7 @@ def run(
         The return code and the output as a list of strings
     """
     if not reset_tags:
-        reset_tags = [
-            "rst cause:1, boot mode:",
-            "rst cause:2, boot mode:",
-            "rst cause:3, boot mode:",
-            "rst cause:4, boot mode:",
-        ]
-        # 0 -> normal startup by power on
-        # 1 -> hardware watch dog reset
-        # 2 -> software watch dog reset (From an exception)
-        # 3 -> software watch dog reset system_restart (Possibly unfed watchdog got angry)
-        # 4 -> soft restart (Possibly with a restart command)
-        # 5 -> wake up from deep-sleep
+        reset_tags = DEFAULT_RESET_TAGS
     if not error_tags:
         error_tags = ["Traceback ", "Error: ", "Exception: ", "ERROR :", "CRIT  :"]
     if not warning_tags:

mpflash/poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
 
 [[package]]
 name = "ansicon"

mpflash/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mpflash"
-version = "0.7.0"
+version = "0.7.4"
 description = "Flash and download tool for MicroPython firmwares"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"
@@ -25,7 +25,7 @@ loguru = "^0.7.2"
 esptool = "^4.7.0"
 jsonlines = "^4.0.0"
 bincopy = "^20.0.0"
-strip-ansi = "^0.1.1"
+# strip-ansi = "^0.1.1"
 rich-click = "^1.7.3"
 psutil = "^5.9.8"
 blkinfo = "^0.2.0"

stubber/__init__.py

@@ -1,3 +1,3 @@
 """get the version"""
 
-__version__ = "1.20.0"
+__version__ = "1.20.1"

stubber/board/createstubs.py

@@ -24,7 +24,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.20.0"
+__version__ = "v1.20.1"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -596,10 +596,10 @@ def _info():  # type:() -> dict[str, str]
         if (
             info["version"]
             and info["version"].endswith(".0")
-            and info["version"] >= "1.10.0"  # versions from 1.10.0 to 1.20.0 do not have a micro .0
+            and info["version"] >= "1.10.0"  # versions from 1.10.0 to 1.20.1 do not have a micro .0
             and info["version"] <= "1.19.9"
         ):
-            # versions from 1.10.0 to 1.20.0 do not have a micro .0
+            # versions from 1.10.0 to 1.20.1 do not have a micro .0
             info["version"] = info["version"][:-2]
 
     # spell-checker: disable

stubber/board/createstubs_db.py

@@ -18,7 +18,7 @@ Create stubs for (all) modules on a MicroPython board.
     - cross compilation, using mpy-cross, to avoid the compilation step on the micropython device 
 
 
-This variant was generated from createstubs.py by micropython-stubber v1.20.0
+This variant was generated from createstubs.py by micropython-stubber v1.20.1
 """
 
 # Copyright (c) 2019-2024 Jos Verlinde
@@ -43,7 +43,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.20.0"
+__version__ = "v1.20.1"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -609,10 +609,10 @@ def _info():  # type:() -> dict[str, str]
         if (
             info["version"]
             and info["version"].endswith(".0")
-            and info["version"] >= "1.10.0"  # versions from 1.10.0 to 1.20.0 do not have a micro .0
+            and info["version"] >= "1.10.0"  # versions from 1.10.0 to 1.20.1 do not have a micro .0
             and info["version"] <= "1.19.9"
         ):
-            # versions from 1.10.0 to 1.20.0 do not have a micro .0
+            # versions from 1.10.0 to 1.20.1 do not have a micro .0
             info["version"] = info["version"][:-2]
 
     # spell-checker: disable