fix internal_dc_input_voltage for ac300 and ac500

This commit is contained in:
Patrick762 committed 2024-05-30 20:22:43 +02:00
1 parent 97154bb027
commit 591c86baf5
3 files changed
+9 -6

No files matched your search

@@ -23,7 +23,7 @@ class AC300(ProtocolV1Device):
self.struct.add_decimal_field("internal_current_three", 78, 1, (0, 100))
self.struct.add_uint_field("internal_power_three", 79)
self.struct.add_decimal_field("ac_input_frequency", 80, 2)
self.struct.add_uint_field("internal_dc_input_voltage", 86)
self.struct.add_uint_field("internal_dc_input_voltage", 86, scale=.1)
self.struct.add_decimal_field("internal_dc_input_power", 87, 1)
self.struct.add_decimal_field("internal_dc_input_current", 88, 2)
@@ -23,7 +23,7 @@ class AC500(ProtocolV1Device):
self.struct.add_decimal_field("internal_current_three", 78, 1, (0, 100))
self.struct.add_uint_field("internal_power_three", 79)
self.struct.add_decimal_field("ac_input_frequency", 80, 2)
self.struct.add_uint_field("internal_dc_input_voltage", 86)
self.struct.add_uint_field("internal_dc_input_voltage", 86, scale=.1)
self.struct.add_decimal_field("internal_dc_input_power", 87, 1)
self.struct.add_decimal_field("internal_dc_input_current", 88, 2)
@@ -30,12 +30,15 @@ class DeviceField:
class UintField(DeviceField):
def __init__(self, name: str, address: int, range: Optional[Tuple[int, int]]):
def __init__(self, name: str, address: int, range: Optional[Tuple[int, int]], scale: int):
self.range = range
self.scale = scale
super().__init__(name, address, 1)
def parse(self, data: bytes) -> int:
return struct.unpack("!H", data)[0]
val = struct.unpack("!H", data)[0]
return val * self.scale
def in_range(self, val: int) -> bool:
if self.range is None:
@@ -144,8 +147,8 @@ class DeviceStruct:
def __init__(self):
self.fields = []
def add_uint_field(self, name: str, address: int, range: Tuple[int, int] = None):
self.fields.append(UintField(name, address, range))
def add_uint_field(self, name: str, address: int, range: Tuple[int, int] = None, scale: int = 1):
self.fields.append(UintField(name, address, range, scale))
def add_int_field(self, name: str, address: int, range: Tuple[int, int] = None):
self.fields.append(IntField(name, address, range))