From 7fe98e25166c165bc742600938e6c5913b0a919a Mon Sep 17 00:00:00 2001 From: mrduckspace Date: Tue, 22 Dec 2020 13:33:23 +0100 Subject: [PATCH] FMS and ZVEI Support --- config/config.template.ini | 11 +++-------- plugins/mqtt/mqtt.py | 23 ++++++++++++++++++----- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/config/config.template.ini b/config/config.template.ini index f6d740a..01aca9d 100644 --- a/config/config.template.ini +++ b/config/config.template.ini @@ -552,14 +552,9 @@ commandZVEI = commandPOC = [mqtt] -#Plugin for publish POCSAG Alarm wit MQTT - -#Adress from MQTT-Broker (Example: 192.168.178.27) -brokeraddress = - -#Example: -#topic = alarm/posac -topic = +#Adress from MQTT-Broker +brokeraddress = 192.168.178.27 +topic = alarm/posac ##################### ##### Not ready yet # diff --git a/plugins/mqtt/mqtt.py b/plugins/mqtt/mqtt.py index ed121b6..683d7d6 100644 --- a/plugins/mqtt/mqtt.py +++ b/plugins/mqtt/mqtt.py @@ -80,9 +80,21 @@ def run(typ,freq,data): mqttClient = mqtt.Client() if typ == "FMS": - logging.warning("%s not supported", typ) + x = { + "fms": data["fms"], + "status": data["status"], + "direction": data["direction"], + "directionText": data["directionText"], + "tsi": data["tsi"], + "description": data["description"], + "timestamp": timeHandler.curtime() + } elif typ == "ZVEI": - logging.warning("%s not supported", typ) + x = { + "zvei": data["zvei"], + "description": data["description"], + "timestamp": timeHandler.curtime() + } elif typ == "POC": functionText = "%FUNCTEXT%" functionText = wildcardHandler.replaceWildcards(functionText, data) @@ -96,11 +108,12 @@ def run(typ,freq,data): "description": data["description"], "timestamp": timeHandler.curtime() } - y = json.dumps(x) - mqttClient.connect(broker_address) - mqttClient.publish(topic,y) else: logging.warning("Invalid Typ: %s", typ) + + y = json.dumps(x) + mqttClient.connect(broker_address) + mqttClient.publish(topic,y) ########## User Plugin CODE ########## except: