From 616e889e9406dfb93db46ff78190235e46fba956 Mon Sep 17 00:00:00 2001 From: ngt-github Date: Sat, 13 Aug 2022 23:36:39 +0200 Subject: [PATCH 1/3] Added options for TLS usage for MQTT client and insecure certificate handling --- tools/rpi/ahoy.yml.example | 2 ++ tools/rpi/hoymiles/__main__.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/tools/rpi/ahoy.yml.example b/tools/rpi/ahoy.yml.example index 8438b9f7..15b2cd91 100644 --- a/tools/rpi/ahoy.yml.example +++ b/tools/rpi/ahoy.yml.example @@ -16,6 +16,8 @@ ahoy: port: 1883 user: 'username' password: 'password' + useTLS: False + insecureTLS: False #set True for e.g. self signed certificates. # Influx2 output influxdb: diff --git a/tools/rpi/hoymiles/__main__.py b/tools/rpi/hoymiles/__main__.py index 71b0fe13..f41dd7da 100644 --- a/tools/rpi/hoymiles/__main__.py +++ b/tools/rpi/hoymiles/__main__.py @@ -226,6 +226,11 @@ if __name__ == '__main__': mqtt_config = ahoy_config.get('mqtt', []) if not mqtt_config.get('disabled', False): mqtt_client = paho.mqtt.client.Client() + + if mqtt_config.get('useTLS',False): + mqtt_client.tls_set() + mqtt_client.tls_insecure_set(mqtt_config.get('insecureTLS',False)) + mqtt_client.username_pw_set(mqtt_config.get('user', None), mqtt_config.get('password', None)) mqtt_client.connect(mqtt_config.get('host', '127.0.0.1'), mqtt_config.get('port', 1883)) mqtt_client.loop_start() From 1746492365fc4b1440257654bc9739decaceb37c Mon Sep 17 00:00:00 2001 From: fila612 Date: Sun, 14 Aug 2022 07:48:05 +0200 Subject: [PATCH 2/3] Add MF & MDL for MQTT (HASSIO-Discov.) - man. Ver. --- tools/esp8266/app.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/esp8266/app.cpp b/tools/esp8266/app.cpp index c4bf5ece..1d604276 100644 --- a/tools/esp8266/app.cpp +++ b/tools/esp8266/app.cpp @@ -1153,6 +1153,8 @@ void app::sendMqttDiscoveryConfig(void) { deviceDoc["name"] = iv->name; deviceDoc["ids"] = String(iv->serial.u64, HEX); deviceDoc["cu"] = F("http://") + String(WiFi.localIP().toString()); + deviceDoc["mf"] = "Hoymiles"; + deviceDoc["mdl"] = iv->name; JsonObject deviceObj = deviceDoc.as(); DynamicJsonDocument doc(384); From 9a14d534d047f63c7fdd391be8d005eb8f10ccc3 Mon Sep 17 00:00:00 2001 From: lumapu Date: Sun, 14 Aug 2022 21:10:21 +0200 Subject: [PATCH 3/3] * refactored code * v0.5.12 --- tools/esp8266/defines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/esp8266/defines.h b/tools/esp8266/defines.h index ce21e996..39f61ff6 100644 --- a/tools/esp8266/defines.h +++ b/tools/esp8266/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 5 -#define VERSION_PATCH 11 +#define VERSION_PATCH 12 //-------------------------------------