From 460ad5b9c607361ab142f0563f90d15c72c0ec14 Mon Sep 17 00:00:00 2001 From: Antony Male Date: Thu, 20 Apr 2023 17:39:30 +0100 Subject: [PATCH] Add some missing addresses from https://github.com/TonyM1958/HA-FoxESS-Modbus --- .../entities/entity_descriptions.py | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/custom_components/foxess_modbus/entities/entity_descriptions.py b/custom_components/foxess_modbus/entities/entity_descriptions.py index d850324..021fb21 100644 --- a/custom_components/foxess_modbus/entities/entity_descriptions.py +++ b/custom_components/foxess_modbus/entities/entity_descriptions.py @@ -152,7 +152,7 @@ _H1_CURRENT_VOLTAGE_POWER_ENTITIES = [ ModbusSensorDescription( key="invbatvolt", - addresses=[ModbusAddressesSpec(models=[H1, AIO_H1, AC1], input=[11006])], + addresses=[ModbusAddressesSpec(models=[H1, AIO_H1, AC1], input=[11006], holding=[31020])], name="Inverter Battery Voltage", device_class=SensorDeviceClass.VOLTAGE, state_class=SensorStateClass.MEASUREMENT, @@ -162,7 +162,7 @@ ), ModbusSensorDescription( key="invbatcurrent", - addresses=[ModbusAddressesSpec(models=[H1, AIO_H1, AC1], input=[11007])], + addresses=[ModbusAddressesSpec(models=[H1, AIO_H1, AC1], input=[11007], holding=[31021])], name="Inverter Battery Current", device_class=SensorDeviceClass.CURRENT, state_class=SensorStateClass.MEASUREMENT, @@ -511,7 +511,7 @@ ), ModbusSensorDescription( key="rpower", - addresses=[ModbusAddressesSpec(models=[H1, AIO_H1, AC1], input=[11011])], + addresses=[ModbusAddressesSpec(models=[H1, AIO_H1, AC1], input=[11011], holding=[31008])], name="Inverter Power", device_class=SensorDeviceClass.POWER, state_class=SensorStateClass.MEASUREMENT, @@ -536,7 +536,7 @@ ), ModbusSensorDescription( key="eps_rvolt", - addresses=[ModbusAddressesSpec(models=[H1, AIO_H1, AC1], input=[11015])], + addresses=[ModbusAddressesSpec(models=[H1, AIO_H1, AC1], input=[11015], holding=[31010])], name="EPS Voltage", device_class=SensorDeviceClass.VOLTAGE, state_class=SensorStateClass.MEASUREMENT, @@ -544,9 +544,34 @@ scale=0.1, validate=[Range(0, 300)], ), + ModbusSensorDescription( + key="eps_rcurrent", + addresses=[ + ModbusAddressesSpec( + models=[H1, AIO_H1, AC1], input=[11016], holding=[31011] + ) + ], + name="EPS Current", + device_class=SensorDeviceClass.CURRENT, + state_class=SensorStateClass.MEASUREMENT, + native_unit_of_measurement="A", + scale=0.1, + validate=[Range(0, 100)], + ), + ModbusSensorDescription( + key="eps_rpower", + addresses=[ModbusAddressesSpec(models=[H1, AIO_H1, AC1], input=[11017], holding=[31012])], + name="EPS Power", + device_class=SensorDeviceClass.POWER, + state_class=SensorStateClass.MEASUREMENT, + native_unit_of_measurement="kW", + scale=0.001, + validate=[Range(-10000, 10000)], + ), ModbusSensorDescription( key="eps_frequency", addresses=[ + ModbusAddressesSpec(models=[H1, AIO_H1, AC1], input=[11020], holding=[31013]), ModbusAddressesSpec(models=[H3], holding=[31025]), ], name="Inverter Frequency",