Added DA3_03M/RGBW, MCD3_01, PMS3_01, GRT3_70

Author: epdevlab

README.md

@@ -82,6 +82,7 @@ Supported bus devices
 - DAC3-04M (148)
 - DCDA-33M (150)
 - DA3-66M (151)
+- DA3-03M/RGBW (153)
 - ADC3-60M (156)
 - TI3-10B (157)
 - TI3-40B (158)
@@ -92,11 +93,15 @@ Supported bus devices
 - Virtual cooling regulator (168)
 - SA3_014M (169)
 - JA3_014M (170)
+- MCD3-01 (171)
+- PMS3-01 (172)
 - GSB3-40Sx-V2 (174)
 - GSB3-60Sx-V2 (175)
 - GSB3-90Sx-V2 (176)
 - MSB3-40 (177)
 - MSB3-60 (178)
 - MSB3-90 (179)
+- GRT3-70 (180)
+- GRT3-270 (180)
 - BITS (bits)
 - INTEGETS (integers)

inelsmqtt/const.py

@@ -48,6 +48,7 @@
 SA3_01B = "SA3-01B"
 DA3_22M = "DA3-22M"
 GRT3_50 = "GRT3-50"
+GRT3_70 = "GRT3-70"
 GSB3_90SX = "GSB3-90SX"
 SA3_04M = "SA3-04M"
 SA3_012M = "SA3-012M"
@@ -98,8 +99,11 @@
 GSB3_40SX_V2 = "GSB3-40SX-V2"
 GSB3_60SX_V2 = "GSB3-60SX-V2"
 GSB3_90SX_V2 = "GSB3-90SX-V2"
+MCD3_01 = "MCD3-01"
+PMS3_01 = "PMS3-01"
 INTEGERS = "INTEGERS"
 BITS = "BITS"
+DIMMER_RGBW = "RGBW dimmer"
 
 # Virtual bus
 VIRT_CONTR = "Virtual controller"

inelsmqtt/discovery.py

@@ -3,8 +3,8 @@
 import logging
 
 from inelsmqtt import InelsMqtt
-from inelsmqtt.const import INELS_ASSUMED_STATE_DEVICES, INELS_COMM_TEST_DICT, INELS_DEVICE_TYPE_DICT
 from inelsmqtt.devices import Device
+from inelsmqtt.utils.core import INELS_ASSUMED_STATE_DEVICES, ProtocolHandlerMapper
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -42,8 +42,9 @@ def discovery(self) -> dict[str, list[Device]]:
                 dev_type = d_frags[1]
                 unique_id = d_frags[2]
 
-                if dev_type in INELS_COMM_TEST_DICT:
-                    self.__mqtt.publish("inels/set/" + d, INELS_COMM_TEST_DICT[dev_type])
+                command = ProtocolHandlerMapper.get_handler(dev_type).COMM_TEST()
+                if command:
+                    self.__mqtt.publish("inels/set/" + d, command)
                     _LOGGER.info("Sending comm test to device of type %s, unique_id %s", dev_type, unique_id)
                     retry = True
 
@@ -56,7 +57,7 @@ def discovery(self) -> dict[str, list[Device]]:
         for k, v in devs.items():
             k_frags = k.split("/")
             dev_type = k_frags[1]
-            if v is not None or INELS_DEVICE_TYPE_DICT[dev_type] in INELS_ASSUMED_STATE_DEVICES:
+            if v is not None or ProtocolHandlerMapper.get_handler(dev_type) in INELS_ASSUMED_STATE_DEVICES:
                 sanitized_devs.append(k)
         devs = sanitized_devs
 

inelsmqtt/protocols/cu3.py

@@ -32,6 +32,7 @@
     DEW_POINT,
     DIM_OUT_1,
     DIM_OUT_2,
+    DIMMER_RGBW,
     DIN,
     DMD3_1,
     FA3_612M,
@@ -40,6 +41,7 @@
     GCR3_11,
     GDB3_10,
     GRT3_50,
+    GRT3_70,
     GSB3_20SX,
     GSB3_40_V2,
     GSB3_40SX,
@@ -66,12 +68,14 @@
     LIGHT,
     LIGHT_IN,
     MAX_TEMP,
+    MCD3_01,
     MSB3_40,
     MSB3_60,
     MSB3_90,
     NUMBER,
     OUT,
     PLUS_MINUS_BUTTONS,
+    PMS3_01,
     PUBLIC_HOLIDAY,
     RC3_610DALI,
     RELAY,
@@ -118,6 +122,7 @@
     LightCoaToa,
     Number,
     Relay,
+    RGBWLight,
     Shutter,
     SimpleLight,
     SimpleRelay,
@@ -1703,6 +1708,75 @@ def create_inels_set_value(cls, device_value: DeviceValue) -> str:
         return cls.create_command_payload(cmd)
 
 
+class DT_153(Base):
+    INELS_TYPE = DIMMER_RGBW
+    HA_TYPE = LIGHT
+    TYPE_ID = "153"
+
+    DATA = {
+        "LED_1": [4, 5, 6, 7, 12],
+        "LED_2": [13, 14, 15, 20, 21],
+        "LED_3": [22, 23, 28, 29, 30],
+        TEMP_IN: [8, 9],
+    }
+
+    @classmethod
+    def create_ha_value_object(cls, device_value: DeviceValue) -> str:
+        """Create a HA value object for a RGBW."""
+        led_1 = trim_inels_status_bytes(device_value.inels_status_value, cls.DATA, "LED_1")
+        led_2 = trim_inels_status_bytes(device_value.inels_status_value, cls.DATA, "LED_2")
+        led_3 = trim_inels_status_bytes(device_value.inels_status_value, cls.DATA, "LED_3")
+
+        temp_in = trim_inels_status_values(device_value.inels_status_value, cls.DATA, TEMP_IN, "")
+
+        rgbw = []
+        for led in [led_1, led_2, led_3]:
+            r, g, b, w, y = [int(i, 16) for i in led]
+            rgbw.append(RGBWLight(r=r, g=g, b=b, w=w, brightness=y))
+
+        return new_object(rgbw=rgbw, temp_in=temp_in)
+
+    @classmethod
+    def create_inels_set_value(cls, device_value: DeviceValue) -> str:
+        """Generate command string to set the RGBW and brightness values."""
+        led_1, led_2, led_3 = device_value.ha_value.rgbw
+        command = [
+            0,
+            0,
+            0,
+            0,
+            led_1.r,
+            led_1.g,
+            led_1.b,
+            led_1.w,
+            0,
+            0,
+            0,
+            0,
+            led_1.brightness,
+            led_2.r,
+            led_2.g,
+            led_2.b,
+            0,
+            0,
+            0,
+            0,
+            led_2.w,
+            led_2.brightness,
+            led_3.r,
+            led_3.g,
+            0,
+            0,
+            0,
+            0,
+            led_3.b,
+            led_3.w,
+            led_3.brightness,
+            0,
+        ]
+        return Formatter.format_data(command)
+
+
 class DT_156(Base):
     INELS_TYPE = ADC3_60M
     HA_TYPE = SENSOR
@@ -1812,6 +1886,8 @@ class Command(IntEnum):
     SHUTTER_STATE_SET = {
         Shutter_state.Open: [Command.OPEN, Command.CLOSE],
         Shutter_state.Closed: [Command.CLOSE, Command.OPEN],
+        Shutter_state.Stop_up: [Command.CLOSE, Command.CLOSE],
+        Shutter_state.Stop_down: [Command.CLOSE, Command.CLOSE],
     }
 
     @staticmethod
@@ -2305,6 +2381,29 @@ def create_ha_value_object(cls, device_value: DeviceValue) -> Any:
         )
 
 
+class DT_171(Base):
+    INELS_TYPE = MCD3_01
+    HA_TYPE = SENSOR
+    TYPE_ID = "171"
+
+    DATA = {STATE: [0]}
+
+    @classmethod
+    def create_ha_value_object(cls, device_value: DeviceValue) -> Any:
+        state = trim_inels_status_values(device_value.inels_status_value, cls.DATA, STATE, "")
+        motion = int(state, 16) == 1
+
+        return new_object(
+            motion=motion,
+        )
+
+
+class DT_172(DT_171):
+    INELS_TYPE = PMS3_01
+    HA_TYPE = SENSOR
+    TYPE_ID = "172"
+
+
 class DT_174(DT_143):
     INELS_TYPE = GSB3_40SX_V2
     HA_TYPE = SENSOR
@@ -2351,6 +2450,61 @@ class DT_179(DT_143):
     INTERFACE_BUTTON_COUNT = 9
 
 
+class DT_180(Base):
+    INELS_TYPE = GRT3_70
+    HA_TYPE = SENSOR
+    TYPE_ID = "180"
+
+    DATA = {
+        SW: [1],
+        TEMP_IN: [2, 3],
+        DIN: [7],
+        LIGHT_IN: [8, 9, 10, 11],
+        AIN: [12, 13],
+        HUMIDITY: [14, 15],
+        DEW_POINT: [16, 17],
+    }
+
+    @classmethod
+    def create_ha_value_object(cls, device_value: DeviceValue) -> Any:
+        switches = trim_inels_status_values(device_value.inels_status_value, cls.DATA, SW, "")
+        switches_hex_str = f"0x{switches}"
+        switches_bin_str = f"{int(switches_hex_str, 16):0>8b}"
+
+        temp_in = trim_inels_status_values(device_value.inels_status_value, cls.DATA, TEMP_IN, "")
+
+        digital_inputs = trim_inels_status_values(device_value.inels_status_value, cls.DATA, DIN, "")
+        digital_inputs = f"0x{digital_inputs}"
+        digital_inputs = f"{int(digital_inputs, 16):0>8b}"
+        din = [digital_inputs[7] == "1"]
+        prox = digital_inputs[6] == "1"
+
+        light_in = trim_inels_status_values(device_value.inels_status_value, cls.DATA, LIGHT_IN, "")
+        ain = trim_inels_status_values(device_value.inels_status_value, cls.DATA, AIN, "")
+        humidity = trim_inels_status_values(device_value.inels_status_value, cls.DATA, HUMIDITY, "")
+        dewpoint = trim_inels_status_values(device_value.inels_status_value, cls.DATA, DEW_POINT, "")
+
+        return new_object(
+            din=din,
+            prox=prox,
+            interface=[
+                switches_bin_str[7] == "1",
+                switches_bin_str[6] == "1",
+                switches_bin_str[5] == "1",
+                switches_bin_str[4] == "1",
+                switches_bin_str[3] == "1",
+                switches_bin_str[2] == "1",
+                switches_bin_str[1] == "1",
+            ],
+            temp_in=temp_in,
+            light_in=light_in,
+            ain=ain,
+            humidity=humidity,
+            dewpoint=dewpoint,
+            backlit=False,
+        )
+
+
 class DT_BITS:
     INELS_TYPE = BITS
     HA_TYPE = SWITCH

inelsmqtt/protocols/elanrf.py

@@ -321,7 +321,7 @@ class Command(IntEnum):
 
     @classmethod
     def COMM_TEST(cls):
-        return cls.create_command_payload(cls.Command.COMM_TEST, 0, 0, 0, 0, 0)
+        return cls.create_command_payload(cls.Command.COMM_TEST, 0, 0, 0, 0)
 
     @staticmethod
     def create_command_payload(command: int, red: int, green: int, blue: int, brightness: int) -> str:

inelsmqtt/utils/common.py

@@ -66,6 +66,14 @@ class RGBLight(SimpleLight):
     b: int
 
 
+@dataclass
+class RGBWLight(SimpleLight):
+    r: int
+    g: int
+    b: int
+    w: int
+
+
 @dataclass
 class AOUTLight(SimpleLight):
     aout_coa: bool

inelsmqtt/utils/core.py

@@ -15,6 +15,12 @@
 # it is filtered out in set_val
 DUMMY_VAL = object()
 
+# Devices that support having no state topic at setup time
+INELS_ASSUMED_STATE_DEVICES = [
+    elanrf.DT_18,
+    elanrf.DT_19,
+]
+
 
 class ProtocolHandlerMapper:
     DEVICE_TYPE_MAP = {
@@ -73,6 +79,7 @@ class ProtocolHandlerMapper:
         "148": cu3.DT_148,
         "150": cu3.DT_150,
         "151": cu3.DT_151,
+        "153": cu3.DT_153,
         "156": cu3.DT_156,
         "157": cu3.DT_157,
         "158": cu3.DT_158,
@@ -86,12 +93,15 @@ class ProtocolHandlerMapper:
         "168": cu3.DT_168,
         "169": cu3.DT_169,
         "170": cu3.DT_170,
+        "171": cu3.DT_171,
+        "172": cu3.DT_172,
         "174": cu3.DT_174,
         "175": cu3.DT_175,
         "176": cu3.DT_176,
         "177": cu3.DT_177,
         "178": cu3.DT_178,
         "179": cu3.DT_179,
+        "180": cu3.DT_180,
         "bits": cu3.DT_BITS,
         "integers": cu3.DT_INTEGERS,
     }