python-qube-heatpump 1.2.1__py3-none-any.whl → 1.2.3__py3-none-any.whl

python_qube_heatpump/client.py

@@ -1,11 +1,10 @@
 """Client for Qube Heat Pump."""
 
 import logging
+import struct
 from typing import Optional
 
 from pymodbus.client import AsyncModbusTcpClient
-from pymodbus.payload import BinaryPayloadDecoder
-from pymodbus.constants import Endian
 
 from . import const
 from .models import QubeState
@@ -47,11 +46,33 @@ class QubeClient:
         async def _read(const_def):
             return await self.read_value(const_def)
 
-        # Fetch basic sensors
+        # Fetch temperature sensors
         state.temp_supply = await _read(const.TEMP_SUPPLY)
         state.temp_return = await _read(const.TEMP_RETURN)
-        state.temp_outside = await _read(const.TEMP_OUTSIDE)
+        state.temp_source_in = await _read(const.TEMP_SOURCE_IN)
+        state.temp_source_out = await _read(const.TEMP_SOURCE_OUT)
+        state.temp_room = await _read(const.TEMP_ROOM)
         state.temp_dhw = await _read(const.TEMP_DHW)
+        state.temp_outside = await _read(const.TEMP_OUTSIDE)
+
+        # Fetch power and energy sensors
+        state.power_thermic = await _read(const.POWER_THERMIC)
+        state.power_electric = await _read(const.POWER_ELECTRIC_CALC)
+        state.energy_total_electric = await _read(const.ENERGY_ELECTRIC_TOTAL)
+        state.energy_total_thermic = await _read(const.ENERGY_THERMIC_TOTAL)
+        state.cop_calc = await _read(const.COP_CALC)
+
+        # Fetch operation sensors
+        state.status_code = await _read(const.STATUS_CODE)
+        state.compressor_speed = await _read(const.COMPRESSOR_SPEED)
+        state.flow_rate = await _read(const.FLOW_RATE)
+
+        # Fetch setpoints (holding registers)
+        state.setpoint_room_heat_day = await _read(const.SETPOINT_HEAT_DAY)
+        state.setpoint_room_heat_night = await _read(const.SETPOINT_HEAT_NIGHT)
+        state.setpoint_room_cool_day = await _read(const.SETPOINT_COOL_DAY)
+        state.setpoint_room_cool_night = await _read(const.SETPOINT_COOL_NIGHT)
+        state.setpoint_dhw = await _read(const.USER_DHW_SETPOINT)
 
         return state
 
@@ -80,16 +101,48 @@ class QubeClient:
                 _LOGGER.warning("Error reading address %s", address)
                 return None
 
-            decoder = BinaryPayloadDecoder.fromRegisters(
-                result.registers, byteorder=Endian.Big, wordorder=Endian.Little
-            )
+            regs = result.registers
+            val = 0
+
+            # Manual decoding to avoid pymodbus.payload dependencies
+            # Assuming Little Endian Word Order for 32-bit values [LSW, MSW] per standard Modbus often used
+            # But the original code used Endian.Little WordOrder.
+            # Decoder: byteorder=Endian.Big, wordorder=Endian.Little
+            # Big Endian Bytes: [H, L]
+            # Little Endian Words: [Reg0, Reg1] -> [LSW, MSW]
+            #
+            # Example Float32: 123.456
+            # Reg0 (LSW)
+            # Reg1 (MSW)
+            # Full 32-bit int: (Reg1 << 16) | Reg0
+            # Then pack as >I (Big Endian 32-bit int) and unpack as >f (Big Endian float)?
+            #
+            # Wait, PyModbus BinaryPayloadDecoder.fromRegisters(registers, byteorder=Endian.Big, wordorder=Endian.Little)
+            # ByteOrder Big: Normal network byte order per register.
+            # WordOrder Little: The first register is the least significant word.
+            #
+            # So:
+            # 32-bit value = (regs[1] << 16) | regs[0]
+            # Then interpret that 32-bit integer as a float.
+            # To interpret int bits as float in Python: struct.unpack('!f', struct.pack('!I', int_val))[0]
 
             if data_type == const.DataType.FLOAT32:
-                val = decoder.decode_32bit_float()
+                # Combine 2 registers, Little Endian Word Order
+                int_val = (regs[1] << 16) | regs[0]
+                val = struct.unpack(">f", struct.pack(">I", int_val))[0]
             elif data_type == const.DataType.INT16:
-                val = decoder.decode_16bit_int()
+                val = regs[0]
+                # Signed 16-bit
+                if val > 32767:
+                    val -= 65536
             elif data_type == const.DataType.UINT16:
-                val = decoder.decode_16bit_uint()
+                val = regs[0]
+            elif data_type == const.DataType.UINT32:
+                val = (regs[1] << 16) | regs[0]
+            elif data_type == const.DataType.INT32:
+                val = (regs[1] << 16) | regs[0]
+                if val > 2147483647:
+                    val -= 4294967296
             else:
                 val = 0
 

python_qube_heatpump/const.py

@@ -16,6 +16,8 @@ class DataType(str, Enum):
     FLOAT32 = "float32"
     INT16 = "int16"
     UINT16 = "uint16"
+    INT32 = "int32"
+    UINT32 = "uint32"
 
 
 # Register definitions (Address, Type, Data Type, Scale, Offset)

{python_qube_heatpump-1.2.1.dist-info → python_qube_heatpump-1.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-qube-heatpump
-Version: 1.2.1
+Version: 1.2.3
 Summary: Async Modbus client for Qube Heat Pumps
 Project-URL: Homepage, https://github.com/MattieGit/python-qube-heatpump
 Project-URL: Bug Tracker, https://github.com/MattieGit/python-qube-heatpump/issues

python_qube_heatpump-1.2.3.dist-info/RECORD

@@ -0,0 +1,8 @@
+python_qube_heatpump/__init__.py,sha256=eW8_tyAweg7YTOI599pi8gf3mt7aXW0SCw5ZyrBVJpU,57
+python_qube_heatpump/client.py,sha256=BgCJbQBV57cfsWMfakjbs2VXgrQ8BZH8KnX1pnTke7k,6083
+python_qube_heatpump/const.py,sha256=sXvXRcDb1uvBgzH2lV67Me_XtUErKA3fXMLO9gEGrlQ,3680
+python_qube_heatpump/models.py,sha256=3I5U9_rEe1r73hwY4sNAMXfIxyPjBOtx06c_mAURLDk,1141
+python_qube_heatpump-1.2.3.dist-info/METADATA,sha256=P-_IjdAl1jsiU4xYN_6oqlYK6gPvN8mvxM3qwU5tGmY,950
+python_qube_heatpump-1.2.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+python_qube_heatpump-1.2.3.dist-info/licenses/LICENSE,sha256=qpuQXN7QwpILG9GYcmqrd3Ax5CxBZUBoT295xTgKnOM,1062
+python_qube_heatpump-1.2.3.dist-info/RECORD,,

python_qube_heatpump-1.2.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-python_qube_heatpump/__init__.py,sha256=eW8_tyAweg7YTOI599pi8gf3mt7aXW0SCw5ZyrBVJpU,57
-python_qube_heatpump/client.py,sha256=XNVCydP6uKIlUbH28FjcA9oXYumNRy5NBCqPrVMCX60,3360
-python_qube_heatpump/const.py,sha256=bAFNIN8uwXIdQ5VGgSYdFrQYUNDcDXlxr0OkBxlKUYw,3638
-python_qube_heatpump/models.py,sha256=3I5U9_rEe1r73hwY4sNAMXfIxyPjBOtx06c_mAURLDk,1141
-python_qube_heatpump-1.2.1.dist-info/METADATA,sha256=nqZty88ZKHR7RvM4F1TsxsuFpQoBetXHva29iOv8n1Q,950
-python_qube_heatpump-1.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-python_qube_heatpump-1.2.1.dist-info/licenses/LICENSE,sha256=qpuQXN7QwpILG9GYcmqrd3Ax5CxBZUBoT295xTgKnOM,1062
-python_qube_heatpump-1.2.1.dist-info/RECORD,,