Remove battery_soh, bms_cell_temp_* and bms_kwh_remaining

This reverts nathanmarlor#703 and nathanmarlor#704, due to complaints that this breaks some H3s, Kuara H3s, and KHs. See: nathanmarlor#756
canton7 · Feb 2, 2025 · ab0049b · ab0049b
1 parent 6f45cae
commit ab0049b
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 238 deletions.
diff --git a/custom_components/foxess_modbus/entities/entity_descriptions.py b/custom_components/foxess_modbus/entities/entity_descriptions.py
@@ -2116,11 +2116,13 @@ def _inner(
             ),
             ModbusAddressesSpec(holding=[31038], models=Inv.H3_SET),
         ],
-        battery_soh=[
-            ModbusAddressesSpec(input=[11104], models=Inv.KH_PRE119),
-            ModbusAddressesSpec(holding=[37624], models=Inv.H1_G2_SET | Inv.KH_PRE133 | Inv.KH_133),
-            ModbusAddressesSpec(holding=[31090], models=Inv.H3_SET),
-        ],
+        # Temporarily removed, see #756
+        battery_soh=[],
+        # battery_soh=[
+        #     ModbusAddressesSpec(input=[11104], models=Inv.KH_PRE119),
+        #     ModbusAddressesSpec(holding=[37624], models=Inv.H1_G2_SET | Inv.KH_PRE133 | Inv.KH_133),
+        #     ModbusAddressesSpec(holding=[31090], models=Inv.H3_SET),
+        # ],
         battery_temp=[
             ModbusAddressesSpec(input=[11038], models=Inv.H1_G1 | Inv.KH_PRE119),
             ModbusAddressesSpec(
@@ -2131,12 +2133,14 @@ def _inner(
         bms_cell_temp_high=[
             ModbusAddressesSpec(input=[11043], models=Inv.H1_G1 | Inv.KH_PRE119),
             ModbusAddressesSpec(holding=[37617], models=Inv.H1_G2_144 | Inv.KH_PRE133 | Inv.KH_133),
-            ModbusAddressesSpec(holding=[31102], models=Inv.H3_SET),
+            # Temporarily removed, see #756
+            # ModbusAddressesSpec(holding=[31102], models=Inv.H3_SET),
         ],
         bms_cell_temp_low=[
             ModbusAddressesSpec(input=[11044], models=Inv.H1_G1 | Inv.KH_PRE119),
             ModbusAddressesSpec(holding=[37618], models=Inv.H1_G2_144 | Inv.KH_PRE133 | Inv.KH_133),
-            ModbusAddressesSpec(holding=[31103], models=Inv.H3_SET),
+            # Temporarily removed, see #756
+            # ModbusAddressesSpec(holding=[31103], models=Inv.H3_SET),
         ],
         bms_cell_mv_high=[
             ModbusAddressesSpec(input=[11045], models=Inv.H1_G1 | Inv.KH_PRE119),
@@ -2151,7 +2155,8 @@ def _inner(
         bms_kwh_remaining=[
             ModbusAddressesSpec(input=[11037], models=Inv.H1_G1 | Inv.KH_PRE119),
             ModbusAddressesSpec(holding=[37632], models=Inv.H1_G2_SET | Inv.KH_PRE133 | Inv.KH_133),
-            ModbusAddressesSpec(holding=[31123], models=Inv.H3_SET),
+            # Temporarily removed, see #756
+            # ModbusAddressesSpec(holding=[31123], models=Inv.H3_SET),
         ],
     )
     yield from _inner(
@@ -2160,7 +2165,9 @@ def _inner(
         batvolt=[ModbusAddressesSpec(holding=[37609], models=Inv.H3_PRO)],
         bat_current=[ModbusAddressesSpec(holding=[37610], models=Inv.H3_PRO)],
         battery_soc=[ModbusAddressesSpec(holding=[37612], models=Inv.H3_PRO)],
-        battery_soh=[ModbusAddressesSpec(holding=[37624], models=Inv.H3_PRO)],
+        # Temporarily removed, see #756
+        battery_soh=[],
+        # battery_soh=[ModbusAddressesSpec(holding=[37624], models=Inv.H3_PRO)],
         battery_temp=[ModbusAddressesSpec(holding=[37611], models=Inv.H3_PRO)],
         bms_cell_temp_high=[ModbusAddressesSpec(holding=[37617], models=Inv.H3_PRO)],
         bms_cell_temp_low=[ModbusAddressesSpec(holding=[37618], models=Inv.H3_PRO)],
@@ -2174,7 +2181,9 @@ def _inner(
         batvolt=[ModbusAddressesSpec(holding=[38307], models=Inv.H3_PRO)],
         bat_current=[ModbusAddressesSpec(holding=[38308], models=Inv.H3_PRO)],
         battery_soc=[ModbusAddressesSpec(holding=[38310], models=Inv.H3_PRO)],
-        battery_soh=[ModbusAddressesSpec(holding=[38322], models=Inv.H3_PRO)],
+        # Temporarily removed, see #756
+        battery_soh=[],
+        # battery_soh=[ModbusAddressesSpec(holding=[38322], models=Inv.H3_PRO)],
         battery_temp=[ModbusAddressesSpec(holding=[38309], models=Inv.H3_PRO)],
         bms_cell_temp_high=[ModbusAddressesSpec(holding=[38315], models=Inv.H3_PRO)],
         bms_cell_temp_low=[ModbusAddressesSpec(holding=[38316], models=Inv.H3_PRO)],

diff --git a/..._snapshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.AIO_H3].json b/..._snapshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.AIO_H3].json
@@ -109,18 +109,6 @@
     "signed": false,
     "type": "sensor"
   },
-  {
-    "addresses": {
-      "holding": [
-        31090
-      ]
-    },
-    "key": "battery_soh",
-    "name": "Battery SoH",
-    "scale": null,
-    "signed": false,
-    "type": "sensor"
-  },
   {
     "addresses": {
       "holding": [
@@ -145,42 +133,6 @@
     "signed": true,
     "type": "sensor"
   },
-  {
-    "addresses": {
-      "holding": [
-        31102
-      ]
-    },
-    "key": "bms_cell_temp_high",
-    "name": "BMS Cell Temp High",
-    "scale": 0.1,
-    "signed": true,
-    "type": "sensor"
-  },
-  {
-    "addresses": {
-      "holding": [
-        31103
-      ]
-    },
-    "key": "bms_cell_temp_low",
-    "name": "BMS Cell Temp Low",
-    "scale": 0.1,
-    "signed": true,
-    "type": "sensor"
-  },
-  {
-    "addresses": {
-      "holding": [
-        31123
-      ]
-    },
-    "key": "bms_kwh_remaining",
-    "name": "BMS kWh Remaining",
-    "scale": 0.01,
-    "signed": false,
-    "type": "sensor"
-  },
   {
     "addresses": {
       "holding": [

diff --git a/...apshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.H1_G2_144].json b/...apshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.H1_G2_144].json
@@ -109,18 +109,6 @@
     "signed": false,
     "type": "sensor"
   },
-  {
-    "addresses": {
-      "holding": [
-        37624
-      ]
-    },
-    "key": "battery_soh",
-    "name": "Battery SoH",
-    "scale": null,
-    "signed": false,
-    "type": "sensor"
-  },
   {
     "addresses": {
       "holding": [

diff --git a/...hots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.H1_G2_PRE144].json b/...hots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.H1_G2_PRE144].json
@@ -97,18 +97,6 @@
     "signed": false,
     "type": "sensor"
   },
-  {
-    "addresses": {
-      "holding": [
-        37624
-      ]
-    },
-    "key": "battery_soh",
-    "name": "Battery SoH",
-    "scale": null,
-    "signed": false,
-    "type": "sensor"
-  },
   {
     "addresses": {
       "holding": [

diff --git a/tests/__snapshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.H3].json b/tests/__snapshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.H3].json
@@ -109,18 +109,6 @@
     "signed": false,
     "type": "sensor"
   },
-  {
-    "addresses": {
-      "holding": [
-        31090
-      ]
-    },
-    "key": "battery_soh",
-    "name": "Battery SoH",
-    "scale": null,
-    "signed": false,
-    "type": "sensor"
-  },
   {
     "addresses": {
       "holding": [
@@ -145,42 +133,6 @@
     "signed": true,
     "type": "sensor"
   },
-  {
-    "addresses": {
-      "holding": [
-        31102
-      ]
-    },
-    "key": "bms_cell_temp_high",
-    "name": "BMS Cell Temp High",
-    "scale": 0.1,
-    "signed": true,
-    "type": "sensor"
-  },
-  {
-    "addresses": {
-      "holding": [
-        31103
-      ]
-    },
-    "key": "bms_cell_temp_low",
-    "name": "BMS Cell Temp Low",
-    "scale": 0.1,
-    "signed": true,
-    "type": "sensor"
-  },
-  {
-    "addresses": {
-      "holding": [
-        31123
-      ]
-    },
-    "key": "bms_kwh_remaining",
-    "name": "BMS kWh Remaining",
-    "scale": 0.01,
-    "signed": false,
-    "type": "sensor"
-  },
   {
     "addresses": {
       "holding": [

diff --git a/..._snapshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.H3_PRO].json b/..._snapshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.H3_PRO].json
@@ -177,30 +177,6 @@
     "signed": false,
     "type": "sensor"
   },
-  {
-    "addresses": {
-      "holding": [
-        37624
-      ]
-    },
-    "key": "battery_soh_1",
-    "name": "Battery 1 SoH",
-    "scale": null,
-    "signed": false,
-    "type": "sensor"
-  },
-  {
-    "addresses": {
-      "holding": [
-        38322
-      ]
-    },
-    "key": "battery_soh_2",
-    "name": "Battery 2 SoH",
-    "scale": null,
-    "signed": false,
-    "type": "sensor"
-  },
   {
     "addresses": {
       "holding": [

diff --git a/..._snapshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.KH_133].json b/..._snapshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.KH_133].json
@@ -97,18 +97,6 @@
     "signed": false,
     "type": "sensor"
   },
-  {
-    "addresses": {
-      "holding": [
-        37624
-      ]
-    },
-    "key": "battery_soh",
-    "name": "Battery SoH",
-    "scale": null,
-    "signed": false,
-    "type": "sensor"
-  },
   {
     "addresses": {
       "holding": [

diff --git a/...apshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.KH_PRE119].json b/...apshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.KH_PRE119].json
@@ -109,18 +109,6 @@
     "signed": false,
     "type": "sensor"
   },
-  {
-    "addresses": {
-      "input": [
-        11104
-      ]
-    },
-    "key": "battery_soh",
-    "name": "Battery SoH",
-    "scale": null,
-    "signed": false,
-    "type": "sensor"
-  },
   {
     "addresses": {
       "input": [

diff --git a/...apshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.KH_PRE133].json b/...apshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.KH_PRE133].json
@@ -97,18 +97,6 @@
     "signed": false,
     "type": "sensor"
   },
-  {
-    "addresses": {
-      "holding": [
-        37624
-      ]
-    },
-    "key": "battery_soh",
-    "name": "Battery SoH",
-    "scale": null,
-    "signed": false,
-    "type": "sensor"
-  },
   {
     "addresses": {
       "holding": [

diff --git a/...napshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.KUARA_H3].json b/...napshots__/test_entity_descriptions/test_entity_descriptions_for_model[Inv.KUARA_H3].json
@@ -109,18 +109,6 @@
     "signed": false,
     "type": "sensor"
   },
-  {
-    "addresses": {
-      "holding": [
-        31090
-      ]
-    },
-    "key": "battery_soh",
-    "name": "Battery SoH",
-    "scale": null,
-    "signed": false,
-    "type": "sensor"
-  },
   {
     "addresses": {
       "holding": [
@@ -145,42 +133,6 @@
     "signed": true,
     "type": "sensor"
   },
-  {
-    "addresses": {
-      "holding": [
-        31102
-      ]
-    },
-    "key": "bms_cell_temp_high",
-    "name": "BMS Cell Temp High",
-    "scale": 0.1,
-    "signed": true,
-    "type": "sensor"
-  },
-  {
-    "addresses": {
-      "holding": [
-        31103
-      ]
-    },
-    "key": "bms_cell_temp_low",
-    "name": "BMS Cell Temp Low",
-    "scale": 0.1,
-    "signed": true,
-    "type": "sensor"
-  },
-  {
-    "addresses": {
-      "holding": [
-        31123
-      ]
-    },
-    "key": "bms_kwh_remaining",
-    "name": "BMS kWh Remaining",
-    "scale": 0.01,
-    "signed": false,
-    "type": "sensor"
-  },
   {
     "addresses": {
       "holding": [