shepherd-core 2025.2.1__tar.gz → 2025.2.2__tar.gz

{shepherd_core-2025.2.1 → shepherd_core-2025.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: shepherd_core
-Version: 2025.2.1
+Version: 2025.2.2
 Summary: Programming- and CLI-Interface for the h5-dataformat of the Shepherd-Testbed
 Author-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>
 Maintainer-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>

{shepherd_core-2025.2.1 → shepherd_core-2025.2.2}/shepherd_core/data_models/content/firmware.py

@@ -127,8 +127,9 @@ class Firmware(ContentModel, title="Firmware of Target"):
             arch = fw_tools.read_arch(file)
             if "msp430" in arch and not fw_tools.is_elf_msp430(file):
                 raise ValueError("File is not a ELF for msp430")
-            if "nrf52" in arch and not fw_tools.is_elf_nrf52(file):
+            if ("nrf52" in arch or "arm" in arch) and not fw_tools.is_elf_nrf52(file):
                 raise ValueError("File is not a ELF for nRF52")
+            logger.debug("ELF-File '%s' has arch: %s", file.name, arch)
             if "mcu" not in kwargs:
                 kwargs["mcu"] = arch_to_mcu[arch]
 

{shepherd_core-2025.2.1 → shepherd_core-2025.2.2}/shepherd_core/data_models/task/programming.py

@@ -31,7 +31,7 @@ class ProgrammingTask(ShpModel):
     mcu_type: SafeStr
     # ⤷ must be either "nrf52" or "msp430" ATM, TODO: clean xp to tasks
     voltage: Annotated[float, Field(ge=1, lt=5)] = 3
-    datarate: Annotated[int, Field(gt=0, le=1_000_000)] = 500_000
+    datarate: Annotated[int, Field(gt=0, le=1_000_000)] = 200_000
     protocol: ProgrammerProtocol
 
     simulate: bool = False

{shepherd_core-2025.2.1 → shepherd_core-2025.2.2}/shepherd_core/fw_tools/validation.py

@@ -66,16 +66,14 @@ def is_hex_nrf52(file: Path) -> bool:
     """Try to detect specifics for that MCU.
 
     Observations:
-    - addresses begin at 0x0
+    - addresses begin mostly at 0x0 (no must)
     - only one segment (.get_segments), todo
     """
     if is_hex(file):
         ih = IntelHex(file.as_posix())
-        if ih.minaddr() != 0x0000:
-            return False
-
-        # conservative test for now - should be well below 1 MB + 256 kB
-        return ih.get_memory_size() < 1310720
+        # conservative test for now - should be between 0 and 1 MB + 256 kB,
+        # but lately showed much higher values > 4 MB
+        return ih.get_memory_size() > 0
     return False
 
 
@@ -145,15 +143,15 @@ def determine_arch(file: Path) -> str:
     """Figure out arch (msp430 or nrf52)."""
     file_t = determine_type(file)
     if file_t == FirmwareDType.path_elf:
-        if is_elf_nrf52(file):
-            return "nrf52"
         if is_elf_msp430(file):
             return "msp430"
+        if is_elf_nrf52(file):
+            return "nrf52"
         raise ValueError("Arch of ELF '%s' could not be determined", file.name)
     if file_t == FirmwareDType.path_hex:
-        if is_hex_nrf52(file):
-            return "nrf52"
         if is_hex_msp430(file):
             return "msp430"
+        if is_hex_nrf52(file):
+            return "nrf52"
         raise ValueError("Arch of HEX '%s' could not be determined", file.name)
     raise ValueError("Arch of file '%s' could not be determined", file.name)

{shepherd_core-2025.2.1 → shepherd_core-2025.2.2}/shepherd_core/version.py

@@ -1,3 +1,3 @@
 """Separated string avoids circular imports."""
 
-version: str = "2025.02.1"
+version: str = "2025.02.2"

{shepherd_core-2025.2.1 → shepherd_core-2025.2.2}/shepherd_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: shepherd_core
-Version: 2025.2.1
+Version: 2025.2.2
 Summary: Programming- and CLI-Interface for the h5-dataformat of the Shepherd-Testbed
 Author-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>
 Maintainer-email: Ingmar Splitt <ingmar.splitt@tu-dresden.de>