diff --git a/packages/modules/devices/solvis/__init__.py b/packages/modules/devices/solvis/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/modules/devices/solvis/solvis/__init__.py b/packages/modules/devices/solvis/solvis/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/modules/devices/solvis/solvis/config.py b/packages/modules/devices/solvis/solvis/config.py new file mode 100644 index 0000000000..4ebfc8f463 --- /dev/null +++ b/packages/modules/devices/solvis/solvis/config.py @@ -0,0 +1,42 @@ +from typing import Optional +from helpermodules.auto_str import auto_str +from modules.common.component_setup import ComponentSetup +from ..vendor import vendor_descriptor + + +@auto_str +class SolvisConfiguration: + def __init__(self, ip_address: Optional[str] = None, port: int = 502, modbus_id: int = 1): + self.ip_address = ip_address + self.port = port + self.modbus_id = modbus_id + + +@auto_str +class Solvis: + def __init__(self, + name: str = "Solvis", + type: str = "solvis", + id: int = 0, + configuration: SolvisConfiguration = None) -> None: + self.name = name + self.type = type + self.vendor = vendor_descriptor.configuration_factory().type + self.id = id + self.configuration = configuration or SolvisConfiguration() + + +@auto_str +class SolvisCounterConfiguration: + def __init__(self): + pass + + +@auto_str +class SolvisCounterSetup(ComponentSetup[SolvisCounterConfiguration]): + def __init__(self, + name: str = "Solvis Zähler", + type: str = "counter", + id: int = 0, + configuration: SolvisCounterConfiguration = None) -> None: + super().__init__(name, type, id, configuration or SolvisCounterConfiguration()) diff --git a/packages/modules/devices/solvis/solvis/counter.py b/packages/modules/devices/solvis/solvis/counter.py new file mode 100644 index 0000000000..cc965f944c --- /dev/null +++ b/packages/modules/devices/solvis/solvis/counter.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python3 +from typing import TypedDict, Any + +from modules.common.abstract_device import AbstractCounter +from modules.common.component_state import CounterState +from modules.common.component_type import ComponentDescriptor +from modules.common.fault_state import ComponentInfo, FaultState +from modules.common.modbus import ModbusDataType, ModbusTcpClient_ +from modules.common.simcount import SimCounter +from modules.common.store import get_counter_value_store +from modules.devices.solvis.solvis.config import SolvisCounterSetup + + +class KwargsDict(TypedDict): + device_id: int + client: ModbusTcpClient_ + modbus_id: int + + +class SolvisCounter(AbstractCounter): + def __init__(self, component_config: SolvisCounterSetup, **kwargs: Any) -> None: + self.component_config = component_config + self.kwargs: KwargsDict = kwargs + + def initialize(self) -> None: + self.__device_id: int = self.kwargs['device_id'] + self.client: ModbusTcpClient_ = self.kwargs['client'] + self.modbus_id: int = self.kwargs['modbus_id'] + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") + self.store = get_counter_value_store(self.component_config.id) + self.fault_state = FaultState(ComponentInfo.from_component_config(self.component_config)) + + def update(self): + unit = self.modbus_id + power = self.client.read_input_registers(33545, ModbusDataType.INT_16, unit=unit) * 100 + imported, exported = self.sim_counter.sim_count(power) + + counter_state = CounterState( + imported=imported, + exported=exported, + power=power, + ) + self.store.set(counter_state) + + +component_descriptor = ComponentDescriptor(configuration_factory=SolvisCounterSetup) diff --git a/packages/modules/devices/solvis/solvis/device.py b/packages/modules/devices/solvis/solvis/device.py new file mode 100644 index 0000000000..8f24a03646 --- /dev/null +++ b/packages/modules/devices/solvis/solvis/device.py @@ -0,0 +1,47 @@ +#!/usr/bin/env python3 +import logging +from typing import Iterable + +from modules.common.abstract_device import DeviceDescriptor +from modules.common.component_context import SingleComponentUpdateContext +from modules.common.configurable_device import ConfigurableDevice, ComponentFactoryByType, MultiComponentUpdater +from modules.common.modbus import ModbusTcpClient_ +from modules.devices.solvis.solvis.config import Solvis, SolvisCounterSetup +from modules.devices.solvis.solvis.counter import SolvisCounter + +log = logging.getLogger(__name__) + + +def create_device(device_config: Solvis): + client = None + + def create_counter_component(component_config: SolvisCounterSetup): + nonlocal client + return SolvisCounter( + component_config, + device_id=device_config.id, + client=client, + modbus_id=device_config.configuration.modbus_id, + ) + + def update_components(components: Iterable[SolvisCounter]): + with client: + for component in components: + with SingleComponentUpdateContext(component.fault_state): + component.update() + + def initializer(): + nonlocal client + client = ModbusTcpClient_(device_config.configuration.ip_address, device_config.configuration.port) + + return ConfigurableDevice( + device_config=device_config, + initializer=initializer, + component_factory=ComponentFactoryByType( + counter=create_counter_component, + ), + component_updater=MultiComponentUpdater(update_components) + ) + + +device_descriptor = DeviceDescriptor(configuration_factory=Solvis) diff --git a/packages/modules/devices/solvis/vendor.py b/packages/modules/devices/solvis/vendor.py new file mode 100644 index 0000000000..2adee7c9c1 --- /dev/null +++ b/packages/modules/devices/solvis/vendor.py @@ -0,0 +1,14 @@ +from pathlib import Path + +from modules.common.abstract_device import DeviceDescriptor +from modules.devices.vendors import VendorGroup + + +class Vendor: + def __init__(self): + self.type = Path(__file__).parent.name + self.vendor = "Solvis" + self.group = VendorGroup.VENDORS.value + + +vendor_descriptor = DeviceDescriptor(configuration_factory=Vendor)