Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions packages/modules/devices/generic/modbus/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def __init__(self,
class RegisterConfig:
reg_address: Optional[int] = None
reg_type: Optional[str] = None
reg_factor: int = 1


@dataclass
Expand Down
7 changes: 6 additions & 1 deletion packages/modules/devices/generic/modbus/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

def check_data(register_config: RegisterConfig, device_config: GenericModbusConfiguration):
if (register_config.reg_type is None or
register_config.reg_factor is None or
device_config.byteorder is None or
device_config.wordorder is None):
raise ValueError(
Expand All @@ -19,14 +20,18 @@ def read_value(client: ModbusTcpClient_, unit: int,
return None

check_data(register_config, device_config)
return client.read_input_registers(
value = client.read_input_registers(
register_config.reg_address,
ModbusDataType[register_config.reg_type],
byteorder=device_config.byteorder,
wordorder=device_config.wordorder,
unit=unit,
)

if value is not None and register_config.reg_factor != 1:
value = value * register_config.reg_factor
return value


def read_phase_values(client: ModbusTcpClient_,
unit: int,
Expand Down