From a1cfaf59186faceec71317c8b8bc88850575ad6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Jonas=20S=C3=A4mann?= Date: Thu, 5 May 2022 21:07:25 +0200 Subject: [PATCH] Change default mqtt prefix to hoymiles/serial --- tools/rpi/ahoy.py | 11 +++++++---- tools/rpi/ahoy.yml.example | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/rpi/ahoy.py b/tools/rpi/ahoy.py index 3c998e95..449043e6 100644 --- a/tools/rpi/ahoy.py +++ b/tools/rpi/ahoy.py @@ -96,11 +96,14 @@ def poll_inverter(inverter): print() if mqtt_client: - mqtt_send_status(mqtt_client, inverter_ser, data) + mqtt_send_status(mqtt_client, inverter_ser, data, + topic=inverter.get('mqtt', {}).get('topic', None) +def mqtt_send_status(broker, interter_ser, data, topic=None): + """ Publish StatusResponse object """ -def mqtt_send_status(broker, interter_ser, data): - topic = f'ahoy/{inverter_ser}' + if not topic: + topic = f'hoymiles/{inverter_ser}' # AC Data phase_id = 0 @@ -125,7 +128,7 @@ def mqtt_send_status(broker, interter_ser, data): def mqtt_on_command(): """ Handle commands to topic - ahoy/{inverter_ser}/command + hoymiles/{inverter_ser}/command frame it and put onto command_queue """ raise NotImplementedError('Receiving mqtt commands is yet to be implemented') diff --git a/tools/rpi/ahoy.yml.example b/tools/rpi/ahoy.yml.example index 16674daa..bcab9693 100644 --- a/tools/rpi/ahoy.yml.example +++ b/tools/rpi/ahoy.yml.example @@ -17,4 +17,4 @@ ahoy: - name: 'balkon' serial: 114172220003 mqtt: - topic: 'ahoy/114172220143' # defaults to 'ahoy/{serial}' + topic: 'hoymiles/114172221234' # defaults to 'hoymiles/{serial}'