Added BITS, INTEGERS, LWT

Author: epdevlab

.gitignore

@@ -39,6 +39,7 @@ pip-delete-this-directory.txt
 
 # Unit test / coverage reports
 htmlcov/
+.tests/
 .tox/
 .nox/
 .coverage
@@ -131,3 +132,6 @@ dmypy.json
 # Pypirc for deploying new package to PyPI server
 .pypirc
 .vscode/settings.json
+
+# IDE metadata
+.idea/

README.md

@@ -87,3 +87,7 @@ Supported bus devices
 - JA3-018M (163)
 - Virtual heating regulator (167)
 - Virtual cooling regulator (168)
+- SA3_014M (169)
+- JA3_014M (170)
+- BITS (bits)
+- INTEGETS (integers)

inelsmqtt/__init__.py

@@ -411,10 +411,10 @@ def __on_discover(
         device_type = fragments[TOPIC_FRAGMENTS[FRAGMENT_DEVICE_TYPE]]
         action = fragments[TOPIC_FRAGMENTS[FRAGMENT_STATE]]
 
-        if device_type in DEVICE_TYPE_DICT:
-            topic = msg.topic.split("/")[2:]
-            topic = "/".join(topic)
+        topic = msg.topic.split("/")[2:]
+        topic = "/".join(topic)
 
+        if device_type in DEVICE_TYPE_DICT:
             if action == "status":
                 self.__discovered[topic] = msg.payload
                 self.__last_values[msg.topic] = msg.payload
@@ -426,6 +426,14 @@ def __on_discover(
                     self.__last_values[msg.topic] = msg.payload
                     self.__is_subscribed_list[msg.topic] = True
                 _LOGGER.info("Device of type %s found [connected].\n", device_type)
+        else:
+            if device_type == "gw" and action == "connected":
+                if msg.topic not in self.__is_subscribed_list:
+                    client.subscribe(msg.topic, 0, None, None)
+                    self.__messages[msg.topic] = msg.payload
+                    self.__last_values[msg.topic] = copy.copy(msg.topic)
+                    self.__is_subscribed_list[msg.topic] = True
+                    _LOGGER.info("Device of type %s found [gw].\n", device_type)
 
     def __on_message(
         self,
@@ -446,7 +454,7 @@ def __on_message(
 
         message_type = message_parts[TOPIC_FRAGMENTS[FRAGMENT_STATE]]
 
-        if device_type in DEVICE_TYPE_DICT:
+        if device_type in DEVICE_TYPE_DICT or device_type == "gw":
             # keep last value
             self.__last_values[msg.topic] = (
                 copy.copy(self.__messages[msg.topic])

inelsmqtt/const.py

@@ -14,6 +14,7 @@
 CLIMATE = "climate"
 BUTTON = "button"
 BINARY_SENSOR = "binary_sensor"
+NUMBER = "number"
 
 # RF
 RF_SINGLE_SWITCH = "Single switching unit"  # 01
@@ -88,6 +89,8 @@
 JA3_014M = "JA3-014M"
 DALI_DMX_UNIT = "DALI-DMX-Unit"
 DALI_DMX_UNIT_2 = "DALI-DMX-Unit-2"
+INTEGERS = "INTEGERS"
+BITS = "BITS"
 
 #Virtual bus
 VIRT_CONTR = "Virtual controller"
@@ -177,6 +180,9 @@
     "168": VIRT_COOL_REG,
 
     "170": JA3_014M,
+
+    "bits": BITS,
+    "integers": INTEGERS,
 }
 
 #TODO retire this system
@@ -257,6 +263,9 @@
     "168": CLIMATE, # VIRT_COOL_REG
 
     "170": COVER, # JA3_014M
+
+    "bits": SWITCH,
+    "integers": NUMBER,
 }
 
 
@@ -843,9 +852,16 @@ class Climate_presets(IntEnum):
     FRAGMENT_UNIQUE_ID: 4,
 }
 
+GW_CONNECTED = {
+    b"{\"status\": true}": True,
+    b"{\"status\": false}": False,
+}
+
 DEVICE_CONNECTED = {
     "on\n": True,
     "off\n": False,
+    "{\"status\": true}": True,
+    "{\"status\": false}": False,
 }
 
 # SWITCH CONSTANTS

inelsmqtt/devices/__init__.py

@@ -18,6 +18,7 @@
     FRAGMENT_DEVICE_TYPE,
     FRAGMENT_SERIAL_NUMBER,
     FRAGMENT_UNIQUE_ID,
+    GW_CONNECTED,
     DEVICE_CONNECTED,
     VERSION,
 )
@@ -66,6 +67,7 @@ def __init__(
             self.__set_topic = f"{fragments[TOPIC_FRAGMENTS[FRAGMENT_DOMAIN]]}/set/{fragments[TOPIC_FRAGMENTS[FRAGMENT_SERIAL_NUMBER]]}/{fragments[TOPIC_FRAGMENTS[FRAGMENT_DEVICE_TYPE]]}/{fragments[TOPIC_FRAGMENTS[FRAGMENT_UNIQUE_ID]]}"  # noqa: E501
 
         self.__connected_topic = f"{fragments[TOPIC_FRAGMENTS[FRAGMENT_DOMAIN]]}/connected/{fragments[TOPIC_FRAGMENTS[FRAGMENT_SERIAL_NUMBER]]}/{fragments[TOPIC_FRAGMENTS[FRAGMENT_DEVICE_TYPE]]}/{fragments[TOPIC_FRAGMENTS[FRAGMENT_UNIQUE_ID]]}"  # noqa: E501
+        self.__gw_connected_topic = f"{fragments[TOPIC_FRAGMENTS[FRAGMENT_DOMAIN]]}/connected/{fragments[TOPIC_FRAGMENTS[FRAGMENT_SERIAL_NUMBER]]}/gw"  # noqa: E501
         self.__title = title if title is not None else self.__unique_id
         self.__domain = fragments[TOPIC_FRAGMENTS[FRAGMENT_DOMAIN]]
         self.__state: Any = None
@@ -137,7 +139,11 @@ def is_available(self) -> bool:
         Returns:
             bool: True/False
         """
-        val = self.__mqtt.messages()[self._Device__connected_topic]
+        gw = self.__mqtt.messages().get(self._Device__gw_connected_topic)
+        if not GW_CONNECTED.get(gw):
+            return False
+
+        val = self.__mqtt.messages().get(self._Device__connected_topic)
         if isinstance(val, (bytes, bytearray)):
             val = val.decode()
 

inelsmqtt/util.py

@@ -1,6 +1,8 @@
 """Utility classes."""
 from dataclasses import dataclass
 import logging
+import json
+import re
 
 from operator import itemgetter
 from typing import Any, Dict, Optional
@@ -205,8 +207,24 @@
     Shutter_state,
     Climate_action,
     Climate_modes,
+
+    BITS,
+    INTEGERS,
+    NUMBER,
 )
 
+#bit
+@dataclass
+class Bit():
+    is_on: bool
+    addr: str
+
+#number
+@dataclass
+class Number():
+    value: int
+    addr: str
+
 #relay
 @dataclass
 class SimpleRelay():
@@ -278,6 +296,29 @@ def break_into_bytes(line: str):
         return [line[i:i+2] for i in range(0, len(line), 2)]
     return []
 
+def xparse_formated_json(data):
+    regex = r"state\":\{(.*)\}\}"
+    match = re.search(regex, data)
+    addr_val_list = []
+    if match != None:
+        states = match.group(1)
+        addr_value_pair_list = states.split(',')
+        for item in addr_value_pair_list:
+            addr, val = item.split(':')
+            addr_val_list.append(
+                (addr, int(val))
+            )
+    return addr_val_list
+
+def parse_formated_json(data):
+    addr_val_list = []
+    data = json.loads(data)
+    for addr, val in data['state'].items():
+        addr_val_list.append(
+            (addr, val)
+        )
+    return addr_val_list
+
 class DeviceValue(object):
     """Device value interpretation object."""
 
@@ -842,6 +883,42 @@ def __find_ha_value(self) -> None:
                         card_present=card_present,
                         card_id=card_id,
                     )
+                elif self.__inels_type is BITS:
+                    bit: list[Bit] = []
+                    for addr, val in parse_formated_json(self.__inels_status_value):
+                        bit.append(
+                            Bit(
+                                is_on=val, addr=addr
+                            )
+                        )
+
+                    self.__ha_value = new_object(
+                        bit=bit,
+                    )
+
+                    set_val = {}
+                    for bit in self.ha_value.bit:
+                        set_val[bit.addr] = bit.is_on
+
+                    self.__inels_set_value = json.dumps({"cmd": set_val})
+            elif self.__device_type is NUMBER:
+                number: list[Number] = []
+                for addr, val in parse_formated_json(self.__inels_status_value):
+                    number.append(
+                        Number(
+                            value=val, addr=addr
+                        )
+                    )
+
+                self.__ha_value = new_object(
+                    number=number,
+                )
+
+                set_val = {}
+                for number in self.ha_value.number:
+                    set_val[number.addr] = number.value
+
+                self.__inels_set_value = json.dumps({"cmd": set_val})
             elif self.__device_type is SENSOR:  # temperature sensor
                 if self.__inels_type is RF_TEMPERATURE_INPUT:
                     battery = int(self.__trim_inels_status_values(DEVICE_TYPE_10_DATA, BATTERY, ""), 16)
@@ -1193,8 +1270,8 @@ def __find_ha_value(self) -> None:
                         self.__inels_set_value = DEVICE_TYPE_13_COMM_TEST
                         self.__ha_value = None
                     else:
-                        simple_light = []
-                        simple_light.append(
+                        warm_light = []
+                        warm_light.append(
                             WarmLight(
                                     brightness=round(
                                         int(self.__trim_inels_status_values(DEVICE_TYPE_13_DATA, OUT, ""), 16) * 100.0/255.0
@@ -1205,7 +1282,7 @@ def __find_ha_value(self) -> None:
                                 ),
                             )
 
-                        self.__ha_value=new_object(simple_light=simple_light)
+                        self.__ha_value=new_object(warm_light=warm_light)
                 elif self.__inels_type is DA3_22M:
                     temp = self.__trim_inels_status_values(DA3_22M_DATA, TEMP_IN, "")
 
@@ -2181,7 +2258,19 @@ def __find_inels_value(self) -> None:
                     elif self.__inels_type in [GCR3_11, GCH3_31]:
                         set_val = "04\n" if self.ha_value.simple_relay[0].is_on else "00\n"
                         set_val += "00\n" * 9
-                        self.__inels_set_value = set_val 
+                        self.__inels_set_value = set_val
+                    elif self.__inels_type is BITS:
+                        set_val = {}
+                        for bit in self.ha_value.bit:
+                            set_val[bit.addr] = int(bit.is_on)
+
+                        self.__inels_set_value = json.dumps({"cmd": set_val})
+                elif self.__device_type is NUMBER:
+                    set_val = {}
+                    for number in self.ha_value.number:
+                        set_val[number.addr] = int(number.value)
+
+                    self.__inels_set_value = json.dumps({"cmd": set_val})
                 elif self.__device_type is LIGHT:
                     if self.__inels_type in [RF_SINGLE_DIMMER, RF_DIMMER]:
                         if self.__ha_value is None:
@@ -2204,7 +2293,7 @@ def __find_inels_value(self) -> None:
                         if self.__ha_value is None:
                             self.__inels_set_value = DEVICE_TYPE_13_COMM_TEST
                         else:
-                            self.__inels_set_value = f"0F\n00\n00\n00\n{round(self.ha_value.simple_light[0].brightness*2.55):02X}\n{round(self.ha_value.simple_light[0].relative_ct*2.55):02X}\n"
+                            self.__inels_set_value = f"0F\n00\n00\n00\n{round(self.ha_value.warm_light[0].brightness*2.55):02X}\n{round(self.ha_value.warm_light[0].relative_ct*2.55):02X}\n"
                     elif self.__inels_type is DA3_22M:
                         # correct the values
                         out1 = round(self.__ha_value.light_coa_toa[0].brightness, -1)

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name="elkoep-mqtt",
-    version="0.2.26",
+    version="0.2.27",
     url="https://github.com/epdevlab/elkoep-mqtt",
     license="MIT",
     author="Elko EP s.r.o.",