goodwe 0.3.1__tar.gz → 0.3.2__tar.gz

{goodwe-0.3.1/goodwe.egg-info → goodwe-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: goodwe
-Version: 0.3.1
+Version: 0.3.2
 Summary: Read data from GoodWe inverter via local network
 Home-page: https://github.com/marcelblijleven/goodwe
 Author: Martin Letenay, Marcel Blijleven

goodwe-0.3.2/VERSION

@@ -0,0 +1 @@
+0.3.2

{goodwe-0.3.1 → goodwe-0.3.2}/goodwe/es.py

@@ -67,7 +67,7 @@ class ES(Inverter):
         Voltage("vgrid", 34, "On-grid Voltage", Kind.AC),
         Current("igrid", 36, "On-grid Current", Kind.AC),
         Calculated("pgrid",
-                   lambda data: abs(read_bytes2(data, 38)) * (-1 if read_byte(data, 80) == 2 else 1),
+                   lambda data: abs(read_bytes2_signed(data, 38)) * (-1 if read_byte(data, 80) == 2 else 1),
                    "On-grid Export Power", "W", Kind.AC),
         Frequency("fgrid", 40, "On-grid Frequency", Kind.AC),
         Byte("grid_mode", 42, "Work Mode code", "", Kind.GRID),
@@ -87,7 +87,7 @@ class ES(Inverter):
         Energy("e_day", 67, "Today's PV Generation", Kind.PV),
         Energy("e_load_day", 69, "Today's Load", Kind.AC),
         Energy4("e_load_total", 71, "Total Load", Kind.AC),
-        Power("total_power", 75, "Total Power", Kind.AC),  # modbus 0x52c
+        PowerS("total_power", 75, "Total Power", Kind.AC),  # modbus 0x52c
         Byte("effective_work_mode", 77, "Effective Work Mode code"),
         Integer("effective_relay_control", 78, "Effective Relay Control", "", None),
         Byte("grid_in_out", 80, "On-grid Mode code", "", Kind.GRID),
@@ -121,7 +121,7 @@ class ES(Inverter):
                    round(read_voltage(data, 5) * read_current(data, 7)) +
                    (abs(round(read_voltage(data, 10) * read_current(data, 18))) *
                     (-1 if read_byte(data, 30) == 3 else 1)) -
-                   (abs(read_bytes2(data, 38)) * (-1 if read_byte(data, 80) == 2 else 1)),
+                   (abs(read_bytes2_signed(data, 38)) * (-1 if read_byte(data, 80) == 2 else 1)),
                    "House Consumption", "W", Kind.AC),
     )
 

{goodwe-0.3.1 → goodwe-0.3.2}/goodwe/et.py

@@ -52,23 +52,23 @@ class ET(Inverter):
         Current("igrid", 35122, "On-grid L1 Current", Kind.AC),
         Frequency("fgrid", 35123, "On-grid L1 Frequency", Kind.AC),
         # 35124 reserved
-        Power("pgrid", 35125, "On-grid L1 Power", Kind.AC),
+        PowerS("pgrid", 35125, "On-grid L1 Power", Kind.AC),
         Voltage("vgrid2", 35126, "On-grid L2 Voltage", Kind.AC),
         Current("igrid2", 35127, "On-grid L2 Current", Kind.AC),
         Frequency("fgrid2", 35128, "On-grid L2 Frequency", Kind.AC),
         # 35129 reserved
-        Power("pgrid2", 35130, "On-grid L2 Power", Kind.AC),
+        PowerS("pgrid2", 35130, "On-grid L2 Power", Kind.AC),
         Voltage("vgrid3", 35131, "On-grid L3 Voltage", Kind.AC),
         Current("igrid3", 35132, "On-grid L3 Current", Kind.AC),
         Frequency("fgrid3", 35133, "On-grid L3 Frequency", Kind.AC),
         # 35134 reserved
-        Power("pgrid3", 35135, "On-grid L3 Power", Kind.AC),
+        PowerS("pgrid3", 35135, "On-grid L3 Power", Kind.AC),
         Integer("grid_mode", 35136, "Grid Mode code", "", Kind.PV),
         Enum2("grid_mode_label", 35136, GRID_MODES, "Grid Mode", Kind.PV),
         # 35137 reserved
-        Power("total_inverter_power", 35138, "Total Power", Kind.AC),
+        PowerS("total_inverter_power", 35138, "Total Power", Kind.AC),
         # 35139 reserved
-        Power("active_power", 35140, "Active Power", Kind.GRID),
+        PowerS("active_power", 35140, "Active Power", Kind.GRID),
         Calculated("grid_in_out",
                    lambda data: read_grid_mode(data, 35140),
                    "On-grid Mode code", "", Kind.GRID),
@@ -84,29 +84,29 @@ class ET(Inverter):
         Frequency("backup_f1", 35147, "Back-up L1 Frequency", Kind.UPS),
         Integer("load_mode1", 35148, "Load Mode L1"),
         # 35149 reserved
-        Power("backup_p1", 35150, "Back-up L1 Power", Kind.UPS),
+        PowerS("backup_p1", 35150, "Back-up L1 Power", Kind.UPS),
         Voltage("backup_v2", 35151, "Back-up L2 Voltage", Kind.UPS),
         Current("backup_i2", 35152, "Back-up L2 Current", Kind.UPS),
         Frequency("backup_f2", 35153, "Back-up L2 Frequency", Kind.UPS),
         Integer("load_mode2", 35154, "Load Mode L2"),
         # 35155 reserved
-        Power("backup_p2", 35156, "Back-up L2 Power", Kind.UPS),
+        PowerS("backup_p2", 35156, "Back-up L2 Power", Kind.UPS),
         Voltage("backup_v3", 35157, "Back-up L3 Voltage", Kind.UPS),
         Current("backup_i3", 35158, "Back-up L3 Current", Kind.UPS),
         Frequency("backup_f3", 35159, "Back-up L3 Frequency", Kind.UPS),
         Integer("load_mode3", 35160, "Load Mode L3"),
         # 35161 reserved
-        Power("backup_p3", 35162, "Back-up L3 Power", Kind.UPS),
+        PowerS("backup_p3", 35162, "Back-up L3 Power", Kind.UPS),
         # 35163 reserved
-        Power("load_p1", 35164, "Load L1", Kind.AC),
+        PowerS("load_p1", 35164, "Load L1", Kind.AC),
         # 35165 reserved
-        Power("load_p2", 35166, "Load L2", Kind.AC),
+        PowerS("load_p2", 35166, "Load L2", Kind.AC),
         # 35167 reserved
-        Power("load_p3", 35168, "Load L3", Kind.AC),
+        PowerS("load_p3", 35168, "Load L3", Kind.AC),
         # 35169 reserved
-        Power("backup_ptotal", 35170, "Back-up Load", Kind.UPS),
+        PowerS("backup_ptotal", 35170, "Back-up Load", Kind.UPS),
         # 35171 reserved
-        Power("load_ptotal", 35172, "Load", Kind.AC),
+        PowerS("load_ptotal", 35172, "Load", Kind.AC),
         Integer("ups_load", 35173, "Ups Load", "%", Kind.UPS),
         Temp("temperature_air", 35174, "Inverter Temperature (Air)", Kind.AC),
         Temp("temperature_module", 35175, "Inverter Temperature (Module)"),
@@ -115,8 +115,8 @@ class ET(Inverter):
         Voltage("bus_voltage", 35178, "Bus Voltage", None),
         Voltage("nbus_voltage", 35179, "NBus Voltage", None),
         Voltage("vbattery1", 35180, "Battery Voltage", Kind.BAT),
-        Current("ibattery1", 35181, "Battery Current", Kind.BAT),
-        Power4("pbattery1", 35182, "Battery Power", Kind.BAT),
+        CurrentS("ibattery1", 35181, "Battery Current", Kind.BAT),
+        Power4S("pbattery1", 35182, "Battery Power", Kind.BAT),
         Integer("battery_mode", 35184, "Battery Mode code", "", Kind.BAT),
         Enum2("battery_mode_label", 35184, BATTERY_MODES, "Battery Mode", Kind.BAT),
         Integer("warning_code", 35185, "Warning code"),
@@ -149,8 +149,8 @@ class ET(Inverter):
                    read_bytes4(data, 35109) +
                    read_bytes4(data, 35113) +
                    read_bytes4(data, 35117) +
-                   read_bytes4(data, 35182) -
-                   read_bytes2(data, 35140),
+                   read_bytes4_signed(data, 35182) -
+                   read_bytes2_signed(data, 35140),
                    "House Consumption", "W", Kind.AC),
     )
 
@@ -226,10 +226,10 @@ class ET(Inverter):
         Integer("manufacture_code", 36002, "Manufacture Code"),
         Integer("meter_test_status", 36003, "Meter Test Status"),  # 1: correct，2: reverse，3: incorrect，0: not checked
         Integer("meter_comm_status", 36004, "Meter Communication Status"),  # 1 OK, 0 NotOK
-        Power("active_power1", 36005, "Active Power L1", Kind.GRID),
-        Power("active_power2", 36006, "Active Power L2", Kind.GRID),
-        Power("active_power3", 36007, "Active Power L3", Kind.GRID),
-        Power("active_power_total", 36008, "Active Power Total", Kind.GRID),
+        PowerS("active_power1", 36005, "Active Power L1", Kind.GRID),
+        PowerS("active_power2", 36006, "Active Power L2", Kind.GRID),
+        PowerS("active_power3", 36007, "Active Power L3", Kind.GRID),
+        PowerS("active_power_total", 36008, "Active Power Total", Kind.GRID),
         Reactive("reactive_power_total", 36009, "Reactive Power Total", Kind.GRID),
         Decimal("meter_power_factor1", 36010, 1000, "Meter Power Factor L1", "", Kind.GRID),
         Decimal("meter_power_factor2", 36011, 1000, "Meter Power Factor L2", "", Kind.GRID),
@@ -238,10 +238,10 @@ class ET(Inverter):
         Frequency("meter_freq", 36014, "Meter Frequency", Kind.GRID),
         Float("meter_e_total_exp", 36015, 1000, "Meter Total Energy (export)", "kWh", Kind.GRID),
         Float("meter_e_total_imp", 36017, 1000, "Meter Total Energy (import)", "kWh", Kind.GRID),
-        Power4("meter_active_power1", 36019, "Meter Active Power L1", Kind.GRID),
-        Power4("meter_active_power2", 36021, "Meter Active Power L2", Kind.GRID),
-        Power4("meter_active_power3", 36023, "Meter Active Power L3", Kind.GRID),
-        Power4("meter_active_power_total", 36025, "Meter Active Power Total", Kind.GRID),
+        Power4S("meter_active_power1", 36019, "Meter Active Power L1", Kind.GRID),
+        Power4S("meter_active_power2", 36021, "Meter Active Power L2", Kind.GRID),
+        Power4S("meter_active_power3", 36023, "Meter Active Power L3", Kind.GRID),
+        Power4S("meter_active_power_total", 36025, "Meter Active Power Total", Kind.GRID),
         Reactive4("meter_reactive_power1", 36027, "Meter Reactive Power L1", Kind.GRID),
         Reactive4("meter_reactive_power2", 36029, "Meter Reactive Power L2", Kind.GRID),
         Reactive4("meter_reactive_power3", 36031, "Meter Reactive Power L2", Kind.GRID),
@@ -253,7 +253,7 @@ class ET(Inverter):
         Integer("meter_type", 36043, "Meter Type", "", Kind.GRID),  # (0: Single phase, 1: 3P3W, 2: 3P4W, 3: HomeKit)
         Integer("meter_sw_version", 36044, "Meter Software Version", "", Kind.GRID),
         # Sensors added in some ARM fw update, read when flag _has_meter_extended is on
-        Power4("meter2_active_power", 36045, "Meter 2 Active Power", Kind.GRID),
+        Power4S("meter2_active_power", 36045, "Meter 2 Active Power", Kind.GRID),
         Float("meter2_e_total_exp", 36047, 1000, "Meter 2 Total Energy (export)", "kWh", Kind.GRID),
         Float("meter2_e_total_imp", 36049, 1000, "Meter 2 Total Energy (import)", "kWh", Kind.GRID),
         Integer("meter2_comm_status", 36051, "Meter 2 Communication Status"),

{goodwe-0.3.1 → goodwe-0.3.2}/goodwe/sensor.py

@@ -83,7 +83,7 @@ class ScheduleType(IntEnum):
 
 
 class Voltage(Sensor):
-    """Sensor representing voltage [V] value encoded in 2 bytes"""
+    """Sensor representing voltage [V] value encoded in 2 (unsigned) bytes"""
 
     def __init__(self, id_: str, offset: int, name: str, kind: Optional[SensorKind]):
         super().__init__(id_, offset, name, 2, "V", kind)
@@ -96,7 +96,7 @@ class Voltage(Sensor):
 
 
 class Current(Sensor):
-    """Sensor representing current [A] value encoded in 2 bytes"""
+    """Sensor representing current [A] value encoded in 2 (unsigned) bytes"""
 
     def __init__(self, id_: str, offset: int, name: str, kind: Optional[SensorKind]):
         super().__init__(id_, offset, name, 2, "A", kind)
@@ -108,6 +108,19 @@ class Current(Sensor):
         return encode_current(value)
 
 
+class CurrentS(Sensor):
+    """Sensor representing current [A] value encoded in 2 (signed) bytes"""
+
+    def __init__(self, id_: str, offset: int, name: str, kind: Optional[SensorKind]):
+        super().__init__(id_, offset, name, 2, "A", kind)
+
+    def read_value(self, data: ProtocolResponse):
+        return read_current_signed(data)
+
+    def encode_value(self, value: Any, register_value: bytes = None) -> bytes:
+        return encode_current_signed(value)
+
+
 class Frequency(Sensor):
     """Sensor representing frequency [Hz] value encoded in 2 bytes"""
 
@@ -119,7 +132,7 @@ class Frequency(Sensor):
 
 
 class Power(Sensor):
-    """Sensor representing power [W] value encoded in 2 bytes"""
+    """Sensor representing power [W] value encoded in 2 (unsigned) bytes"""
 
     def __init__(self, id_: str, offset: int, name: str, kind: Optional[SensorKind]):
         super().__init__(id_, offset, name, 2, "W", kind)
@@ -128,8 +141,18 @@ class Power(Sensor):
         return read_bytes2(data)
 
 
+class PowerS(Sensor):
+    """Sensor representing power [W] value encoded in 2 (signed) bytes"""
+
+    def __init__(self, id_: str, offset: int, name: str, kind: Optional[SensorKind]):
+        super().__init__(id_, offset, name, 2, "W", kind)
+
+    def read_value(self, data: ProtocolResponse):
+        return read_bytes2_signed(data)
+
+
 class Power4(Sensor):
-    """Sensor representing power [W] value encoded in 4 bytes"""
+    """Sensor representing power [W] value encoded in 4 (unsigned) bytes"""
 
     def __init__(self, id_: str, offset: int, name: str, kind: Optional[SensorKind]):
         super().__init__(id_, offset, name, 4, "W", kind)
@@ -138,6 +161,16 @@ class Power4(Sensor):
         return read_bytes4(data)
 
 
+class Power4S(Sensor):
+    """Sensor representing power [W] value encoded in 4 (signed) bytes"""
+
+    def __init__(self, id_: str, offset: int, name: str, kind: Optional[SensorKind]):
+        super().__init__(id_, offset, name, 4, "W", kind)
+
+    def read_value(self, data: ProtocolResponse):
+        return read_bytes4_signed(data)
+
+
 class Energy(Sensor):
     """Sensor representing energy [kWh] value encoded in 2 bytes"""
 
@@ -146,10 +179,7 @@ class Energy(Sensor):
 
     def read_value(self, data: ProtocolResponse):
         value = read_bytes2(data)
-        if value == -1:
-            return None
-        else:
-            return float(value) / 10
+        return float(value) / 10
 
 
 class Energy4(Sensor):
@@ -160,10 +190,7 @@ class Energy4(Sensor):
 
     def read_value(self, data: ProtocolResponse):
         value = read_bytes4(data)
-        if value == -1:
-            return None
-        else:
-            return float(value) / 10
+        return float(value) / 10
 
 
 class Apparent(Sensor):
@@ -173,7 +200,7 @@ class Apparent(Sensor):
         super().__init__(id_, offset, name, 2, "VA", kind)
 
     def read_value(self, data: ProtocolResponse):
-        return read_bytes2(data)
+        return read_bytes2_signed(data)
 
 
 class Apparent4(Sensor):
@@ -183,7 +210,7 @@ class Apparent4(Sensor):
         super().__init__(id_, offset, name, 2, "VA", kind)
 
     def read_value(self, data: ProtocolResponse):
-        return read_bytes4(data)
+        return read_bytes4_signed(data)
 
 
 class Reactive(Sensor):
@@ -193,7 +220,7 @@ class Reactive(Sensor):
         super().__init__(id_, offset, name, 2, "var", kind)
 
     def read_value(self, data: ProtocolResponse):
-        return read_bytes2(data)
+        return read_bytes2_signed(data)
 
 
 class Reactive4(Sensor):
@@ -203,7 +230,7 @@ class Reactive4(Sensor):
         super().__init__(id_, offset, name, 2, "var", kind)
 
     def read_value(self, data: ProtocolResponse):
-        return read_bytes4(data)
+        return read_bytes4_signed(data)
 
 
 class Temp(Sensor):
@@ -277,7 +304,7 @@ class Integer(Sensor):
         super().__init__(id_, offset, name, 2, unit, kind)
 
     def read_value(self, data: ProtocolResponse):
-        return read_bytes2(data)
+        return read_bytes2_signed(data)
 
     def encode_value(self, value: Any, register_value: bytes = None) -> bytes:
         return int.to_bytes(int(value), length=2, byteorder="big", signed=True)
@@ -290,7 +317,7 @@ class Long(Sensor):
         super().__init__(id_, offset, name, 4, unit, kind)
 
     def read_value(self, data: ProtocolResponse):
-        return read_bytes4(data)
+        return read_bytes4_signed(data)
 
     def encode_value(self, value: Any, register_value: bytes = None) -> bytes:
         return int.to_bytes(int(value), length=4, byteorder="big", signed=True)
@@ -390,7 +417,7 @@ class EnumBitmap4(Sensor):
         raise NotImplementedError()
 
     def read(self, data: ProtocolResponse):
-        bits = read_bytes4(data, self.offset)
+        bits = read_bytes4_signed(data, self.offset)
         return decode_bitmap(bits if bits != -1 else 0, self._labels)
 
 
@@ -483,7 +510,7 @@ class EcoModeV1(Sensor, EcoMode):
         self.end_m = read_byte(data)
         if self.end_m < 0 or self.end_m > 59:
             raise ValueError(f"{self.id_}: end_m value {self.end_m} out of range.")
-        self.power = read_bytes2(data)  # negative=charge, positive=discharge
+        self.power = read_bytes2_signed(data)  # negative=charge, positive=discharge
         if self.power < -100 or self.power > 100:
             raise ValueError(f"{self.id_}: power value {self.power} out of range.")
         self.on_off = read_byte(data)
@@ -592,13 +619,13 @@ class Schedule(Sensor, EcoMode):
         self.days = decode_day_of_week(self.day_bits)
         if self.day_bits < 0:
             raise ValueError(f"{self.id_}: day_bits value {self.day_bits} out of range.")
-        self.power = read_bytes2(data)  # negative=charge, positive=discharge
+        self.power = read_bytes2_signed(data)  # negative=charge, positive=discharge
         if not self.schedule_type.is_in_range(self.power):
             raise ValueError(f"{self.id_}: power value {self.power} out of range.")
-        self.soc = read_bytes2(data)
+        self.soc = read_bytes2_signed(data)
         if self.soc < 0 or self.soc > 100:
             raise ValueError(f"{self.id_}: SoC value {self.soc} out of range.")
-        self.month_bits = read_bytes2(data)
+        self.month_bits = read_bytes2_signed(data)
         self.months = decode_months(self.month_bits)
         return self
 
@@ -704,6 +731,14 @@ def read_byte(buffer: ProtocolResponse, offset: int = None) -> int:
 
 
 def read_bytes2(buffer: ProtocolResponse, offset: int = None) -> int:
+    """Retrieve 2 byte (unsigned int) value from buffer"""
+    if offset is not None:
+        buffer.seek(offset)
+    value = int.from_bytes(buffer.read(2), byteorder="big", signed=False)
+    return value if value != 0xffff else 0
+
+
+def read_bytes2_signed(buffer: ProtocolResponse, offset: int = None) -> int:
     """Retrieve 2 byte (signed int) value from buffer"""
     if offset is not None:
         buffer.seek(offset)
@@ -711,6 +746,14 @@ def read_bytes2(buffer: ProtocolResponse, offset: int = None) -> int:
 
 
 def read_bytes4(buffer: ProtocolResponse, offset: int = None) -> int:
+    """Retrieve 4 byte (unsigned int) value from buffer"""
+    if offset is not None:
+        buffer.seek(offset)
+    value = int.from_bytes(buffer.read(4), byteorder="big", signed=False)
+    return value if value != 0xffffffff else 0
+
+
+def read_bytes4_signed(buffer: ProtocolResponse, offset: int = None) -> int:
     """Retrieve 4 byte (signed int) value from buffer"""
     if offset is not None:
         buffer.seek(offset)
@@ -736,20 +779,28 @@ def read_float4(buffer: ProtocolResponse, offset: int = None) -> float:
 
 
 def read_voltage(buffer: ProtocolResponse, offset: int = None) -> float:
-    """Retrieve voltage [V] value (2 bytes) from buffer"""
+    """Retrieve voltage [V] value (2 unsigned bytes) from buffer"""
     if offset is not None:
         buffer.seek(offset)
-    value = int.from_bytes(buffer.read(2), byteorder="big", signed=True)
-    return float(value) / 10
+    value = int.from_bytes(buffer.read(2), byteorder="big", signed=False)
+    return float(value) / 10 if value != 0xffff else 0
 
 
 def encode_voltage(value: Any) -> bytes:
-    """Encode voltage value to raw (2 bytes) payload"""
-    return int.to_bytes(int(value * 10), length=2, byteorder="big", signed=True)
+    """Encode voltage value to raw (2 unsigned bytes) payload"""
+    return int.to_bytes(int(value * 10), length=2, byteorder="big", signed=False)
 
 
 def read_current(buffer: ProtocolResponse, offset: int = None) -> float:
-    """Retrieve current [A] value (2 bytes) from buffer"""
+    """Retrieve current [A] value (2 unsigned bytes) from buffer"""
+    if offset is not None:
+        buffer.seek(offset)
+    value = int.from_bytes(buffer.read(2), byteorder="big", signed=False)
+    return float(value) / 10 if value != 0xffff else 0
+
+
+def read_current_signed(buffer: ProtocolResponse, offset: int = None) -> float:
+    """Retrieve current [A] value (2 signed bytes) from buffer"""
     if offset is not None:
         buffer.seek(offset)
     value = int.from_bytes(buffer.read(2), byteorder="big", signed=True)
@@ -757,7 +808,12 @@ def read_current(buffer: ProtocolResponse, offset: int = None) -> float:
 
 
 def encode_current(value: Any) -> bytes:
-    """Encode current value to raw (2 bytes) payload"""
+    """Encode current value to raw (2 unsigned bytes) payload"""
+    return int.to_bytes(int(value * 10), length=2, byteorder="big", signed=False)
+
+
+def encode_current_signed(value: Any) -> bytes:
+    """Encode current value to raw (2 signed bytes) payload"""
     return int.to_bytes(int(value * 10), length=2, byteorder="big", signed=True)
 
 
@@ -809,7 +865,7 @@ def encode_datetime(value: Any) -> bytes:
 
 def read_grid_mode(buffer: ProtocolResponse, offset: int = None) -> int:
     """Retrieve 'grid mode' sign value from buffer"""
-    value = read_bytes2(buffer, offset)
+    value = read_bytes2_signed(buffer, offset)
     if value < -90:
         return 2
     elif value >= 90:

{goodwe-0.3.1 → goodwe-0.3.2/goodwe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: goodwe
-Version: 0.3.1
+Version: 0.3.2
 Summary: Read data from GoodWe inverter via local network
 Home-page: https://github.com/marcelblijleven/goodwe
 Author: Martin Letenay, Marcel Blijleven

{goodwe-0.3.1 → goodwe-0.3.2}/tests/test_dt.py

@@ -64,9 +64,9 @@ class GW6000_DT_Test(DtMock):
         self.assertSensor('vpv3', None, 'V', data)
         self.assertSensor('ipv3', None, 'A', data)
         self.assertSensor('ppv3', None, 'W', data)
-        self.assertSensor('vline1', -0.1, 'V', data)
-        self.assertSensor('vline2', -0.1, 'V', data)
-        self.assertSensor('vline3', -0.1, 'V', data)
+        self.assertSensor('vline1', 0, 'V', data)
+        self.assertSensor('vline2', 0, 'V', data)
+        self.assertSensor('vline3', 0, 'V', data)
         self.assertSensor('vgrid1', 225.6, 'V', data)
         self.assertSensor('vgrid2', 229.7, 'V', data)
         self.assertSensor('vgrid3', 231.0, 'V', data)
@@ -167,8 +167,8 @@ class GW8K_DT_Test(DtMock):
         self.assertSensor("apparent_power", 0, "VA", data),
         self.assertSensor("reactive_power", 0, "var", data),
         self.assertSensor('temperature', 45.3, 'C', data)
-        self.assertSensor('e_day', None, 'kWh', data)
-        self.assertSensor('e_total', None, 'kWh', data)
+        self.assertSensor('e_day', 0.0, 'kWh', data)
+        self.assertSensor('e_total', 0.0, 'kWh', data)
         self.assertSensor('h_total', -1, 'h', data)
         self.assertSensor('safety_country', 32, '', data)
         self.assertSensor('safety_country_label', '50Hz 230Vac Default', '', data)
@@ -208,7 +208,7 @@ class GW5000D_NS_Test(DtMock):
         self.assertSensor('vpv2', 291.8, 'V', data)
         self.assertSensor('ipv2', 0, 'A', data)
         self.assertSensor('ppv2', 0, 'W', data)
-        self.assertSensor('vline1', -0.1, 'V', data)
+        self.assertSensor('vline1', 0, 'V', data)
         self.assertSensor('vgrid1', 240.5, 'V', data)
         self.assertSensor('igrid1', 0.0, 'A', data)
         self.assertSensor('fgrid1', 49.97, 'Hz', data)
@@ -228,7 +228,7 @@ class GW5000D_NS_Test(DtMock):
         self.assertSensor('safety_country_label', 'Australia Victoria', '', data)
         self.assertSensor('funbit', 2400, '', data)
         self.assertSensor('vbus', 291.7, 'V', data)
-        self.assertSensor('vnbus', -0.1, 'V', data)
+        self.assertSensor('vnbus', 0, 'V', data)
         self.assertSensor('derating_mode', -1, '', data)
         self.assertSensor('derating_mode_label', '', '', data)
 
@@ -274,7 +274,7 @@ class GW5000_MS_Test(DtMock):
         self.assertSensor('vpv3', 143.2, 'V', data)
         self.assertSensor('ipv3', 0.4, 'A', data)
         self.assertSensor('ppv3', 57, 'W', data)
-        self.assertSensor('vline1', -0.1, 'V', data)
+        self.assertSensor('vline1', 0, 'V', data)
         self.assertSensor('vgrid1', 240.1, 'V', data)
         self.assertSensor('igrid1', 0.9, 'A', data)
         self.assertSensor('fgrid1', 49.98, 'Hz', data)
@@ -294,7 +294,7 @@ class GW5000_MS_Test(DtMock):
         self.assertSensor('safety_country_label', 'Australia Victoria', '', data)
         self.assertSensor('funbit', 2384, '', data)
         self.assertSensor('vbus', 393.9, 'V', data)
-        self.assertSensor('vnbus', -0.1, 'V', data)
+        self.assertSensor('vnbus', 0, 'V', data)
         self.assertSensor('derating_mode', -1, '', data)
         self.assertSensor('derating_mode_label', '', '', data)
 

{goodwe-0.3.1 → goodwe-0.3.2}/tests/test_et.py

@@ -438,7 +438,7 @@ class GW6000_EH_Test(EtMock):
         self.assertSensor('temperature', 38.6, 'C', data)
         self.assertSensor('function_bit', 256, '', data)
         self.assertSensor('bus_voltage', 380.6, 'V', data)
-        self.assertSensor('nbus_voltage', -0.1, 'V', data)
+        self.assertSensor('nbus_voltage', 0, 'V', data)
         self.assertSensor('vbattery1', 0.0, 'V', data)
         self.assertSensor('ibattery1', 0.1, 'A', data)
         self.assertSensor('pbattery1', 0, 'W', data)
@@ -469,7 +469,7 @@ class GW6000_EH_Test(EtMock):
         self.assertSensor('diagnose_result_label',
                           'Battery voltage low, Battery SOC low, Battery SOC in back, Discharge Driver On, Self-use load light, Battery Disconnected, Self-use off, Export power limit set, PF value set, Real power limit set',
                           '', data)
-        self.assertSensor('house_consumption', 1710, 'W', data)
+        self.assertSensor('house_consumption', 1712, 'W', data)
 
 
 class GEH10_1U_10_Test(EtMock):
@@ -539,7 +539,7 @@ class GEH10_1U_10_Test(EtMock):
         self.assertSensor('temperature', 67.0, 'C', data)
         self.assertSensor('function_bit', 257, '', data)
         self.assertSensor('bus_voltage', 458.4, 'V', data)
-        self.assertSensor('nbus_voltage', -0.1, 'V', data)
+        self.assertSensor('nbus_voltage', 0, 'V', data)
         self.assertSensor('vbattery1', 406.1, 'V', data)
         self.assertSensor('ibattery1', -3.8, 'A', data)
         self.assertSensor('pbattery1', -1566, 'W', data)

{goodwe-0.3.1 → goodwe-0.3.2}/tests/test_sensor.py

@@ -78,6 +78,12 @@ class TestUtils(TestCase):
         self.assertEqual(803.6, testee.read(data))
         self.assertEqual("1f64", testee.encode_value(803.6).hex())
 
+        data = MockResponse("a000")
+        self.assertEqual(4096.0, testee.read(data))
+
+        data = MockResponse("ffff")
+        self.assertEqual(0, testee.read(data))
+
     def test_current(self):
         testee = Current("", 0, "", None)
 
@@ -85,6 +91,20 @@ class TestUtils(TestCase):
         self.assertEqual(4.9, testee.read(data))
         self.assertEqual("0031", testee.encode_value(4.9).hex())
 
+        data = MockResponse("ff9e")
+        self.assertEqual(6543.8, testee.read(data))
+        self.assertEqual("ff9e", testee.encode_value(6543.8).hex())
+
+        data = MockResponse("ffff")
+        self.assertEqual(0, testee.read(data))
+
+    def test_current_signed(self):
+        testee = CurrentS("", 0, "", None)
+
+        data = MockResponse("0031")
+        self.assertEqual(4.9, testee.read(data))
+        self.assertEqual("0031", testee.encode_value(4.9).hex())
+
         data = MockResponse("ff9e")
         self.assertEqual(-9.8, testee.read(data))
         self.assertEqual("ff9e", testee.encode_value(-9.8).hex())
@@ -95,6 +115,18 @@ class TestUtils(TestCase):
         data = MockResponse("0000069f")
         self.assertEqual(1695, testee.read(data))
 
+        data = MockResponse("fffffffd")
+        self.assertEqual(4294967293, testee.read(data))
+
+        data = MockResponse("ffffffff")
+        self.assertEqual(0, testee.read(data))
+
+    def test_power4_signed(self):
+        testee = Power4S("", 0, "", None)
+
+        data = MockResponse("0000069f")
+        self.assertEqual(1695, testee.read(data))
+
         data = MockResponse("fffffffd")
         self.assertEqual(-3, testee.read(data))
 
@@ -110,7 +142,7 @@ class TestUtils(TestCase):
         data = MockResponse("00020972")
         self.assertEqual(13349.0, testee.read(data))
         data = MockResponse("ffffffff")
-        self.assertIsNone(testee.read(data))
+        self.assertEqual(0.0, testee.read(data))
 
     def test_timestamp(self):
         testee = Timestamp("", 0, "", None)

goodwe-0.3.1/VERSION

@@ -1 +0,0 @@
-0.3.1