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

Merge branch 'dev' into dev2

Browse Source
This commit is contained in:
MichaelDvP
2024-01-08 11:26:17 +01:00
parent 54d2f38841 5f2859fae2
commit 8ddc167f93
109 changed files with 271 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/framework/MqttSettingsService.cpp
View File

@@ -216,7 +216,7 @@ bool MqttSettingsService::configureMqtt() {
return false;
}
void MqttSettings::read(MqttSettings & settings, JsonObject & root) {
void MqttSettings::read(MqttSettings & settings, JsonObject root) {
#if CONFIG_IDF_TARGET_ESP32S3
#ifndef TASMOTA_SDK
root["enableTLS"] = settings.enableTLS;
@@ -253,7 +253,7 @@ void MqttSettings::read(MqttSettings & settings, JsonObject & root) {
root["send_response"] = settings.send_response;
}
StateUpdateResult MqttSettings::update(JsonObject & root, MqttSettings & settings) {
StateUpdateResult MqttSettings::update(JsonObject root, MqttSettings & settings) {
MqttSettings newSettings = {};
bool changed = false;