Skip to content

Commit 2373e8a

Browse files
TCWORLDTCWORLD
committed
Enable extra Meter2 registers for Proto < 100
These exist for GEN3, but were disabled for 4/5/6 except in protocol >=101. However these are present in the G4 V3.36 docs, so I suspect as with the other meter 2 registers these should just be always available.
1 parent 4561434 commit 2373e8a

1 file changed

Lines changed: 8 additions & 106 deletions

File tree

‎custom_components/solax_modbus/plugin_solax.py‎

Lines changed: 8 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -7965,35 +7965,7 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
79657965
register_type=REG_INPUT,
79667966
register_data_type=REGISTER_S32,
79677967
entity_registry_enabled_default=False,
7968-
allowedtypes=AC | HYBRID | GEN3,
7969-
),
7970-
SolaXModbusSensorEntityDescription(
7971-
name="Meter 2 Measured Power",
7972-
key="meter_2_measured_power",
7973-
native_unit_of_measurement=UnitOfPower.WATT,
7974-
device_class=SensorDeviceClass.POWER,
7975-
state_class=SensorStateClass.MEASUREMENT,
7976-
register=0xA8,
7977-
register_type=REG_INPUT,
7978-
register_data_type=REGISTER_S32,
7979-
entity_registry_enabled_default=False,
7980-
allowedtypes=AC | HYBRID | GEN4 | GEN5,
7981-
modbus_min=101,
7982-
),
7983-
SolaXModbusSensorEntityDescription(
7984-
name="Meter 2 Export Total",
7985-
key="meter_2_export_total",
7986-
native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
7987-
device_class=SensorDeviceClass.ENERGY,
7988-
state_class=SensorStateClass.TOTAL_INCREASING,
7989-
register=0xAA,
7990-
register_type=REG_INPUT,
7991-
register_data_type=REGISTER_U32,
7992-
scale=0.01,
7993-
rounding=2,
7994-
allowedtypes=AC | HYBRID | GEN3,
7995-
entity_registry_enabled_default=False,
7996-
icon="mdi:home-export-outline",
7968+
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | GEN6,
79977969
),
79987970
SolaXModbusSensorEntityDescription(
79997971
name="Meter 2 Export Total",
@@ -8006,8 +7978,7 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
80067978
register_data_type=REGISTER_U32,
80077979
scale=0.01,
80087980
rounding=2,
8009-
allowedtypes=AC | HYBRID | GEN4 | GEN5,
8010-
modbus_min=102,
7981+
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | GEN6,
80117982
entity_registry_enabled_default=False,
80127983
icon="mdi:home-export-outline",
80137984
),
@@ -8037,23 +8008,7 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
80378008
register_data_type=REGISTER_U32,
80388009
scale=0.01,
80398010
rounding=2,
8040-
allowedtypes=AC | HYBRID | GEN3,
8041-
entity_registry_enabled_default=False,
8042-
icon="mdi:home-export-outline",
8043-
),
8044-
SolaXModbusSensorEntityDescription(
8045-
name="Meter 2 Export Today",
8046-
key="meter_2_export_today",
8047-
native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
8048-
device_class=SensorDeviceClass.ENERGY,
8049-
state_class=SensorStateClass.TOTAL_INCREASING,
8050-
register=0xAE,
8051-
register_type=REG_INPUT,
8052-
register_data_type=REGISTER_U32,
8053-
scale=0.01,
8054-
rounding=2,
8055-
allowedtypes=AC | HYBRID | GEN4 | GEN5,
8056-
modbus_min=102,
8011+
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | GEN6,
80578012
entity_registry_enabled_default=False,
80588013
icon="mdi:home-export-outline",
80598014
),
@@ -8081,32 +8036,7 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
80818036
register=0xB2,
80828037
register_type=REG_INPUT,
80838038
register_data_type=REGISTER_S32,
8084-
allowedtypes=AC | HYBRID | GEN3 | X3,
8085-
entity_registry_enabled_default=False,
8086-
),
8087-
SolaXModbusSensorEntityDescription(
8088-
name="Meter 2 Measured Power L1",
8089-
key="meter_2_measured_power_l1",
8090-
native_unit_of_measurement=UnitOfPower.WATT,
8091-
device_class=SensorDeviceClass.POWER,
8092-
state_class=SensorStateClass.MEASUREMENT,
8093-
register=0xB2,
8094-
register_type=REG_INPUT,
8095-
register_data_type=REGISTER_S32,
8096-
allowedtypes=AC | HYBRID | GEN4 | GEN5 | X3,
8097-
modbus_min=101,
8098-
entity_registry_enabled_default=False,
8099-
),
8100-
SolaXModbusSensorEntityDescription(
8101-
name="Meter 2 Measured Power L2",
8102-
key="meter_2_measured_power_l2",
8103-
native_unit_of_measurement=UnitOfPower.WATT,
8104-
device_class=SensorDeviceClass.POWER,
8105-
state_class=SensorStateClass.MEASUREMENT,
8106-
register=0xB4,
8107-
register_type=REG_INPUT,
8108-
register_data_type=REGISTER_S32,
8109-
allowedtypes=AC | HYBRID | GEN3 | X3,
8039+
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | GEN6 | X3,
81108040
entity_registry_enabled_default=False,
81118041
),
81128042
SolaXModbusSensorEntityDescription(
@@ -8118,20 +8048,7 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
81188048
register=0xB4,
81198049
register_type=REG_INPUT,
81208050
register_data_type=REGISTER_S32,
8121-
allowedtypes=AC | HYBRID | GEN4 | GEN5 | X3,
8122-
modbus_min=101,
8123-
entity_registry_enabled_default=False,
8124-
),
8125-
SolaXModbusSensorEntityDescription(
8126-
name="Meter 2 Measured Power L3",
8127-
key="meter_2_measured_power_l3",
8128-
native_unit_of_measurement=UnitOfPower.WATT,
8129-
device_class=SensorDeviceClass.POWER,
8130-
state_class=SensorStateClass.MEASUREMENT,
8131-
register=0xB6,
8132-
register_type=REG_INPUT,
8133-
register_data_type=REGISTER_S32,
8134-
allowedtypes=AC | HYBRID | GEN3 | X3,
8051+
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | GEN6 | X3,
81358052
entity_registry_enabled_default=False,
81368053
),
81378054
SolaXModbusSensorEntityDescription(
@@ -8143,8 +8060,7 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
81438060
register=0xB6,
81448061
register_type=REG_INPUT,
81458062
register_data_type=REGISTER_S32,
8146-
allowedtypes=AC | HYBRID | GEN4 | GEN5 | X3,
8147-
modbus_min=101,
8063+
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | GEN6 | X3,
81488064
entity_registry_enabled_default=False,
81498065
),
81508066
SolaXModbusSensorEntityDescription(
@@ -8157,20 +8073,7 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
81578073
1: "Normal",
81588074
},
81598075
entity_registry_enabled_default=False,
8160-
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5,
8161-
entity_category=EntityCategory.DIAGNOSTIC,
8162-
),
8163-
SolaXModbusSensorEntityDescription(
8164-
name="Meter 2 Communication State",
8165-
key="meter_2_communication_state",
8166-
register=0xB9,
8167-
register_type=REG_INPUT,
8168-
scale={
8169-
0: "Communication Error",
8170-
1: "Normal",
8171-
},
8172-
entity_registry_enabled_default=False,
8173-
allowedtypes=AC | HYBRID | GEN3,
8076+
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | GEN6,
81748077
entity_category=EntityCategory.DIAGNOSTIC,
81758078
),
81768079
SolaXModbusSensorEntityDescription(
@@ -8183,8 +8086,7 @@ def value_function_battery_voltage_cell_difference(initval: int, descr: Any, dat
81838086
1: "Normal",
81848087
},
81858088
entity_registry_enabled_default=False,
8186-
allowedtypes=AC | HYBRID | GEN4 | GEN5,
8187-
modbus_min=101,
8089+
allowedtypes=AC | HYBRID | GEN3 | GEN4 | GEN5 | GEN6,
81888090
entity_category=EntityCategory.DIAGNOSTIC,
81898091
),
81908092
SolaXModbusSensorEntityDescription(

0 commit comments

Comments
 (0)