Merge branch 'main' into 2025.01.1

wills106 · Jan 5, 2025 · 3bf7bf9 · 3bf7bf9
2 parents dcdc499 + 4fb6fcf
commit 3bf7bf9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/custom_components/solax_modbus/__init__.py b/custom_components/solax_modbus/__init__.py
@@ -61,7 +61,7 @@ class CoreModbusHub:
 from pymodbus.constants import Endian
 from pymodbus.exceptions import ConnectionException, ModbusIOException
 from pymodbus.payload import BinaryPayloadBuilder, BinaryPayloadDecoder, Endian
-from pymodbus.framer import FramerType
+from pymodbus.transaction import ModbusAsciiFramer, ModbusRtuFramer
 
 from .const import (
     INVERTER_IDENT,
@@ -259,10 +259,10 @@ def __init__(
             )
         elif interface == "tcp":
             if tcp_type == "rtu":
-                self._client = AsyncModbusTcpClient(host=host, port=port, timeout=5, framer=FramerType.Rtu, retries=6)
+                self._client = AsyncModbusTcpClient(host=host, port=port, timeout=5, framer=ModbusRtuFramer, retries=6)
             elif tcp_type == "ascii":
                 self._client = AsyncModbusTcpClient(
-                    host=host, port=port, timeout=5, framer=FramerType.Ascii, retries=6
+                    host=host, port=port, timeout=5, framer=ModbusAsciiFramer, retries=6
                 )
             else:
                 self._client = AsyncModbusTcpClient(host=host, port=port, timeout=5, retries=6)

diff --git a/custom_components/solax_modbus/manifest.json b/custom_components/solax_modbus/manifest.json
@@ -10,5 +10,5 @@
   "iot_class": "local_polling",
   "issue_tracker": "https://github.com/wills106/homsassistant-solax-modbus/issues",
   "requirements": ["pymodbus==3.7.4"],
-  "version": "2025.01.0b2"
+  "version": "2025.01.1"
 }
diff --git a/hacs.json b/hacs.json
@@ -1,5 +1,5 @@
 {
     "name": "SolaX Inverter Modbus",
     "render_readme": true,
-    "homeassistant": "2025.1.0b1"
+    "homeassistant": "2024.9.0"
 }