From de2792ffdddd2cf5b1d586eb263b973b1d9824ec Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Wed, 18 Oct 2023 10:34:21 +0200 Subject: [PATCH] add back esp32-s3 SSL for mqtt --- lib/espMqttClient/src/Transport/ClientSecureSync.h | 1 - lib/framework/MqttSettingsService.cpp | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/espMqttClient/src/Transport/ClientSecureSync.h b/lib/espMqttClient/src/Transport/ClientSecureSync.h index 77d425efb..b81681e36 100644 --- a/lib/espMqttClient/src/Transport/ClientSecureSync.h +++ b/lib/espMqttClient/src/Transport/ClientSecureSync.h @@ -10,7 +10,6 @@ the LICENSE file. #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32) -#include "../Config.h" #include // includes IPAddress #include "Transport.h" diff --git a/lib/framework/MqttSettingsService.cpp b/lib/framework/MqttSettingsService.cpp index 86a0a5bed..8f96f2f15 100644 --- a/lib/framework/MqttSettingsService.cpp +++ b/lib/framework/MqttSettingsService.cpp @@ -83,7 +83,7 @@ void MqttSettingsService::loop() { _disconnectedAt = configureMqtt() ? 0 : uuid::get_uptime(); _reconfigureMqtt = false; } - _mqttClient->loop(); // done by mqtt task + _mqttClient->loop(); } bool MqttSettingsService::isEnabled() { @@ -217,7 +217,7 @@ bool MqttSettingsService::configureMqtt() { void MqttSettings::read(MqttSettings & settings, JsonObject & root) { #if CONFIG_IDF_TARGET_ESP32S3 - // root["rootCA"] = settings.rootCA; + root["rootCA"] = settings.rootCA; #endif root["enabled"] = settings.enabled; root["host"] = settings.host; @@ -253,7 +253,7 @@ StateUpdateResult MqttSettings::update(JsonObject & root, MqttSettings & setting bool changed = false; #if CONFIG_IDF_TARGET_ESP32S3 - // newSettings.rootCA = root["rootCA"] | ""; + newSettings.rootCA = root["rootCA"] | ""; #endif newSettings.enabled = root["enabled"] | FACTORY_MQTT_ENABLED; newSettings.host = root["host"] | FACTORY_MQTT_HOST;