From ba57438b7e1bf3d6f2a2332e9525ab27c17070ad Mon Sep 17 00:00:00 2001
From: jschmitz-de <38846096+jschmitz-de@users.noreply.github.com>
Date: Wed, 5 Feb 2025 20:32:31 +0100
Subject: [PATCH] Update entity_descriptions.py

Changed
- Version_Master 36001 to Hex
- Version_Slave 36002 to Hex
- rFreq to Register 39139
# For H3-Pro-15.0 Version_Master:1.56 Version_Slave:1.06, Version_Arm 1.17
---
 .../foxess_modbus/entities/entity_descriptions.py  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/custom_components/foxess_modbus/entities/entity_descriptions.py b/custom_components/foxess_modbus/entities/entity_descriptions.py
index 56ec26e..2e1f13a 100644
--- a/custom_components/foxess_modbus/entities/entity_descriptions.py
+++ b/custom_components/foxess_modbus/entities/entity_descriptions.py
@@ -63,14 +63,15 @@ def _master_version(address: list[ModbusAddressSpec], is_hex: bool) -> ModbusVer
         address=[
             ModbusAddressSpec(input=10016, models=Inv.H1_G1 | Inv.KH_PRE119),
             ModbusAddressSpec(holding=30016, models=Inv.H1_G1 | Inv.H1_LAN | Inv.H3_SET),
-            ModbusAddressSpec(holding=36001, models=Inv.H3_PRO),
+            # For H3-Pro-15.0 Version_Master:1.56 Version_Slave:1.06, Version_Arm 1.17
+            # ModbusAddressSpec(holding=36001, models=Inv.H3_PRO),
         ],
         is_hex=False,
     )
     yield _master_version(
         address=[
             ModbusAddressSpec(holding=30016, models=Inv.KH_PRE133),
-            ModbusAddressSpec(holding=36001, models=Inv.H1_G2_SET | Inv.KH_133),
+            ModbusAddressSpec(holding=36001, models=Inv.H1_G2_SET | Inv.KH_133 | Inv.H3_PRO),
         ],
         is_hex=True,
     )
@@ -88,14 +89,15 @@ def _slave_version(address: list[ModbusAddressSpec], is_hex: bool) -> ModbusVers
         address=[
             ModbusAddressSpec(input=10017, models=Inv.H1_G1 | Inv.KH_PRE119),
             ModbusAddressSpec(holding=30017, models=Inv.H1_G1 | Inv.H1_LAN | Inv.H3_SET),
-            ModbusAddressSpec(holding=36002, models=Inv.H3_PRO),
+            # For H3-Pro-15.0 Version_Master:1.56 Version_Slave:1.06, Version_Arm 1.17
+            # ModbusAddressSpec(holding=36002, models=Inv.H3_PRO),
         ],
         is_hex=False,
     )
     yield _slave_version(
         address=[
             ModbusAddressSpec(holding=30017, models=Inv.KH_PRE133),
-            ModbusAddressSpec(holding=36002, models=Inv.H1_G2_SET | Inv.KH_133),
+            ModbusAddressSpec(holding=36002, models=Inv.H1_G2_SET | Inv.KH_133 | Inv.H3_PRO),
         ],
         is_hex=True,
     )
@@ -1313,7 +1315,9 @@ def _invbatpower(index: int | None, addresses: list[ModbusAddressesSpec]) -> Ite
                 holding=[31009], models=Inv.H1_G1 | Inv.H1_LAN | Inv.H1_G2_SET | Inv.KH_PRE133 | Inv.KH_133
             ),
             ModbusAddressesSpec(holding=[31015], models=Inv.H3_SET),
-            ModbusAddressesSpec(holding=[38847, 38846], models=Inv.H3_PRO),
+            # ModbusAddressesSpec(holding=[38847, 38846], models=Inv.H3_PRO),
+            # For H3-Pro-15.0 Version_Master:1.56 Version_Slave:1.06, Version_Arm 1.17
+            ModbusAddressesSpec(holding=[39139], models=Inv.H3_PRO),
         ],
         entity_registry_enabled_default=False,
         name="Grid Frequency",