Add DPT232

knxdclient/encoding.py

@@ -47,6 +47,7 @@ class KNXDPT(enum.Enum):
     DATE_TIME = 19
     ENUM8 = 20
     VARSTRING = 24
+    COLOUR_RGB = 232
 
 
 class KNXTime(NamedTuple):
@@ -81,6 +82,7 @@ def from_datetime(cls, value: datetime.datetime):
     KNXDPT.DATE_TIME: bytes,
     KNXDPT.ENUM8: bytes,
     KNXDPT.VARSTRING: bytes,
+    KNXDPT.COLOUR_RGB: bytes,
 }
 
 DPT_PYTHON_REPRESENTATION: Dict[KNXDPT, Union[type, Tuple[type, ...]]] = {
@@ -104,6 +106,7 @@ def from_datetime(cls, value: datetime.datetime):
     KNXDPT.DATE_TIME: (datetime.datetime, datetime.date, datetime.time),
     KNXDPT.ENUM8: (int, enum.Enum),
     KNXDPT.VARSTRING: str,
+    KNXDPT.COLOUR_RGB: bytes,
 }
 
 
@@ -209,6 +212,8 @@ def encode_value(value: Any, t: KNXDPT) -> EncodedData:
         return bytes([val])
     elif t is KNXDPT.VARSTRING:
         return val.encode('iso-8859-1') + b'\0'
+    elif t is KNXDPT.COLOUR_RGB:
+        return bytes([val[0] , val[1] , val[2]])
     else:
         raise NotImplementedError()
 
@@ -273,5 +278,7 @@ def decode_value(value: EncodedData, t: KNXDPT) -> Any:
     elif t is KNXDPT.ENUM8:
         # The raw int val is returned. The User code must construct the correct Enum type if required.
         return val[0]
+    elif t is KNXDPT.COLOUR_RGB:
+        return f'{(val[2] + (val[1] << 8) + (val[0] << 16)):X}'
     else:
         raise NotImplementedError()

test/test_conversion.py

@@ -270,3 +270,13 @@ class HAVCMode(enum.Enum):
         self.assertEqual(bytes([2]), knxdclient.encode_value(HAVCMode.Standby, knxdclient.KNXDPT.ENUM8))
         self.assertEqual(bytes([2]), knxdclient.encode_value(2, knxdclient.KNXDPT.ENUM8))
         self.assertEqual(2, knxdclient.decode_value(bytes([2]), knxdclient.KNXDPT.ENUM8))
+
+    def test_dpt232_conversion(self) -> None:
+        self.assertEqual(bytes([0x10, 0xCC, 0x0A]),
+                         knxdclient.encode_value(bytes([0x10, 0xCC, 0x0A]), knxdclient.KNXDPT.COLOUR_RGB))
+        self.assertEqual(bytes([127, 00, 32]),
+                         knxdclient.encode_value(bytes([0x7F, 0x00, 0x20]), knxdclient.KNXDPT.COLOUR_RGB))
+        self.assertEqual(f'{0x801B10:X}',
+                         knxdclient.decode_value(bytes([0x80, 0x1B, 0x10]), knxdclient.KNXDPT.COLOUR_RGB))
+        self.assertEqual(f'{0x123456:X}',
+                         knxdclient.decode_value(bytes([0x12, 0x34, 0x56]), knxdclient.KNXDPT.COLOUR_RGB))