shepherd-core 2025.5.3__tar.gz → 2025.6.2__tar.gz

{shepherd_core-2025.5.3 → shepherd_core-2025.6.2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: shepherd_core
-Version: 2025.5.3
+Version: 2025.6.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>
-Project-URL: Documentation, https://github.com/orgua/shepherd-datalib/blob/main/README.md
-Project-URL: Issues, https://github.com/orgua/shepherd-datalib/issues
+Project-URL: Documentation, https://github.com/nes-lab/shepherd-tools/blob/main/README.md
+Project-URL: Issues, https://github.com/nes-lab/shepherd-tools/issues
 Project-URL: Source, https://pypi.org/project/shepherd-core/
 Keywords: testbed,beaglebone,pru,batteryless,energyharvesting,solar
 Platform: unix
@@ -56,16 +56,16 @@ Requires-Dist: coverage; extra == "test"
 
 # Core Library
 
-[![PyPiVersion](https://img.shields.io/pypi/v/shepherd_core.svg)](https://pypi.org/project/shepherd_core)
+[![PyPIVersion](https://img.shields.io/pypi/v/shepherd_core.svg)](https://pypi.org/project/shepherd_core)
 [![image](https://img.shields.io/pypi/pyversions/shepherd_core.svg)](https://pypi.python.org/pypi/shepherd-core)
-[![Pytest](https://github.com/orgua/shepherd-datalib/actions/workflows/py_unittest.yml/badge.svg)](https://github.com/orgua/shepherd-datalib/actions/workflows/py_unittest.yml)
+[![QA-Tests](https://github.com/nes-lab/shepherd-tools/actions/workflows/quality_assurance.yaml/badge.svg)](https://github.com/nes-lab/shepherd-tools/actions/workflows/quality_assurance.yaml)
 [![CodeStyle](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
-**Main Documentation**: <https://orgua.github.io/shepherd>
+**Main Documentation**: <https://nes-lab.github.io/shepherd>
 
-**Source Code**: <https://github.com/orgua/shepherd-datalib>
+**Source Code**: <https://github.com/nes-lab/shepherd-tools>
 
-**Main Project**: <https://github.com/orgua/shepherd>
+**Main Project**: <https://github.com/nes-lab/shepherd>
 
 ---
 
@@ -87,7 +87,7 @@ For postprocessing shepherds .h5-files usage of [shepherd_data](https://pypi.org
 - decode waveforms (gpio-state & timestamp) to UART
 - create an inventory (for deployed versions of software, hardware)
 
-See [official documentation](https://orgua.github.io/shepherd) or [example scripts](https://github.com/orgua/shepherd-datalib/tree/main/shepherd_core/examples) for more details and usage. Most functionality is showcased in both. The [extra](https://github.com/orgua/shepherd-datalib/tree/main/shepherd_core/extra)-directory holds data-generators relevant for the testbed. Notably is a [trafficbench](https://github.com/orgua/TrafficBench)-experiment that's used to derive the link-matrix of the testbed-nodes.
+See [official documentation](https://nes-lab.github.io/shepherd) or [example scripts](https://github.com/nes-lab/shepherd-tools/tree/main/shepherd_core/examples) for more details and usage. Most functionality is showcased in both. The [extra](https://github.com/nes-lab/shepherd-tools/tree/main/shepherd_core/extra)-directory holds data-generators relevant for the testbed. Notably is a [trafficbench](https://github.com/nes-lab/TrafficBench)-experiment that's used to derive the link-matrix of the testbed-nodes.
 
 ## Config-Models in Detail
 
@@ -145,9 +145,9 @@ pip install shepherd-data -U
 For bleeding-edge-features or dev-work it is possible to install directly from GitHub-Sources (here `dev`-branch):
 
 ```Shell
-pip install git+https://github.com/orgua/shepherd-datalib.git@dev#subdirectory=shepherd_core -U
+pip install git+https://github.com/nes-lab/shepherd-tools.git@dev#subdirectory=shepherd_core -U
 # and on sheep with newer debian
-sudo pip install git+https://github.com/orgua/shepherd-datalib.git@dev#subdirectory=shepherd_core -U --break-system-packages
+sudo pip install git+https://github.com/nes-lab/shepherd-tools.git@dev#subdirectory=shepherd_core -U --break-system-packages
 ```
 
 If you are working with ``.elf``-files (embedding into experiments) you make "objcopy" accessible to python. In Ubuntu, you can either install ``build-essential`` or ``binutils-$ARCH`` with arch being ``msp430`` or ``arm-none-eabi`` for the nRF52.
@@ -179,7 +179,7 @@ To run the testbench, follow these steps:
 3. run the testbench (~ 320 tests):
 
 ```Shell
-cd shepherd-datalib/shepherd_core
+cd shepherd-tools/shepherd_core
 pip3 install ./[tests]
 pytest
 ```

{shepherd_core-2025.5.3 → shepherd_core-2025.6.2}/README.md

@@ -1,15 +1,15 @@
 # Core Library
 
-[![PyPiVersion](https://img.shields.io/pypi/v/shepherd_core.svg)](https://pypi.org/project/shepherd_core)
+[![PyPIVersion](https://img.shields.io/pypi/v/shepherd_core.svg)](https://pypi.org/project/shepherd_core)
 [![image](https://img.shields.io/pypi/pyversions/shepherd_core.svg)](https://pypi.python.org/pypi/shepherd-core)
-[![Pytest](https://github.com/orgua/shepherd-datalib/actions/workflows/py_unittest.yml/badge.svg)](https://github.com/orgua/shepherd-datalib/actions/workflows/py_unittest.yml)
+[![QA-Tests](https://github.com/nes-lab/shepherd-tools/actions/workflows/quality_assurance.yaml/badge.svg)](https://github.com/nes-lab/shepherd-tools/actions/workflows/quality_assurance.yaml)
 [![CodeStyle](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
-**Main Documentation**: <https://orgua.github.io/shepherd>
+**Main Documentation**: <https://nes-lab.github.io/shepherd>
 
-**Source Code**: <https://github.com/orgua/shepherd-datalib>
+**Source Code**: <https://github.com/nes-lab/shepherd-tools>
 
-**Main Project**: <https://github.com/orgua/shepherd>
+**Main Project**: <https://github.com/nes-lab/shepherd>
 
 ---
 
@@ -31,7 +31,7 @@ For postprocessing shepherds .h5-files usage of [shepherd_data](https://pypi.org
 - decode waveforms (gpio-state & timestamp) to UART
 - create an inventory (for deployed versions of software, hardware)
 
-See [official documentation](https://orgua.github.io/shepherd) or [example scripts](https://github.com/orgua/shepherd-datalib/tree/main/shepherd_core/examples) for more details and usage. Most functionality is showcased in both. The [extra](https://github.com/orgua/shepherd-datalib/tree/main/shepherd_core/extra)-directory holds data-generators relevant for the testbed. Notably is a [trafficbench](https://github.com/orgua/TrafficBench)-experiment that's used to derive the link-matrix of the testbed-nodes.
+See [official documentation](https://nes-lab.github.io/shepherd) or [example scripts](https://github.com/nes-lab/shepherd-tools/tree/main/shepherd_core/examples) for more details and usage. Most functionality is showcased in both. The [extra](https://github.com/nes-lab/shepherd-tools/tree/main/shepherd_core/extra)-directory holds data-generators relevant for the testbed. Notably is a [trafficbench](https://github.com/nes-lab/TrafficBench)-experiment that's used to derive the link-matrix of the testbed-nodes.
 
 ## Config-Models in Detail
 
@@ -89,9 +89,9 @@ pip install shepherd-data -U
 For bleeding-edge-features or dev-work it is possible to install directly from GitHub-Sources (here `dev`-branch):
 
 ```Shell
-pip install git+https://github.com/orgua/shepherd-datalib.git@dev#subdirectory=shepherd_core -U
+pip install git+https://github.com/nes-lab/shepherd-tools.git@dev#subdirectory=shepherd_core -U
 # and on sheep with newer debian
-sudo pip install git+https://github.com/orgua/shepherd-datalib.git@dev#subdirectory=shepherd_core -U --break-system-packages
+sudo pip install git+https://github.com/nes-lab/shepherd-tools.git@dev#subdirectory=shepherd_core -U --break-system-packages
 ```
 
 If you are working with ``.elf``-files (embedding into experiments) you make "objcopy" accessible to python. In Ubuntu, you can either install ``build-essential`` or ``binutils-$ARCH`` with arch being ``msp430`` or ``arm-none-eabi`` for the nRF52.
@@ -123,7 +123,7 @@ To run the testbench, follow these steps:
 3. run the testbench (~ 320 tests):
 
 ```Shell
-cd shepherd-datalib/shepherd_core
+cd shepherd-tools/shepherd_core
 pip3 install ./[tests]
 pytest
 ```

{shepherd_core-2025.5.3 → shepherd_core-2025.6.2}/examples/eenv_generator.py

@@ -8,7 +8,7 @@ from tqdm import trange
 
 from shepherd_core import Reader as ShpReader
 from shepherd_core import Writer as ShpWriter
-from shepherd_core import logger
+from shepherd_core.logger import log
 
 # Config
 voltages_V = [4.0, 2.0]
@@ -26,7 +26,7 @@ for _v, _c in product(voltages_V, currents_A):
     file_path = path_here / f"{name}.h5"
 
     if file_path.exists():
-        logger.info("File exists, will skip: %s", file_path.name)
+        log.info("File exists, will skip: %s", file_path.name)
     else:
         with ShpWriter(file_path) as file:
             file.store_hostname("artificial")

{shepherd_core-2025.5.3 → shepherd_core-2025.6.2}/examples/uart_decode_waveform.py

@@ -3,8 +3,8 @@
 from pathlib import Path
 from timeit import timeit
 
-from shepherd_core import logger
 from shepherd_core.decoder_waveform import Uart
+from shepherd_core.logger import log
 
 # file captured with logic analyzer, 15.5k events (2700 symbols, 61 lines)
 trace = Path(__file__).parent / "uart_raw2.csv"
@@ -13,7 +13,7 @@ uwd = Uart(trace)
 sym = uwd.get_symbols()
 lne = uwd.get_lines()
 txt = uwd.get_text()
-logger.info(txt)
+log.info(txt)
 
 do_analysis = False
 if do_analysis:

{shepherd_core-2025.5.3 → shepherd_core-2025.6.2}/pyproject.toml

@@ -71,8 +71,8 @@ file = "README.md"
 content-type = "text/markdown"
 
 [project.urls]
-Documentation = "https://github.com/orgua/shepherd-datalib/blob/main/README.md"
-Issues = "https://github.com/orgua/shepherd-datalib/issues"
+Documentation = "https://github.com/nes-lab/shepherd-tools/blob/main/README.md"
+Issues = "https://github.com/nes-lab/shepherd-tools/issues"
 Source = "https://pypi.org/project/shepherd-core/"
 
 [build-system]

{shepherd_core-2025.5.3 → shepherd_core-2025.6.2}/shepherd_core/__init__.py

@@ -17,7 +17,7 @@ from .data_models.task.emulation import Compression
 from .inventory import Inventory
 from .logger import get_verbose_level
 from .logger import increase_verbose_level
-from .logger import logger
+from .logger import log
 from .reader import Reader
 from .testbed_client.client_web import WebClient
 from .version import version
@@ -41,5 +41,5 @@ __all__ = [
     "increase_verbose_level",
     "local_now",
     "local_tz",
-    "logger",
+    "log",
 ]

shepherd_core-2025.6.2/shepherd_core/commons.py

@@ -0,0 +1,6 @@
+"""Container for commonly shared constants."""
+
+from .config import config
+
+# TODO: deprecated - replace with config in subprojects and then remove here
+SAMPLERATE_SPS_DEFAULT: int = config.SAMPLERATE_SPS

shepherd_core-2025.6.2/shepherd_core/config.py

@@ -0,0 +1,34 @@
+"""Container for a common configuration.
+
+This can be adapted by the user by importing 'config' and changing its variables.
+"""
+
+from pydantic import BaseModel
+from pydantic import HttpUrl
+
+
+class ConfigDefault(BaseModel):
+    """Container for a common configuration."""
+
+    __slots__ = ()
+
+    TESTBED: str = "shepherd_tud_nes"
+    """name of the testbed to validate against - if enabled - see switch below"""
+    VALIDATE_INFRA: bool = True
+    """switch to turn on / off deep validation of data models also considering the current
+    layout & infrastructure of the testbed.
+    """
+
+    SAMPLERATE_SPS: int = 100_000
+    """Rate of IV-Recording of the testbed."""
+
+    UID_NAME: str = "SHEPHERD_NODE_ID"
+    """Variable name to patch in ELF-file"""
+    UID_SIZE: int = 2
+    """Variable size in Byte"""
+
+    TESTBED_SERVER: HttpUrl = "https://shepherd.cfaed.tu-dresden.de:8000/"
+    """Server that holds up to date testbed fixtures"""
+
+
+config = ConfigDefault()

{shepherd_core-2025.5.3 → shepherd_core-2025.6.2}/shepherd_core/data_models/__init__.py

@@ -3,7 +3,7 @@
 Public models are directly referenced here and are usable like:
 
 '''python
-from shepherd-core import data_models
+from shepherd_core import data_models
 
 cdata = data_models.CapeData(serial_number="A123")
 '''

{shepherd_core-2025.5.3 → shepherd_core-2025.6.2}/shepherd_core/data_models/base/calibration.py

@@ -95,14 +95,19 @@ cal_hrv_legacy = {  # legacy translator
     "adc_voltage": "adc_V_Sense",  # datalog voltage
 }
 
+# defaults (pre-init complex types)
+cal_pair_dac_V = CalibrationPair.from_fn(dac_voltage_to_raw, unit="V")
+cal_pair_adc_V = CalibrationPair.from_fn(adc_voltage_to_raw, unit="V")
+cal_pair_adc_C = CalibrationPair.from_fn(adc_current_to_raw, unit="A")
+
 
 class CalibrationHarvester(ShpModel):
     """Container for all calibration-pairs for that device."""
 
-    dac_V_Hrv: CalibrationPair = CalibrationPair.from_fn(dac_voltage_to_raw, unit="V")
-    dac_V_Sim: CalibrationPair = CalibrationPair.from_fn(dac_voltage_to_raw, unit="V")
-    adc_V_Sense: CalibrationPair = CalibrationPair.from_fn(adc_voltage_to_raw, unit="V")
-    adc_C_Hrv: CalibrationPair = CalibrationPair.from_fn(adc_current_to_raw, unit="A")
+    dac_V_Hrv: CalibrationPair = cal_pair_dac_V
+    dac_V_Sim: CalibrationPair = cal_pair_dac_V
+    adc_V_Sense: CalibrationPair = cal_pair_adc_V
+    adc_C_Hrv: CalibrationPair = cal_pair_adc_C
 
     def export_for_sysfs(self) -> dict:
         """Convert and write the essential data.
@@ -143,10 +148,10 @@ class CalibrationEmulator(ShpModel):
     Differentiates between both target-ports A/B.
     """
 
-    dac_V_A: CalibrationPair = CalibrationPair.from_fn(dac_voltage_to_raw, unit="V")
-    dac_V_B: CalibrationPair = CalibrationPair.from_fn(dac_voltage_to_raw, unit="V")
-    adc_C_A: CalibrationPair = CalibrationPair.from_fn(adc_current_to_raw, unit="A")
-    adc_C_B: CalibrationPair = CalibrationPair.from_fn(adc_current_to_raw, unit="A")
+    dac_V_A: CalibrationPair = cal_pair_dac_V
+    dac_V_B: CalibrationPair = cal_pair_dac_V
+    adc_C_A: CalibrationPair = cal_pair_adc_C
+    adc_C_B: CalibrationPair = cal_pair_adc_C
 
     def export_for_sysfs(self) -> dict:
         """Convert and write the essential data.

{shepherd_core-2025.5.3 → shepherd_core-2025.6.2}/shepherd_core/data_models/base/shepherd.py

@@ -2,6 +2,7 @@
 
 import hashlib
 import pathlib
+import pickle
 from collections.abc import Generator
 from datetime import timedelta
 from ipaddress import IPv4Address
@@ -126,10 +127,12 @@ class ShpModel(BaseModel):
         comment: Optional[str] = None,
         *,
         minimal: bool = True,
+        use_pickle: bool = False,
     ) -> Path:
         """Store data to yaml in a wrapper.
 
         minimal: stores minimal set (filters out unset & default parameters)
+        pickle: uses pickle to serialize data, on BBB >100x faster for large files
         comment: documentation.
         """
         model_dict = self.model_dump(exclude_unset=minimal)
@@ -139,25 +142,39 @@ class ShpModel(BaseModel):
             created=local_now(),
             parameters=model_dict,
         )
-        model_yaml = yaml.safe_dump(
-            model_wrap.model_dump(exclude_unset=minimal, exclude_defaults=minimal),
-            default_flow_style=False,
-            sort_keys=False,
-        )
+        if use_pickle:
+            model_serial = pickle.dumps(model_dict, fix_imports=True)
+            model_path = Path(path).resolve().with_suffix(".pickle")
+        else:
+            # TODO: x64 windows supports CSafeLoader/dumper,
+            #       there are examples that replace load if avail
+            model_serial = yaml.safe_dump(
+                model_wrap.model_dump(exclude_unset=minimal, exclude_defaults=minimal),
+                default_flow_style=False,
+                sort_keys=False,
+            )
+            model_path = Path(path).resolve().with_suffix(".yaml")
         # TODO: handle directory
-        model_path = Path(path).resolve().with_suffix(".yaml")
+
         if not model_path.parent.exists():
             model_path.parent.mkdir(parents=True)
         with model_path.open("w") as f:
-            f.write(model_yaml)
+            f.write(model_serial)
         return model_path
 
     @classmethod
     def from_file(cls, path: Union[str, Path]) -> Self:
-        """Load from yaml."""
-        with Path(path).open() as shp_file:
-            shp_dict = yaml.safe_load(shp_file)
-        shp_wrap = Wrapper(**shp_dict)
+        """Load from YAML or pickle file."""
+        path: Path = Path(path)
+        if not Path(path).exists():
+            raise FileNotFoundError
+        if path.suffix.lower() == ".pickle":
+            with Path(path).open("rb") as shp_file:
+                shp_wrap = pickle.load(shp_file, fix_imports=True)  # noqa: S301
+        else:
+            with Path(path).open() as shp_file:
+                shp_dict = yaml.safe_load(shp_file)
+            shp_wrap = Wrapper(**shp_dict)
         if shp_wrap.datatype != cls.__name__:
             raise ValueError("Model in file does not match the requirement")
         return cls(**shp_wrap.parameters)

{shepherd_core-2025.5.3 → shepherd_core-2025.6.2}/shepherd_core/data_models/base/wrapper.py

@@ -17,11 +17,11 @@ class Wrapper(BaseModel):
     """Generalized web- & file-interface for all models with dynamic typecasting."""
 
     datatype: str
-    # ⤷ model-name
+    """ ⤷ model-name"""
     comment: Optional[SafeStrClone] = None
     created: Optional[datetime] = None
-    # ⤷ Optional metadata
+    """ ⤷ Optional metadata"""
     lib_ver: Optional[str] = version
-    # ⤷ for debug-purposes and later comp-checks
+    """ ⤷ for debug-purposes and later compatibility-checks"""
     parameters: dict
-    # ⤷ ShpModel
+    """ ⤷ ShpModel"""

{shepherd_core-2025.5.3 → shepherd_core-2025.6.2}/shepherd_core/data_models/content/energy_environment.py

@@ -28,7 +28,7 @@ class EnergyEnvironment(ContentModel):
     data_path: Path
     data_type: EnergyDType
     data_local: bool = True
-    # ⤷ signals that file has to be copied to testbed
+    """ ⤷ signals that file has to be copied to testbed"""
 
     duration: PositiveFloat
     energy_Ws: PositiveFloat

{shepherd_core-2025.5.3 → shepherd_core-2025.6.2}/shepherd_core/data_models/content/firmware.py

@@ -19,7 +19,7 @@ from typing_extensions import Unpack
 from shepherd_core import fw_tools
 from shepherd_core.data_models.base.content import ContentModel
 from shepherd_core.data_models.testbed.mcu import MCU
-from shepherd_core.logger import logger
+from shepherd_core.logger import log
 from shepherd_core.testbed_client import tb_client
 
 from .firmware_datatype import FirmwareDType
@@ -62,7 +62,7 @@ class Firmware(ContentModel, title="Firmware of Target"):
     data_type: FirmwareDType
     data_hash: Optional[str] = None
     data_local: bool = True
-    # ⤷ signals that file has to be copied to testbed
+    """ ⤷ signals that file has to be copied to testbed"""
 
     @model_validator(mode="before")
     @classmethod
@@ -125,13 +125,18 @@ class Firmware(ContentModel, title="Firmware of Target"):
             if "mcu" not in kwargs:
                 kwargs["mcu"] = arch_to_mcu[arch]
 
+        # verification of ELF - warn if something is off
+        # -> adds ARCH if it is able to derive
         if kwargs["data_type"] == FirmwareDType.base64_elf:
             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 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)
+            try:
+                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 or "arm" in arch) and not fw_tools.is_elf_nrf52(file):
+                    raise ValueError("File is not a ELF for nRF52")
+            except RuntimeError:
+                log.warning("ObjCopy not found -> Arch of Firmware can't be verified")
+            log.debug("ELF-File '%s' has arch: %s", file.name, arch)
             if "mcu" not in kwargs:
                 kwargs["mcu"] = arch_to_mcu[arch]
 
@@ -154,7 +159,7 @@ class Firmware(ContentModel, title="Firmware of Target"):
             match = self.data_hash == hash_new
 
         if not match:
-            logger.warning("FW-Hash does not match with stored value!")
+            log.warning("FW-Hash does not match with stored value!")
             # TODO: it might be more appropriate to raise here
         return match
 

{shepherd_core-2025.5.3 → shepherd_core-2025.6.2}/shepherd_core/data_models/content/virtual_harvester.py

@@ -10,11 +10,11 @@ from pydantic import Field
 from pydantic import model_validator
 from typing_extensions import Self
 
-from shepherd_core.commons import SAMPLERATE_SPS_DEFAULT
+from shepherd_core.config import config
 from shepherd_core.data_models.base.calibration import CalibrationHarvester
 from shepherd_core.data_models.base.content import ContentModel
 from shepherd_core.data_models.base.shepherd import ShpModel
-from shepherd_core.logger import logger
+from shepherd_core.logger import log
 from shepherd_core.testbed_client import tb_client
 
 from .energy_environment import EnergyDType
@@ -310,7 +310,7 @@ class VirtualHarvesterConfig(ContentModel, title="Config for the Harvester"):
         if values["name"] == "neutral":
             # TODO: same test is later done in calc_algorithm_num() again
             raise ValueError("Resulting Harvester can't be neutral")
-        logger.debug("VHrv-Inheritances: %s", chain)
+        log.debug("VHrv-Inheritances: %s", chain)
 
         # post corrections -> should be in separate validator
         cal = CalibrationHarvester()  # TODO: as argument?
@@ -363,16 +363,16 @@ class VirtualHarvesterConfig(ContentModel, title="Config for the Harvester"):
     def calc_timings_ms(self, *, for_emu: bool) -> tuple[float, float]:
         """factor-in model-internal timing-constraints."""
         window_length = self.samples_n * (1 + self.wait_cycles)
-        time_min_ms = (1 + self.wait_cycles) * 1_000 / SAMPLERATE_SPS_DEFAULT
+        time_min_ms = (1 + self.wait_cycles) * 1_000 / config.SAMPLERATE_SPS
         if for_emu:
-            window_ms = window_length * 1_000 / SAMPLERATE_SPS_DEFAULT
+            window_ms = window_length * 1_000 / config.SAMPLERATE_SPS
             time_min_ms = max(time_min_ms, window_ms)
 
         interval_ms = min(max(self.interval_ms, time_min_ms), 1_000_000)
         duration_ms = min(max(self.duration_ms, time_min_ms), interval_ms)
         _ratio = (duration_ms / interval_ms) / (self.duration_ms / self.interval_ms)
         if (_ratio - 1) > 0.1:
-            logger.debug(
+            log.debug(
                 "Ratio between interval & duration has changed "
                 "more than 10%% due to constraints (%.4f)",
                 _ratio,
@@ -453,16 +453,16 @@ class HarvesterPRUConfig(ShpModel):
     voltage_min_uV: u32
     voltage_max_uV: u32
     voltage_step_uV: u32
-    # ⤷ for window-based algo like ivcurve
+    """ ⤷ for window-based algo like ivcurve"""
     current_limit_nA: u32
-    # ⤷ lower bound to detect zero current
+    """ ⤷ lower bound to detect zero current"""
     setpoint_n8: u32
     interval_n: u32
-    # ⤷ between measurements
+    """ ⤷ between measurements"""
     duration_n: u32
-    # ⤷ of measurement
+    """ ⤷ of measurement"""
     wait_cycles_n: u32
-    # ⤷ for DAC to settle
+    """ ⤷ for DAC to settle"""
 
     @classmethod
     def from_vhrv(
@@ -517,7 +517,7 @@ class HarvesterPRUConfig(ShpModel):
             voltage_step_uV=round(voltage_step_mV * 10**3),
             current_limit_nA=round(data.current_limit_uA * 10**3),
             setpoint_n8=round(min(255, data.setpoint_n * 2**8)),
-            interval_n=round(interval_ms * SAMPLERATE_SPS_DEFAULT * 1e-3),
-            duration_n=round(duration_ms * SAMPLERATE_SPS_DEFAULT * 1e-3),
+            interval_n=round(interval_ms * config.SAMPLERATE_SPS * 1e-3),
+            duration_n=round(duration_ms * config.SAMPLERATE_SPS * 1e-3),
             wait_cycles_n=data.wait_cycles,
         )