mpflash 1.24.6__py3-none-any.whl → 1.24.8__py3-none-any.whl

mpflash/mpboard_id/add_boards.py

@@ -16,7 +16,7 @@ import mpflash.basicgit as git
 from mpflash.logger import log
 from mpflash.mpboard_id import Board
 from mpflash.mpboard_id.store import write_boardinfo_json
-from mpflash.versions import micropython_versions
+from mpflash.versions import get_preview_mp_version, micropython_versions
 
 # look for all mpconfigboard.h files and extract the board name
 # from the #define MICROPY_HW_BOARD_NAME "PYBD_SF6"
@@ -24,9 +24,7 @@ from mpflash.versions import micropython_versions
 RE_H_MICROPY_HW_BOARD_NAME = re.compile(r"#define\s+MICROPY_HW_BOARD_NAME\s+\"(.+)\"")
 RE_H_MICROPY_HW_MCU_NAME = re.compile(r"#define\s+MICROPY_HW_MCU_NAME\s+\"(.+)\"")
 # find boards and variants in the mpconfigboard*.cmake files
-RE_CMAKE_MICROPY_HW_BOARD_NAME = re.compile(
-    r"MICROPY_HW_BOARD_NAME\s?=\s?\"(?P<variant>[\w\s\S]*)\""
-)
+RE_CMAKE_MICROPY_HW_BOARD_NAME = re.compile(r"MICROPY_HW_BOARD_NAME\s?=\s?\"(?P<variant>[\w\s\S]*)\"")
 RE_CMAKE_MICROPY_HW_MCU_NAME = re.compile(r"MICROPY_HW_MCU_NAME\s?=\s?\"(?P<variant>[\w\s\S]*)\"")
 # TODO: normal make files
 
@@ -47,6 +45,8 @@ def boards_from_repo(mpy_path: Path, version: str, family: Optional[str] = None)
     version = version or git.get_local_tag()  # type: ignore
     if not version:
         raise ValueError("No version provided and no local tag found.")
+    elif version in ["main", "master"]:
+        version = get_preview_mp_version()
 
     board_list: List[Board] = []
     # look in mpconfigboard.h files
@@ -118,9 +118,7 @@ def boards_from_headers(mpy_path: Path, version: str, family: str):
                     mcu_name = match[1]
                     found += 1
                 if found == 2:
-                    description = (
-                        f"{board_name} with {mcu_name}" if mcu_name != "-" else board_name
-                    )
+                    description = f"{board_name} with {mcu_name}" if mcu_name != "-" else board_name
                     board_list.append(
                         Board(
                             board_id=board,
@@ -231,7 +229,7 @@ def ask_mpy_path():
         inquirer.Text(
             "mpy_path",
             message="Enter the path to the MicroPython repository",
-            default=".\\repos\\micropython",
+            default="./repos/micropython",
         )
     ]
     if answers := inquirer.prompt(questions):

mpflash/mpboard_id/board_id.py

@@ -9,7 +9,7 @@ from typing import Optional
 from mpflash.errors import MPFlashError
 from mpflash.logger import log
 from mpflash.mpboard_id.store import read_known_boardinfo
-from mpflash.versions import clean_version, get_stable_mp_version
+from mpflash.versions import clean_version, get_preview_mp_version, get_stable_mp_version
 
 
 def find_board_id_by_description(
@@ -64,13 +64,15 @@ def _find_board_id_by_description(
         short_descr = descr.split(" with ")[0]
     if version:
         # filter for matching version
-        if version in ("preview", "stable"):
-            # match last stable
+        if version in ("stable"):
             version = get_stable_mp_version()
+        if version in ("preview", "master"):
+            version = get_preview_mp_version()
         known_versions = sorted({b.version for b in candidate_boards})
         if version not in known_versions:
-            log.trace(f"Version {version} not found in board info, using latest known version {known_versions[-1]}")
-            version = '.'.join(known_versions[-1].split('.')[:2]) # take only major.minor
+            log.trace(known_versions)
+            log.debug(f"Version {version} not found in board info, using latest stable version {get_stable_mp_version()}")
+            version = ".".join(get_stable_mp_version().split(".")[:2])  # take only major.minor
         if version_matches := [b for b in candidate_boards if b.version.startswith(version)]:
             candidate_boards = version_matches
         else:
@@ -87,4 +89,3 @@ def _find_board_id_by_description(
     if not matches:
         raise MPFlashError(f"No board info found for description '{descr}' or '{short_descr}'")
     return sorted(matches, key=lambda x: x.version)
-