From 07d35fd19ce47904e0bd8d7c94ffdbcc77546621 Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 21 Oct 2024 13:37:30 +0200 Subject: [PATCH] remove json | false, as it will always default to false --- lib/framework/MqttSettingsService.cpp | 2 +- lib/framework/NetworkSettingsService.cpp | 6 +++--- src/web/WebSettingsService.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/framework/MqttSettingsService.cpp b/lib/framework/MqttSettingsService.cpp index 198e845f8..9274ae49b 100644 --- a/lib/framework/MqttSettingsService.cpp +++ b/lib/framework/MqttSettingsService.cpp @@ -253,7 +253,7 @@ StateUpdateResult MqttSettings::update(JsonObject root, MqttSettings & settings) bool changed = false; #ifndef TASMOTA_SDK - newSettings.enableTLS = root["enableTLS"] | false; + newSettings.enableTLS = root["enableTLS"]; newSettings.rootCA = root["rootCA"] | ""; #else newSettings.enableTLS = false; diff --git a/lib/framework/NetworkSettingsService.cpp b/lib/framework/NetworkSettingsService.cpp index aaec147f6..6db003296 100644 --- a/lib/framework/NetworkSettingsService.cpp +++ b/lib/framework/NetworkSettingsService.cpp @@ -424,12 +424,12 @@ StateUpdateResult NetworkSettings::update(JsonObject root, NetworkSettings & set settings.bssid = root["bssid"] | ""; settings.password = root["password"] | FACTORY_WIFI_PASSWORD; settings.hostname = root["hostname"] | FACTORY_WIFI_HOSTNAME; - settings.staticIPConfig = root["static_ip_config"] | false; - settings.bandwidth20 = root["bandwidth20"] | false; + settings.staticIPConfig = root["static_ip_config"]; + settings.bandwidth20 = root["bandwidth20"]; settings.tx_power = static_cast(root["tx_power"] | 0); settings.nosleep = root["nosleep"] | true; settings.enableMDNS = root["enableMDNS"] | true; - settings.enableCORS = root["enableCORS"] | false; + settings.enableCORS = root["enableCORS"]; settings.CORSOrigin = root["CORSOrigin"] | "*"; // extended settings diff --git a/src/web/WebSettingsService.cpp b/src/web/WebSettingsService.cpp index 769f3bf71..e33f0aeed 100644 --- a/src/web/WebSettingsService.cpp +++ b/src/web/WebSettingsService.cpp @@ -359,10 +359,10 @@ StateUpdateResult WebSettings::update(JsonObject root, WebSettings & settings) { settings.fahrenheit = root["fahrenheit"]; EMSESP::system_.fahrenheit(settings.fahrenheit); - settings.readonly_mode = root["readonly_mode"] | false; + settings.readonly_mode = root["readonly_mode"]; EMSESP::system_.readonly_mode(settings.readonly_mode); - settings.developer_mode = root["developer_mode"] | false; + settings.developer_mode = root["developer_mode"]; EMSESP::system_.developer_mode(settings.developer_mode); settings.bool_dashboard = root["bool_dashboard"] | EMSESP_DEFAULT_BOOL_FORMAT;