feat: Modbus function code in sensor description

davidrapan · Aug 13, 2024 · 970c2e0 · 970c2e0
1 parent af655d3
commit 970c2e0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/custom_components/solarman/inverter_definitions/kstar_hybrid.yaml b/custom_components/solarman/inverter_definitions/kstar_hybrid.yaml
@@ -6,14 +6,14 @@
 #
 #  - INPUT_REGISTERS   3000 - 3660 decimal, 0x0BB8 - 0x0E4C hexadecimal
 #  - HOLDING_REGISTERS 3200 - 3237 decimal. 0x0C80 - 0x0C9B  hexadecimal
+#  - INPUT_REGISTERS   3292 - xxxx decimal. Not even sure about the start, could be even lower
 #
 # Each request can get a maximum of 125 registers as per modbus protocol (start and end included), so we need to
 # split up the list of used registers into multiple requests of maximum 125 registers each.
 #
 
 default:
   update_interval: 10
-  min_span: 6
   code: 0x04
   digits: 6
 

diff --git a/custom_components/solarman/parser.py b/custom_components/solarman/parser.py
@@ -65,36 +65,42 @@ def get_sensors(self):
 
         return result
 
-    def get_request_code(self, start, end):
-        if "requests" in self._profile:
-            for r in self._profile["requests"]:
-                if r[REQUEST_START] <= start <= end <= r[REQUEST_END]:
-                    return get_request_code(r)
-
-        return self._code
-
     def get_requests(self, runtime = 0):
-        if "requests" in self._profile and "requests_fine_control" in self._profile:
-            _LOGGER.debug("Fine control of request sets is enabled!")
-            return self._profile["requests"]
+        requests_table = {}
+
+        if "requests" in self._profile:
+            if not "requests_fine_control" in self._profile:
+                for pr in parameter_definition["requests"]:
+                    for r in range(pr[REQUEST_START], pr[REQUEST_END]):
+                        requests_table[r] = get_request_code(pr)
+            else:
+                _LOGGER.debug("Fine control of request sets is enabled!")
+                return self._profile["requests"]
 
         registers = []
+        registers_table = {}
 
         for p in self.parameters():
             for i in p["items"]:
                 if self.is_requestable(i) and self.is_scheduled(i, runtime):
                     self.set_state(i["name"], self.default_from_unit_of_measurement(i))
-                    for r in i["registers"]:
-                        registers.append(r)
+                    if "registers" in i:
+                        for r in i["registers"]:
+                            registers.append(r)
+                            registers_table[r] = i["code"] if "code" in i else (p["code"] if "code" in p else (requests_table[r] if r in requests_table else self._code))
 
         if len(registers) == 0:
-            return {} 
+            return {}
 
         registers.sort()
 
-        groups = group_when(registers, lambda x, y: y - x > self._min_span)
+        registers_table_values = list(registers_table.values())
+
+        predicate = (lambda x, y: y - x > self._min_span) if all(i == registers_table_values[0] for i in registers_table_values) else (lambda x, y: registers_table[x] != registers_table[y] or y - x > self._min_span)
+
+        groups = group_when(registers, predicate)
 
-        return [{ REQUEST_START: r[0], REQUEST_END: r[-1], REQUEST_CODE: self.get_request_code(r[0], r[-1]) } for r in groups]
+        return [{ REQUEST_START: r[0], REQUEST_END: r[-1], REQUEST_CODE: registers_table[r[0]] } for r in groups]
 
     def parse(self, rawData, start, length):
         for param in self.parameters():