monster/aqara-mqtt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SORRY! Fix for broken motion/door state!

Browse Source
This commit is contained in:
raspberry
2018-02-21 19:55:47 +03:00
parent 6f8bbe1599
commit ed116b431b
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mqtt.py
+7 -5
View File
@@ -74,6 +74,7 @@ class Mqtt:
model = sidprops.get("model",model)
sid = sidprops.get("name",sid)
items = {}
for key, value in data.items():
# fix for latest motion value
if (model == "motion" and key == "no_motion"):
@@ -88,23 +89,24 @@ class Mqtt:
# fix for rgb format
if (key == "rgb" and self._is_int(value)):
value = self._color_xiaomi_to_rgb(value)
items[key] = value
if self.json == True:
PATH_FMT = self.prefix + "/{model}/{sid}/json"
topic = PATH_FMT.format(model=model, sid=sid)
values = {}
values['sid'] = sid
for key, value in data.items():
values[key] = value
for key in items:
values[key] = items[key]
jsondata = json.dumps(values)
_LOGGER.info("Publishing message to topic " + topic + ": " + str(jsondata) + ".")
self._client.publish(topic, payload=jsondata, qos=0, retain=retain)
else:
for key, value in data.items():
for key in items:
PATH_FMT = self.prefix + "/{model}/{sid}/{prop}"
topic = PATH_FMT.format(model=model, sid=sid, prop=key)
_LOGGER.info("Publishing message to topic " + topic + ": " + str(value) + ".")
self._client.publish(topic, payload=value, qos=0, retain=retain)
_LOGGER.info("Publishing message to topic " + topic + ": " + str(items[key]) + ".")
self._client.publish(topic, payload=items[key], qos=0, retain=retain)
def _mqtt_on_connect(self, client, userdata, rc, unk):
_LOGGER.info("Connected to mqtt server.")