Skip to content

adjust modbus id #2439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LKuemmel merged 2 commits into from
Jun 10, 2025
Merged

adjust modbus id #2439

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe18ce7
adjust modbus id
ndrsnhs Jun 10, 2025
7fdb9ae
reduce code by combining functions
ndrsnhs Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 16 additions & 35 deletions packages/modules/devices/alpha_ess/alpha_ess/counter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
import time
from typing import Callable, Any, TypedDict
from typing import Any, TypedDict

from modules.devices.alpha_ess.alpha_ess.config import AlphaEssConfiguration, AlphaEssCounterSetup
from modules.common import modbus
Expand Down Expand Up @@ -32,48 +32,29 @@ def initialize(self) -> None:

def update(self):
time.sleep(0.1)
counter_state = self.__get_values_factory()
self.store.set(counter_state)

def __get_values_factory(self) -> Callable[[int], CounterState]:
if self.__device_config.source == 0 and self.__device_config.version == 0:
return self.__get_values_before_v123
power, exported, imported = self.__tcp_client.read_holding_registers(
0x6, [modbus.ModbusDataType.INT_32] * 3, unit=self.__modbus_id)
exported *= 10
imported *= 10
currents = [val / 230 for val in self.__tcp_client.read_holding_registers(
0x0000, [ModbusDataType.INT_32]*3, unit=self.__modbus_id)]
else:
return self.__get_values_since_v123

def __get_values_before_v123(self) -> CounterState:
power, exported, imported = self.__tcp_client.read_holding_registers(
0x6, [modbus.ModbusDataType.INT_32] * 3, unit=self.__modbus_id)
exported *= 10
imported *= 10
currents = [val / 230 for val in self.__tcp_client.read_holding_registers(
0x0000, [ModbusDataType.INT_32]*3, unit=self.__modbus_id)]

counter_state = CounterState(
currents=currents,
imported=imported,
exported=exported,
power=power
)
return counter_state

def __get_values_since_v123(self) -> CounterState:
power = self.__tcp_client.read_holding_registers(0x0021, ModbusDataType.INT_32, unit=self.__modbus_id)
exported, imported = [
val * 10 for val in self.__tcp_client.read_holding_registers(
0x0010, [ModbusDataType.INT_32] * 2, unit=self.__modbus_id
)]
currents = [val / 1000 for val in self.__tcp_client.read_holding_registers(
0x0017, [ModbusDataType.INT_16]*3, unit=self.__modbus_id)]
power = self.__tcp_client.read_holding_registers(0x0021, ModbusDataType.INT_32, unit=self.__modbus_id)
exported, imported = [
val * 10 for val in self.__tcp_client.read_holding_registers(
0x0010, [ModbusDataType.INT_32] * 2, unit=self.__modbus_id
)]
currents = [val / 1000 for val in self.__tcp_client.read_holding_registers(
0x0017, [ModbusDataType.INT_16]*3, unit=self.__modbus_id)]

counter_state = CounterState(
currents=currents,
imported=imported,
exported=exported,
power=power
)
return counter_state
self.store.set(counter_state)


component_descriptor = ComponentDescriptor(
configuration_factory=AlphaEssCounterSetup)
component_descriptor = ComponentDescriptor(configuration_factory=AlphaEssCounterSetup)