save

2 files changed, 34 insertions, 25 deletions

diff --git a/include/py/homekit/mqtt/_config.py b/include/py/homekit/mqtt/_config.py
index e5f2c56..8aa3bfe 100644
--- a/include/py/homekit/mqtt/_config.py
+++ b/include/py/homekit/mqtt/_config.py
@@ -92,6 +92,7 @@ class MqttNodesConfig(ConfigUnit):
                             'type': 'dict',
                             'schema': {
                                 'module': {'type': 'string', 'required': True, 'allowed': ['si7021', 'dht12']},
+                                'legacy_payload': {'type': 'boolean', 'required': False, 'default': False},
                                 'interval': {'type': 'integer'},
                                 'i2c_bus': {'type': 'integer'},
                                 'tcpserver': {
@@ -109,7 +110,12 @@ class MqttNodesConfig(ConfigUnit):
                                 'legacy_topics': {'type': 'boolean'}
                             }
                         },
-                        'password': {'type': 'string'}
+                        'password': {'type': 'string'},
+                        'defines': {
+                            'type': 'dict',
+                            'keysrules': {'type': 'string'},
+                            'valuesrules': {'type': ['string', 'integer']}
+                        }
                     }
                 }
             }
@@ -163,3 +169,15 @@ class MqttNodesConfig(ConfigUnit):
                 else:
                     resdict[name] = node
         return reslist if only_names else resdict
+
+    def node_uses_legacy_temphum_data_payload(self, node_id: str) -> bool:
+        try:
+            return self.get_node(node_id)['temphum']['legacy_payload']
+        except KeyError:
+            return False
+
+    def node_uses_legacy_relay_power_payload(self, node_id: str) -> bool:
+        try:
+            return self.get_node(node_id)['relay']['legacy_topics']
+        except KeyError:
+            return False
diff --git a/include/py/homekit/mqtt/module/temphum.py b/include/py/homekit/mqtt/module/temphum.py
index fd02cca..6deccfe 100644
--- a/include/py/homekit/mqtt/module/temphum.py
+++ b/include/py/homekit/mqtt/module/temphum.py
@@ -10,8 +10,8 @@ MODULE_NAME = 'MqttTempHumModule'
 DATA_TOPIC = 'temphum/data'
 
 
-class MqttTemphumDataPayload(MqttPayload):
-    FORMAT = '=ddb'
+class MqttTemphumLegacyDataPayload(MqttPayload):
+    FORMAT = '=dd'
     UNPACKER = {
         'temp': two_digits_precision,
         'rh': two_digits_precision
@@ -19,39 +19,26 @@ class MqttTemphumDataPayload(MqttPayload):
 
     temp: float
     rh: float
-    error: int
 
 
-# class MqttTempHumNodes(HashableEnum):
-#     KBN_SH_HALL = auto()
-#     KBN_SH_BATHROOM = auto()
-#     KBN_SH_LIVINGROOM = auto()
-#     KBN_SH_BEDROOM = auto()
-#
-#     KBN_BH_2FL = auto()
-#     KBN_BH_2FL_STREET = auto()
-#     KBN_BH_1FL_LIVINGROOM = auto()
-#     KBN_BH_1FL_BEDROOM = auto()
-#     KBN_BH_1FL_BATHROOM = auto()
-#
-#     KBN_NH_1FL_INV = auto()
-#     KBN_NH_1FL_CENTER = auto()
-#     KBN_NH_1LF_KT = auto()
-#     KBN_NH_1FL_DS = auto()
-#     KBN_NH_1FS_EZ = auto()
-#
-#     SPB_FLAT120_CABINET = auto()
+class MqttTemphumDataPayload(MqttTemphumLegacyDataPayload):
+    FORMAT = '=ddb'
+    error: int
 
 
 class MqttTempHumModule(MqttModule):
+    _legacy_payload: bool
+
     def __init__(self,
                  sensor: Optional[BaseSensor] = None,
+                 legacy_payload=False,
                  write_to_database=False,
                  *args, **kwargs):
         if sensor is not None:
             kwargs['tick_interval'] = 10
         super().__init__(*args, **kwargs)
         self._sensor = sensor
+        self._legacy_payload = legacy_payload
 
     def on_connect(self, mqtt: MqttNode):
         super().on_connect(mqtt)
@@ -69,7 +56,7 @@ class MqttTempHumModule(MqttModule):
             rh = self._sensor.humidity()
         except:
             error = 1
-        pld = MqttTemphumDataPayload(temp=temp, rh=rh, error=error)
+        pld = self._get_data_payload_cls()(temp=temp, rh=rh, error=error)
         self._mqtt_node_ref.publish(DATA_TOPIC, pld.pack())
 
     def handle_payload(self,
@@ -77,6 +64,10 @@ class MqttTempHumModule(MqttModule):
                        topic: str,
                        payload: bytes) -> Optional[MqttPayload]:
         if topic == DATA_TOPIC:
-            message = MqttTemphumDataPayload.unpack(payload)
+            message = self._get_data_payload_cls().unpack(payload)
             self._logger.debug(message)
             return message
+
+    def _get_data_payload_cls(self):
+        return MqttTemphumLegacyDataPayload if self._legacy_payload else MqttTemphumDataPayload
+