From b111e4762aa819375435a655febb2f37ce5f0931 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Sun, 15 Oct 2023 10:25:32 +0200 Subject: [PATCH] remove SSL from S3 build --- lib/espMqttClient/src/Config.h | 2 +- lib/framework/MqttSettingsService.cpp | 4 ++-- platformio.ini | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/espMqttClient/src/Config.h b/lib/espMqttClient/src/Config.h index d32b5f4ed..2e6d4dade 100644 --- a/lib/espMqttClient/src/Config.h +++ b/lib/espMqttClient/src/Config.h @@ -9,7 +9,7 @@ the LICENSE file. #pragma once #if CONFIG_IDF_TARGET_ESP32S3 -#define EMC_CLIENT_SECURE +// #define EMC_CLIENT_SECURE #endif #ifndef EMC_TX_TIMEOUT diff --git a/lib/framework/MqttSettingsService.cpp b/lib/framework/MqttSettingsService.cpp index 8f96f2f15..19b9ec123 100644 --- a/lib/framework/MqttSettingsService.cpp +++ b/lib/framework/MqttSettingsService.cpp @@ -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; diff --git a/platformio.ini b/platformio.ini index 6630ae369..abcaecef8 100644 --- a/platformio.ini +++ b/platformio.ini @@ -84,8 +84,7 @@ build_flags = ${common.build_flags} build_unflags = ${common.unbuild_flags} [env:ci_s3] -platform = espressif32 @ 6.4.0 -platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/releases/download/2.0.13/esp32-2.0.13.zip +platform = https://github.com/tasmota/platform-espressif32.git framework = arduino extra_scripts = scripts/rename_fw.py board = lolin_s3