shepherd-core 2025.5.3__py3-none-any.whl → 2025.6.1__py3-none-any.whl

shepherd_core/data_models/task/emulation.py

@@ -25,6 +25,7 @@ from shepherd_core.data_models.experiment.observer_features import GpioTracing
 from shepherd_core.data_models.experiment.observer_features import PowerTracing
 from shepherd_core.data_models.experiment.observer_features import SystemLogging
 from shepherd_core.data_models.experiment.observer_features import UartLogging
+from shepherd_core.data_models.experiment.target_config import vsrc_neutral
 from shepherd_core.data_models.testbed import Testbed
 from shepherd_core.data_models.testbed.cape import TargetPort
 from shepherd_core.logger import logger
@@ -49,46 +50,55 @@ class EmulationTask(ShpModel):
 
     # General config
     input_path: Path
-    # ⤷ hdf5 file containing harvesting data
+    """ ⤷ hdf5 file containing harvesting data"""
     output_path: Optional[Path] = None
-    # ⤷ dir- or file-path for storing the recorded data:
-    #   - providing a directory -> file is named emu_timestamp.h5
-    #   - for a complete path the filename is not changed except it exists and
-    #     overwrite is disabled -> emu#num.h5
-    # TODO: should the output-path be mandatory?
+    """ ⤷ dir- or file-path for storing the recorded data:
+
+    - providing a directory -> file is named emu_timestamp.h5
+    - for a complete path the filename is not changed except it exists and
+      overwrite is disabled -> emu#num.h5
+    TODO: should the output-path be mandatory?
+    """
     force_overwrite: bool = False
-    # ⤷ Overwrite existing file
+    """ ⤷ Overwrite existing file"""
     output_compression: Optional[Compression] = Compression.default
-    # ⤷ should be lzf, 1 (gzip level 1) or None (order of recommendation)
+    """ ⤷ should be lzf, 1 (gzip level 1) or None (order of recommendation)"""
     time_start: Optional[datetime] = None
-    # timestamp or unix epoch time, None = ASAP
+    """ timestamp or unix epoch time, None = ASAP"""
     duration: Optional[timedelta] = None
-    # ⤷ Duration of recording in seconds, None = till EOF
+    """ ⤷ Duration of recording in seconds, None = till EOF"""
     abort_on_error: Annotated[bool, deprecated("has no effect")] = False
 
     # emulation-specific
     use_cal_default: bool = False
-    # ⤷ Use default calibration values, skip loading from EEPROM
+    """ ⤷ Use default calibration values, skip loading from EEPROM"""
 
     enable_io: bool = True
     # TODO: add direction of pins! also it seems error-prone when only setting _tracing
-    # ⤷ Switch the GPIO level converter to targets on/off
-    #   pre-req for sampling gpio / uart,
+    """ ⤷ Switch the GPIO level converter to targets on/off
+
+    pre-req for sampling gpio / uart,
+    """
     io_port: TargetPort = TargetPort.A
-    # ⤷ Either Port A or B that gets connected to IO
+    """ ⤷ Either Port A or B that gets connected to IO"""
     pwr_port: TargetPort = TargetPort.A
-    # ⤷ chosen port will be current-monitored (main, connected to virtual Source),
-    #   the other port is aux
-    voltage_aux: Union[Annotated[float, Field(ge=0, le=4.5)], str] = 0
-    # ⤷ aux_voltage options:
-    #   - 0-4.5 for specific const Voltage (0 V = disabled),
-    #   - "buffer" will output intermediate voltage (storage cap of vsource),
-    #   - "main" will mirror main target voltage
+    """ ⤷ selected port will be current-monitored
 
+    - main channel is nnected to virtual Source
+    - the other port is aux
+    """
+    voltage_aux: Union[Annotated[float, Field(ge=0, le=4.5)], str] = 0
+    """ ⤷ aux_voltage options
+    - 0-4.5 for specific const Voltage (0 V = disabled),
+    - "buffer" will output intermediate voltage (storage cap of vsource),
+    - "main" will mirror main target voltage
+    """
     # sub-elements, could be partly moved to emulation
-    virtual_source: VirtualSourceConfig = VirtualSourceConfig(name="neutral")
-    # ⤷ Use the desired setting for the virtual source,
-    #   provide parameters or name like BQ25570
+    virtual_source: VirtualSourceConfig = vsrc_neutral
+    """ ⤷ Use the desired setting for the virtual source,
+
+    provide parameters or name like BQ25570
+    """
 
     power_tracing: Optional[PowerTracing] = PowerTracing()
     gpio_tracing: Optional[GpioTracing] = GpioTracing()
@@ -97,7 +107,10 @@ class EmulationTask(ShpModel):
     sys_logging: Optional[SystemLogging] = SystemLogging()
 
     verbose: Annotated[int, Field(ge=0, le=4)] = 2
-    # ⤷ 0=Errors, 1=Warnings, 2=Info, 3=Debug, TODO: just bool now, systemwide
+    """ ⤷ 0=Errors, 1=Warnings, 2=Info, 3=Debug,
+
+    TODO: just bool now, systemwide
+    """
 
     @model_validator(mode="before")
     @classmethod

shepherd_core/data_models/task/firmware_mod.py

@@ -34,7 +34,7 @@ class FirmwareModTask(ShpModel):
     firmware_file: Path
 
     verbose: Annotated[int, Field(ge=0, le=4)] = 2
-    # ⤷ 0=Errors, 1=Warnings, 2=Info, 3=Debug
+    """ ⤷ 0=Errors, 1=Warnings, 2=Info, 3=Debug"""
 
     @model_validator(mode="after")
     def post_validation(self) -> Self:

shepherd_core/data_models/task/harvest.py

@@ -25,34 +25,35 @@ class HarvestTask(ShpModel):
 
     # General config
     output_path: Path
-    # ⤷ dir- or file-path for storing the recorded data:
-    #   - providing a directory -> file is named hrv_timestamp.h5
-    #   - for a complete path the filename is not changed except it exists and
-    #     overwrite is disabled -> name#num.h5
+    """ ⤷ dir- or file-path for storing the recorded data:
+
+    - providing a directory -> file is named hrv_timestamp.h5
+    - for a complete path the filename is not changed except it exists and
+      overwrite is disabled -> name#num.h5
+    """
     force_overwrite: bool = False
-    # ⤷ Overwrite existing file
+    """ ⤷ Overwrite existing file"""
     output_compression: Optional[Compression] = Compression.default
-    # ⤷ should be 1 (level 1 gzip), lzf, or None (order of recommendation)
+    """ ⤷ should be 1 (level 1 gzip), lzf, or None (order of recommendation)"""
 
     time_start: Optional[datetime] = None
-    # timestamp or unix epoch time, None = ASAP
+    """ timestamp or unix epoch time, None = ASAP"""
     duration: Optional[timedelta] = None
-    # ⤷ Duration of recording in seconds, None = till EOFSys
+    """ ⤷ Duration of recording in seconds, None = till EOFSys"""
     abort_on_error: Annotated[bool, deprecated("has no effect")] = False
 
     # emulation-specific
     use_cal_default: bool = False
-    # ⤷ Use default calibration values, skip loading from EEPROM
+    """ ⤷ Use default calibration values, skip loading from EEPROM"""
 
     virtual_harvester: VirtualHarvesterConfig = VirtualHarvesterConfig(name="mppt_opt")
-    # ⤷ Choose one of the predefined virtual harvesters
-    #   or configure a new one
-
+    """ ⤷ Choose one of the predefined virtual harvesters or configure a new one
+    """
     power_tracing: PowerTracing = PowerTracing()
     sys_logging: Optional[SystemLogging] = SystemLogging()
 
     verbose: Annotated[int, Field(ge=0, le=4)] = 2
-    # ⤷ 0=Errors, 1=Warnings, 2=Info, 3=Debug
+    """ ⤷ 0=Errors, 1=Warnings, 2=Info, 3=Debug"""
 
     # TODO: there is an unused DAC-Output patched to the harvesting-port
 

shepherd_core/data_models/task/observer_tasks.py

@@ -25,12 +25,10 @@ class ObserverTasks(ShpModel):
     """Collection of tasks for selected observer included in experiment."""
 
     observer: NameStr
-    owner_id: Optional[IdInt]  # TODO: set to optional for now, shouldn't be
 
     # PRE PROCESS
     time_prep: datetime  # TODO: should be optional
     root_path: Path
-    abort_on_error: Annotated[bool, deprecated("has no effect")] = False
 
     # fw mod, store as hex-file and program
     fw1_mod: Optional[FirmwareModTask] = None
@@ -41,6 +39,10 @@ class ObserverTasks(ShpModel):
     # MAIN PROCESS
     emulation: Optional[EmulationTask] = None
 
+    # deprecations, TODO: remove before public release
+    owner_id: Annotated[Optional[IdInt], deprecated("not needed anymore")] = None
+    abort_on_error: Annotated[bool, deprecated("has no effect")] = False
+
     # post_copy / cleanup, Todo: could also just intake emuTask
     #  - delete firmwares
     #  - decode uart
@@ -69,7 +71,6 @@ class ObserverTasks(ShpModel):
 
         return cls(
             observer=obs.name,
-            owner_id=xp.owner_id,
             time_prep=t_start - tb.prep_duration,
             root_path=root_path,
             fw1_mod=FirmwareModTask.from_xp(xp, tb, tgt_id, 1, fw_paths[0]),

shepherd_core/data_models/task/programming.py

@@ -29,7 +29,7 @@ class ProgrammingTask(ShpModel):
     target_port: TargetPort = TargetPort.A
     mcu_port: MCUPort = 1
     mcu_type: SafeStr
-    # ⤷ must be either "nrf52" or "msp430" ATM, TODO: clean xp to tasks
+    """ ⤷ 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)] = 200_000
     protocol: ProgrammerProtocol
@@ -38,7 +38,7 @@ class ProgrammingTask(ShpModel):
     simulate: bool = False
 
     verbose: Annotated[int, Field(ge=0, le=4)] = 2
-    # ⤷ 0=Errors, 1=Warnings, 2=Info, 3=Debug
+    """ ⤷ 0=Errors, 1=Warnings, 2=Info, 3=Debug"""
 
     @model_validator(mode="after")
     def post_validation(self) -> Self:

shepherd_core/data_models/task/testbed_tasks.py

@@ -7,6 +7,7 @@ from typing import Optional
 from pydantic import Field
 from pydantic import validate_call
 from typing_extensions import Self
+from typing_extensions import deprecated
 
 from shepherd_core.data_models.base.content import IdInt
 from shepherd_core.data_models.base.content import NameStr
@@ -23,11 +24,9 @@ class TestbedTasks(ShpModel):
     name: NameStr
     observer_tasks: Annotated[list[ObserverTasks], Field(min_length=1, max_length=128)]
 
-    # POST PROCESS
-    email_results: bool = False
-    owner_id: Optional[IdInt]
-    # TODO: had real email previously, does it really need these at all?
-    #  DB stores experiment and knows when to email
+    # deprecated, TODO: remove before public release
+    email_results: Annotated[Optional[bool], deprecated("not needed anymore")] = False
+    owner_id: Annotated[Optional[IdInt], deprecated("not needed anymore")] = None
 
     @classmethod
     @validate_call
@@ -41,8 +40,6 @@ class TestbedTasks(ShpModel):
         return cls(
             name=xp.name,
             observer_tasks=obs_tasks,
-            email_results=xp.email_results,
-            owner_id=xp.owner_id,
         )
 
     def get_observer_tasks(self, observer: str) -> Optional[ObserverTasks]:

shepherd_core/data_models/testbed/cape_fixture.yaml

@@ -1,7 +1,7 @@
 ---
 
 # more human-readable test-protocol @
-# https://github.com/orgua/shepherd_v2_planning/blob/main/doc_testbed/Cape_pre-deployment-tests.xlsx
+# https://github.com/orgua/shepherd-v2-planning/blob/main/doc_testbed/Cape_pre-deployment-tests.xlsx
 - datatype: cape
   parameters:
     id: 1270051

shepherd_core/data_models/testbed/observer.py

@@ -43,7 +43,7 @@ class Observer(ShpModel, title="Shepherd-Sheep"):
 
     latitude: Annotated[float, Field(ge=-90, le=90)] = 51.026573
     longitude: Annotated[float, Field(ge=-180, le=180)] = 13.723291
-    # ⤷ cfaed-floor
+    """ ⤷ cfaed-floor"""
 
     active: bool = True
     cape: Optional[Cape] = None

shepherd_core/data_models/testbed/observer_fixture.yaml

@@ -1,6 +1,6 @@
 ---
-# observer-cape-target-relation: https://github.com/orgua/shepherd_v2_planning/blob/main/doc_testbed/Cape_pre-deployment-tests.xlsx
-# network data: https://github.com/orgua/shepherd_v2_planning/blob/main/doc_testbed/ethernet_MAC_addresses_bbones.ods
+# observer-cape-target-relation: https://github.com/orgua/shepherd-v2-planning/blob/main/doc_testbed/Cape_pre-deployment-tests.xlsx
+# network data: https://github.com/orgua/shepherd-v2-planning/blob/main/doc_testbed/ethernet_MAC_addresses_bbones.ods
 - datatype: observer
   parameters:
     id: 0

shepherd_core/data_models/testbed/target.py

@@ -36,7 +36,7 @@ class Target(ShpModel, title="Target Node (DuT)"):
     created: datetime = Field(default_factory=datetime.now)
 
     testbed_id: Optional[IdInt16] = None
-    # ⤷ is derived from ID (targets are still selected by id!)
+    """ ⤷ is derived from ID (targets are still selected by id!)"""
     mcu1: Union[MCU, NameStr]
     mcu2: Union[MCU, NameStr, None] = None
 

shepherd_core/data_models/testbed/target_fixture.old1

@@ -1,6 +1,6 @@
 ---
 # more human-readable test-protocol @
-# https://github.com/orgua/shepherd_v2_planning/blob/main/doc_testbed/Target_pre-deployment-tests.xlsx
+# https://github.com/orgua/shepherd-v2-planning/blob/main/doc_testbed/Target_pre-deployment-tests.xlsx
 - datatype: target
   parameters:
     id: 6  # Outer ID - selected by user for XP - can be rearranged

shepherd_core/data_models/testbed/target_fixture.yaml

@@ -1,6 +1,6 @@
 ---
 # more human-readable test-protocol @
-# https://github.com/orgua/shepherd_v2_planning/blob/main/doc_testbed/Target_pre-deployment-tests.xlsx
+# https://github.com/orgua/shepherd-v2-planning/blob/main/doc_testbed/Target_pre-deployment-tests.xlsx
 - datatype: target
   parameters:
     id: 2  # Outer ID - selected by user for XP - can be rearranged

shepherd_core/data_models/testbed/testbed.py

@@ -11,15 +11,17 @@ from pydantic import HttpUrl
 from pydantic import model_validator
 from typing_extensions import Self
 
+from shepherd_core.config import config
 from shepherd_core.data_models.base.content import IdInt
 from shepherd_core.data_models.base.content import NameStr
 from shepherd_core.data_models.base.content import SafeStr
 from shepherd_core.data_models.base.shepherd import ShpModel
-from shepherd_core.logger import logger
 from shepherd_core.testbed_client import tb_client
 
 from .observer import Observer
 
+duration_5min = timedelta(minutes=5)
+
 
 class Testbed(ShpModel):
     """meta-data representation of a testbed-component (physical object)."""
@@ -36,21 +38,18 @@ class Testbed(ShpModel):
     shared_storage: bool = True
     data_on_server: Path
     data_on_observer: Path
-    # ⤷ storage layout: root_path/content_type/group/owner/[object]
+    """ ⤷ storage layout: root_path/content_type/group/owner/[object]"""
+    # TODO: we might need individual paths for experiments & content
 
-    prep_duration: timedelta = timedelta(minutes=5)
+    prep_duration: timedelta = duration_5min
     # TODO: one BBone is currently time-keeper
 
     @model_validator(mode="before")
     @classmethod
     def query_database(cls, values: dict[str, Any]) -> dict[str, Any]:
-        # allow instantiating an empty Testbed
-        #   -> query the first (and only) entry of client
+        # allow instantiating an empty Testbed, take default in config
         if len(values) == 0:
-            ids = tb_client.query_ids(cls.__name__)
-            if len(ids) > 1:
-                logger.warning("More than one testbed defined?!?")
-            values = {"id": ids[0]}
+            values = {"name": config.TESTBED}
 
         values, _ = tb_client.try_completing_model(cls.__name__, values)
         return values

shepherd_core/fw_tools/patcher.py

@@ -7,8 +7,7 @@ from typing import Optional
 from pydantic import Field
 from pydantic import validate_call
 
-from shepherd_core.commons import UID_NAME
-from shepherd_core.commons import UID_SIZE
+from shepherd_core.config import config
 from shepherd_core.logger import logger
 
 from .validation import is_elf
@@ -50,7 +49,7 @@ def find_symbol(file_elf: Path, symbol: str) -> bool:
 
 
 @validate_call
-def read_symbol(file_elf: Path, symbol: str, length: int = UID_SIZE) -> Optional[int]:
+def read_symbol(file_elf: Path, symbol: str, length: int) -> Optional[int]:
     """Read value of symbol in ELF-File.
 
     Will be interpreted as int.
@@ -68,7 +67,7 @@ def read_symbol(file_elf: Path, symbol: str, length: int = UID_SIZE) -> Optional
 
 def read_uid(file_elf: Path) -> Optional[int]:
     """Read value of UID-symbol for shepherd testbed."""
-    return read_symbol(file_elf, symbol=UID_NAME, length=UID_SIZE)
+    return read_symbol(file_elf, symbol=config.UID_NAME, length=config.UID_SIZE)
 
 
 def read_arch(file_elf: Path) -> Optional[str]:
@@ -88,7 +87,7 @@ def read_arch(file_elf: Path) -> Optional[str]:
 def modify_symbol_value(
     file_elf: Path,
     symbol: str,
-    value: Annotated[int, Field(ge=0, lt=2 ** (8 * UID_SIZE))],
+    value: Annotated[int, Field(ge=0, lt=2 ** (8 * config.UID_SIZE))],
     *,
     overwrite: bool = False,
 ) -> Optional[Path]:
@@ -106,10 +105,10 @@ def modify_symbol_value(
         raise RuntimeError(elf_error_text)
     elf = ELF(path=file_elf)
     addr = elf.symbols[symbol]
-    value_raw = elf.read(address=addr, count=UID_SIZE)[-UID_SIZE:]
+    value_raw = elf.read(address=addr, count=config.UID_SIZE)[-config.UID_SIZE :]
     # ⤷ cutting needed -> msp produces 4b instead of 2
     value_old = int.from_bytes(bytes=value_raw, byteorder=elf.endian, signed=False)
-    value_raw = value.to_bytes(length=UID_SIZE, byteorder=elf.endian, signed=False)
+    value_raw = value.to_bytes(length=config.UID_SIZE, byteorder=elf.endian, signed=False)
 
     try:
         elf.write(address=addr, data=value_raw)
@@ -132,4 +131,4 @@ def modify_symbol_value(
 
 def modify_uid(file_elf: Path, value: int) -> Optional[Path]:
     """Replace value of UID-symbol for shepherd testbed."""
-    return modify_symbol_value(file_elf, symbol=UID_NAME, value=value, overwrite=True)
+    return modify_symbol_value(file_elf, symbol=config.UID_NAME, value=value, overwrite=True)

shepherd_core/inventory/system.py

@@ -31,10 +31,8 @@ class SystemInventory(ShpModel):
     """System / OS related inventory model."""
 
     uptime: PositiveInt
-    # ⤷ seconds
+    """ ⤷ seconds"""
     timestamp: datetime
-    # time_delta: timedelta = timedelta(seconds=0)  # noqa: ERA001
-    # ⤷ lag behind earliest observer, TODO: wrong place
 
     system: str
     release: str

shepherd_core/reader.py

@@ -7,6 +7,7 @@ import errno
 import logging
 import math
 import os
+from datetime import datetime
 from itertools import product
 from pathlib import Path
 from types import MappingProxyType
@@ -24,9 +25,10 @@ from tqdm import trange
 from typing_extensions import Self
 from typing_extensions import deprecated
 
-from .commons import SAMPLERATE_SPS_DEFAULT
+from .config import config
 from .data_models.base.calibration import CalibrationPair
 from .data_models.base.calibration import CalibrationSeries
+from .data_models.base.timezone import local_tz
 from .data_models.content.energy_environment import EnergyDType
 from .decoder_waveform import Uart
 
@@ -75,7 +77,7 @@ class Reader:
             self._logger.setLevel(logging.DEBUG if verbose else logging.INFO)
 
         if not hasattr(self, "samplerate_sps"):
-            self.samplerate_sps: int = SAMPLERATE_SPS_DEFAULT
+            self.samplerate_sps: int = config.SAMPLERATE_SPS
         self.sample_interval_ns: int = round(10**9 // self.samplerate_sps)
         self.sample_interval_s: float = 1 / self.samplerate_sps
 
@@ -263,6 +265,11 @@ class Reader:
             omit_timestamps=omit_ts,
         )
 
+    def get_time_start(self) -> Optional[datetime]:
+        if self.samples_n < 1:
+            return None
+        return datetime.fromtimestamp(self._cal.time.raw_to_si(self.ds_time[0]), tz=local_tz())
+
     def get_calibration_data(self) -> CalibrationSeries:
         """Read calibration-data from hdf5 file.
 

shepherd_core/testbed_client/cache_path.py

@@ -14,4 +14,4 @@ def _get_xdg_path(variable_name: str, default_path: Path) -> Path:
 user_path = Path("~").expanduser()
 
 cache_xdg_path = _get_xdg_path("XDG_CACHE_HOME", user_path / ".cache")
-cache_user_path = cache_xdg_path / "shepherd_datalib"
+cache_user_path = cache_xdg_path / "shepherd"

shepherd_core/testbed_client/client_web.py

@@ -8,7 +8,7 @@ from typing import Union
 
 from pydantic import validate_call
 
-from shepherd_core.commons import TESTBED_SERVER_URI
+from shepherd_core.config import config
 from shepherd_core.data_models.base.shepherd import ShpModel
 from shepherd_core.data_models.base.wrapper import Wrapper
 
@@ -38,7 +38,7 @@ class WebClient(AbcClient):
         if not hasattr(self, "_token"):
             # add default values
             self._token: str = "basic_public_access"  # noqa: S105
-            self._server: str = TESTBED_SERVER_URI
+            self._server: str = config.TESTBED_SERVER
             self._user: Optional[User] = None
             self._key: Optional[str] = None
             self._connected: bool = False

shepherd_core/version.py

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

shepherd_core/writer.py

@@ -20,7 +20,7 @@ from typing_extensions import Self
 from yaml import Node
 from yaml import SafeDumper
 
-from .commons import SAMPLERATE_SPS_DEFAULT
+from .config import config
 from .data_models.base.calibration import CalibrationEmulator as CalEmu
 from .data_models.base.calibration import CalibrationHarvester as CalHrv
 from .data_models.base.calibration import CalibrationSeries as CalSeries
@@ -348,7 +348,7 @@ class Writer(Reader):
         chunks_n = self.ds_voltage.size / self.CHUNK_SAMPLES_N
         size_new = int(math.floor(chunks_n) * self.CHUNK_SAMPLES_N)
         if size_new < self.ds_voltage.size:
-            if self.samplerate_sps != SAMPLERATE_SPS_DEFAULT:
+            if self.samplerate_sps != config.SAMPLERATE_SPS:
                 self._logger.debug("skipped alignment due to altered samplerate")
                 return
             self._logger.info(

{shepherd_core-2025.5.3.dist-info → shepherd_core-2025.6.1.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: shepherd_core
-Version: 2025.5.3
+Version: 2025.6.1
 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
 ```