Introduce mqttMessage object

2017-11-23 22:16:29 +01:00
parent 7b8e1dad12
commit 939d1e66c6
4 changed files with 36 additions and 19 deletions
@@ -1,3 +1,5 @@
+from mqtt import MqttMessage
+
 REQUIREMENTS = ['python-eq3bt']

 monitoredAttrs = ["low_battery", "valve_state", "target_temperature"]
@@ -24,20 +26,10 @@ class ThermostatWorker:
      thermostat.update()

      for attr in monitoredAttrs:
-        ret.append({
-          'topic': self.format_topic(name, attr),
-          'payload': getattr(thermostat, attr),
-        })
+        ret.append(MqttMessage(topic=self.format_topic(name, attr), payload=getattr(thermostat, attr)))

-      ret.append({
-        'topic': self.format_topic(name, 'mode'),
-        'payload': haModesMapping[thermostat.mode],
-      })
-
-      ret.append({
-        'topic': self.format_topic(name, 'away'),
-        'payload': 'ON' if thermostat.mode == Mode.Away else 'OFF'
-      })
+      ret.append(MqttMessage(topic=self.format_topic(name, 'mode'), payload=haModesMapping[thermostat.mode]))
+      ret.append(MqttMessage(topic=self.format_topic(name, 'away'), payload='ON' if thermostat.mode == Mode.Away else 'OFF'))

    return ret