andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove SSL from S3 build

Browse Source
This commit is contained in:
MichaelDvP
2023-10-15 10:25:32 +02:00
parent 8bd796b772
commit b111e4762a
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/espMqttClient/src/Config.h
View File

@@ -9,7 +9,7 @@ the LICENSE file.
#pragma once #pragma once
#if CONFIG_IDF_TARGET_ESP32S3 #if CONFIG_IDF_TARGET_ESP32S3
#define EMC_CLIENT_SECURE // #define EMC_CLIENT_SECURE
#endif #endif
#ifndef EMC_TX_TIMEOUT #ifndef EMC_TX_TIMEOUT

4
lib/framework/MqttSettingsService.cpp
View File

@@ -217,7 +217,7 @@ bool MqttSettingsService::configureMqtt() {
void MqttSettings::read(MqttSettings & settings, JsonObject & root) { void MqttSettings::read(MqttSettings & settings, JsonObject & root) {
#if CONFIG_IDF_TARGET_ESP32S3 #if CONFIG_IDF_TARGET_ESP32S3
root["rootCA"] = settings.rootCA; // root["rootCA"] = settings.rootCA;
#endif #endif
root["enabled"] = settings.enabled; root["enabled"] = settings.enabled;
root["host"] = settings.host; root["host"] = settings.host;
@@ -253,7 +253,7 @@ StateUpdateResult MqttSettings::update(JsonObject & root, MqttSettings & setting
bool changed = false; bool changed = false;
#if CONFIG_IDF_TARGET_ESP32S3 #if CONFIG_IDF_TARGET_ESP32S3
newSettings.rootCA = root["rootCA"] | ""; // newSettings.rootCA = root["rootCA"] | "";
#endif #endif
newSettings.enabled = root["enabled"] | FACTORY_MQTT_ENABLED; newSettings.enabled = root["enabled"] | FACTORY_MQTT_ENABLED;
newSettings.host = root["host"] | FACTORY_MQTT_HOST; newSettings.host = root["host"] | FACTORY_MQTT_HOST;

3
platformio.ini
View File

@@ -84,8 +84,7 @@ build_flags = ${common.build_flags}
build_unflags = ${common.unbuild_flags} build_unflags = ${common.unbuild_flags}
[env:ci_s3] [env:ci_s3]
platform = espressif32 @ 6.4.0 platform = https://github.com/tasmota/platform-espressif32.git
platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/releases/download/2.0.13/esp32-2.0.13.zip
framework = arduino framework = arduino
extra_scripts = scripts/rename_fw.py extra_scripts = scripts/rename_fw.py
board = lolin_s3 board = lolin_s3