python-qube-heatpump 1.4.2__tar.gz → 1.4.4__tar.gz

{python_qube_heatpump-1.4.2 → python_qube_heatpump-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-qube-heatpump
-Version: 1.4.2
+Version: 1.4.4
 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.4.2 → python_qube_heatpump-1.4.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "python-qube-heatpump"
-version = "1.4.2"
+version = "1.4.4"
 authors = [
   { name="MattieGit", email="6250046+MattieGit@users.noreply.github.com" },
 ]

{python_qube_heatpump-1.4.2 → python_qube_heatpump-1.4.4}/src/python_qube_heatpump/client.py

@@ -162,18 +162,14 @@ class QubeClient:
             # 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]
+            # Qube uses Big Endian word order (ABCD format):
+            # regs[0] = MSW (Most Significant Word)
+            # regs[1] = LSW (Least Significant Word)
+            # 32-bit value = (regs[0] << 16) | regs[1]
 
             if data_type == const.DataType.FLOAT32:
-                # Combine 2 registers, Little Endian Word Order
-                int_val = (regs[1] << 16) | regs[0]
+                # Combine 2 registers, Big Endian Word Order
+                int_val = (regs[0] << 16) | regs[1]
                 val = struct.unpack(">f", struct.pack(">I", int_val))[0]
             elif data_type == const.DataType.INT16:
                 val = regs[0]
@@ -183,9 +179,11 @@ class QubeClient:
             elif data_type == const.DataType.UINT16:
                 val = regs[0]
             elif data_type == const.DataType.UINT32:
-                val = (regs[1] << 16) | regs[0]
+                int_val = (regs[0] << 16) | regs[1]
+                val = int_val
             elif data_type == const.DataType.INT32:
-                val = (regs[1] << 16) | regs[0]
+                int_val = (regs[0] << 16) | regs[1]
+                val = int_val
                 if val > 2147483647:
                     val -= 4294967296
             else:
@@ -212,14 +210,23 @@ class QubeClient:
             The read value (float, int, or bool depending on entity type).
         """
         # Determine register count based on data type
-        if entity.data_type in (DataType.FLOAT32, DataType.UINT32, DataType.INT32):
+        # Use string comparison to handle potential enum class differences
+        data_type_str = entity.data_type.value if entity.data_type else None
+        if data_type_str in ("float32", "uint32", "int32"):
             count = 2
         else:
             count = 1
 
+        _LOGGER.debug(
+            "read_entity: key=%s addr=%s input_type=%s data_type=%s count=%s",
+            entity.key, entity.address, entity.input_type, data_type_str, count
+        )
+
         try:
-            # Read based on input type
-            if entity.input_type == InputType.COIL:
+            # Read based on input type (use string comparison for safety)
+            input_type_str = entity.input_type.value if entity.input_type else None
+
+            if input_type_str == "coil":
                 result = await self._client.read_coils(
                     entity.address, count=1, device_id=self.unit
                 )
@@ -228,7 +235,7 @@ class QubeClient:
                     return None
                 return bool(result.bits[0])
 
-            if entity.input_type == InputType.DISCRETE_INPUT:
+            if input_type_str == "discrete_input":
                 result = await self._client.read_discrete_inputs(
                     entity.address, count=1, device_id=self.unit
                 )
@@ -237,11 +244,11 @@ class QubeClient:
                     return None
                 return bool(result.bits[0])
 
-            if entity.input_type == InputType.INPUT_REGISTER:
+            if input_type_str == "input":
                 result = await self._client.read_input_registers(
                     entity.address, count=count, device_id=self.unit
                 )
-            else:  # HOLDING_REGISTER
+            else:  # holding
                 result = await self._client.read_holding_registers(
                     entity.address, count=count, device_id=self.unit
                 )
@@ -253,20 +260,31 @@ class QubeClient:
             regs = result.registers
             val: float | int = 0
 
-            # Decode based on data type
-            if entity.data_type == DataType.FLOAT32:
-                int_val = (regs[1] << 16) | regs[0]
+            _LOGGER.debug(
+                "read_entity: key=%s raw_regs=%s", entity.key, regs
+            )
+
+            # Decode based on data type (use string comparison for safety)
+            # Qube uses big endian word order (ABCD): regs[0]=MSW, regs[1]=LSW
+            if data_type_str == "float32":
+                int_val = (regs[0] << 16) | regs[1]
                 val = struct.unpack(">f", struct.pack(">I", int_val))[0]
-            elif entity.data_type == DataType.INT16:
+                _LOGGER.debug(
+                    "read_entity: key=%s float32 int_val=%s decoded=%s",
+                    entity.key, int_val, val
+                )
+            elif data_type_str == "int16":
                 val = regs[0]
                 if val > 32767:
                     val -= 65536
-            elif entity.data_type == DataType.UINT16:
+            elif data_type_str == "uint16":
                 val = regs[0]
-            elif entity.data_type == DataType.UINT32:
-                val = (regs[1] << 16) | regs[0]
-            elif entity.data_type == DataType.INT32:
-                val = (regs[1] << 16) | regs[0]
+            elif data_type_str == "uint32":
+                int_val = (regs[0] << 16) | regs[1]
+                val = int_val
+            elif data_type_str == "int32":
+                int_val = (regs[0] << 16) | regs[1]
+                val = int_val
                 if val > 2147483647:
                     val -= 4294967296
 
@@ -276,6 +294,11 @@ class QubeClient:
             if entity.offset is not None:
                 val = val + entity.offset
 
+            _LOGGER.debug(
+                "read_entity: key=%s final_value=%s (scale=%s, offset=%s)",
+                entity.key, val, entity.scale, entity.offset
+            )
+
             return val
 
         except Exception as e:
@@ -425,9 +448,10 @@ class QubeClient:
             # Encode based on data type
             if entity.data_type == DataType.FLOAT32:
                 # Pack as big-endian float, then split into two registers
+                # Big Endian word order: regs[0]=MSW, regs[1]=LSW
                 packed = struct.pack(">f", write_value)
                 int_val = struct.unpack(">I", packed)[0]
-                regs = [int_val & 0xFFFF, (int_val >> 16) & 0xFFFF]
+                regs = [(int_val >> 16) & 0xFFFF, int_val & 0xFFFF]
                 result = await self._client.write_registers(
                     entity.address, regs, device_id=self.unit
                 )