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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: shepherd_core
-Version: 2024.11.3
+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-2024.11.3 → 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-2024.11.3 → shepherd_core-2025.2.2}/shepherd_core/data_models/task/__init__.py

@@ -59,8 +59,7 @@ def prepare_task(config: Union[ShpModel, Path, str], observer: Optional[str] = N
     if shp_wrap.datatype == TestbedTasks.__name__:
         if observer is None:
             logger.debug(
-                "Task-Set contained TestbedTasks & no observer was provided "
-                "-> will return TB-Tasks"
+                "Task-Set contained TestbedTasks & no observer was provided -> will return TB-Tasks"
             )
             return shp_wrap
         tbt = TestbedTasks(**shp_wrap.parameters)

{shepherd_core-2024.11.3 → 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-2024.11.3 → 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-2024.11.3 → shepherd_core-2025.2.2}/shepherd_core/inventory/system.py

@@ -93,7 +93,7 @@ class SystemInventory(ShpModel):
             reply = subprocess.run(  # noqa: S603
                 ptp_cmd, timeout=30, capture_output=True, check=False
             )
-            ptp_out = f"{ reply.stdout }, { reply.stderr }"
+            ptp_out = f"{reply.stdout}, {reply.stderr}"
             # alternative: check_output - seems to be lighter
 
         model_dict = {

{shepherd_core-2024.11.3 → shepherd_core-2025.2.2}/shepherd_core/reader.py

@@ -172,7 +172,10 @@ class Reader:
         """Update internal states, helpful after resampling or other changes in data-group."""
         self.h5file.flush()
         sample_count = self.ds_time.shape[0]
-        duration_raw = self.ds_time[sample_count - 1] - self.ds_time[0] if sample_count > 0 else 0
+        duration_raw = (
+            (int(self.ds_time[sample_count - 1]) - int(self.ds_time[0])) if sample_count > 0 else 0
+        )
+        # above's typecasting prevents overflow in u64-format
         if (sample_count > 0) and (duration_raw > 0):
             # this assumes iso-chronous sampling
             duration_s = self._cal.time.raw_to_si(duration_raw)
@@ -285,6 +288,9 @@ class Reader:
             dsv = self.ds_voltage[0:2000]
             diffs_np = np.unique(dsv[1:] - dsv[0:-1], return_counts=False)
             diffs_ls = [_e for _e in list(np.array(diffs_np)) if _e > 0]
+            # static voltages have 0 steps, so
+            if len(diffs_ls) == 0:
+                return None  # or is 0 better? that may provoke div0
             voltage_step = min(diffs_ls)
         if voltage_step is not None:
             voltage_step = 1e-3 * voltage_step

{shepherd_core-2024.11.3 → shepherd_core-2025.2.2}/shepherd_core/testbed_client/client_web.py

@@ -36,7 +36,7 @@ class WebClient(AbcClient):
         super().__init__()
         if not hasattr(self, "_token"):
             # add default values
-            self._token: str = "basic_public_access"
+            self._token: str = "basic_public_access"  # noqa: S105
             self._server: str = testbed_server_default
             self._user: Optional[User] = None
             self._key: Optional[str] = None

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

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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: shepherd_core
-Version: 2024.11.3
+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>