2020-11-04 11:04:40 +01:00
|
|
|
#include "wled.h"
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Serializes and parses the cfg.json and wsec.json settings files, stored in internal FS.
|
|
|
|
* The structure of the JSON is not to be considered an official API and may change without notice.
|
|
|
|
*/
|
|
|
|
|
|
|
|
//simple macro for ArduinoJSON's or syntax
|
|
|
|
#define CJSON(a,b) a = b | a
|
|
|
|
|
|
|
|
void getStringFromJson(char* dest, const char* src, size_t len) {
|
|
|
|
if (src != nullptr) strlcpy(dest, src, len);
|
|
|
|
}
|
|
|
|
|
2020-11-05 22:54:13 +01:00
|
|
|
void deserializeConfig() {
|
|
|
|
bool fromeep = false;
|
|
|
|
bool success = deserializeConfigSec();
|
|
|
|
if (!success) { //if file does not exist, try reading from EEPROM
|
2020-11-06 22:12:48 +01:00
|
|
|
deEEPSettings();
|
2020-11-05 22:54:13 +01:00
|
|
|
fromeep = true;
|
|
|
|
}
|
|
|
|
|
2020-11-04 11:04:40 +01:00
|
|
|
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
|
|
|
|
|
2020-11-04 17:17:54 +01:00
|
|
|
DEBUG_PRINTLN(F("Reading settings from /cfg.json..."));
|
|
|
|
|
2020-11-05 22:54:13 +01:00
|
|
|
success = readObjectFromFile("/cfg.json", nullptr, &doc);
|
2020-11-04 17:17:54 +01:00
|
|
|
if (!success) { //if file does not exist, try reading from EEPROM
|
2020-11-06 22:12:48 +01:00
|
|
|
if (!fromeep) deEEPSettings();
|
2020-11-05 22:54:13 +01:00
|
|
|
return;
|
2020-11-04 17:17:54 +01:00
|
|
|
}
|
|
|
|
|
2020-11-04 11:04:40 +01:00
|
|
|
//deserializeJson(doc, json);
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
//int rev_major = doc[F("rev")][0]; // 1
|
|
|
|
//int rev_minor = doc[F("rev")][1]; // 0
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
//long vid = doc[F("vid")]; // 2010020
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject id = doc[F("id")];
|
|
|
|
getStringFromJson(cmDNS, id[F("mdns")], 33);
|
|
|
|
getStringFromJson(serverDescription, id[F("name")], 33);
|
|
|
|
getStringFromJson(alexaInvocationName, id[F("inv")], 33);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject nw_ins_0 = doc["nw"][F("ins")][0];
|
|
|
|
getStringFromJson(clientSSID, nw_ins_0[F("ssid")], 33);
|
|
|
|
//int nw_ins_0_pskl = nw_ins_0[F("pskl")];
|
2020-11-04 11:04:40 +01:00
|
|
|
//The WiFi PSK is normally not contained in the regular file for security reasons.
|
|
|
|
//If it is present however, we will use it
|
|
|
|
getStringFromJson(clientPass, nw_ins_0["psk"], 65);
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonArray nw_ins_0_ip = nw_ins_0[F("ip")];
|
|
|
|
JsonArray nw_ins_0_gw = nw_ins_0[F("gw")];
|
|
|
|
JsonArray nw_ins_0_sn = nw_ins_0[F("sn")];
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
for (byte i = 0; i < 4; i++) {
|
|
|
|
CJSON(staticIP[i], nw_ins_0_ip[i]);
|
|
|
|
CJSON(staticGateway[i], nw_ins_0_gw[i]);
|
|
|
|
CJSON(staticSubnet[i], nw_ins_0_sn[i]);
|
|
|
|
}
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject ap = doc[F("ap")];
|
|
|
|
getStringFromJson(apSSID, ap[F("ssid")], 33);
|
2020-11-04 11:04:40 +01:00
|
|
|
getStringFromJson(apPass, ap["psk"] , 65); //normally not present due to security
|
2020-11-07 23:54:56 +01:00
|
|
|
//int ap_pskl = ap[F("pskl")];
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(apChannel, ap[F("chan")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
if (apChannel > 13 || apChannel < 1) apChannel = 1;
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(apHide, ap[F("hide")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
if (apHide > 1) apHide = 1;
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(apBehavior, ap[F("behav")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
/*
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonArray ap_ip = ap[F("ip")];
|
2020-11-04 11:04:40 +01:00
|
|
|
for (byte i = 0; i < 4; i++) {
|
|
|
|
apIP[i] = ap_ip;
|
|
|
|
}*/
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
noWifiSleep = doc[F("wifi")][F("sleep")] | !noWifiSleep; // inverted
|
2020-11-04 11:04:40 +01:00
|
|
|
noWifiSleep = !noWifiSleep;
|
2020-11-07 23:54:56 +01:00
|
|
|
//int wifi_phy = doc[F("wifi")][F("phy")]; //force phy mode n?
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject hw = doc[F("hw")];
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject hw_led = hw[F("led")];
|
|
|
|
CJSON(ledCount, hw_led[F("total")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
if (ledCount > MAX_LEDS) ledCount = MAX_LEDS;
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(strip.ablMilliampsMax, hw_led[F("maxpwr")]);
|
|
|
|
CJSON(strip.milliampsPerLed, hw_led[F("ledma")]);
|
|
|
|
CJSON(strip.reverseMode, hw_led[F("rev")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject hw_led_ins_0 = hw_led[F("ins")][0];
|
|
|
|
//bool hw_led_ins_0_en = hw_led_ins_0[F("en")]; // true
|
|
|
|
//int hw_led_ins_0_start = hw_led_ins_0[F("start")]; // 0
|
|
|
|
//int hw_led_ins_0_len = hw_led_ins_0[F("len")]; // 1200
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
//int hw_led_ins_0_pin_0 = hw_led_ins_0[F("pin")][0]; // 2
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-27 23:59:00 +01:00
|
|
|
strip.setColorOrder(hw_led_ins_0[F("order")]);
|
2020-11-07 23:54:56 +01:00
|
|
|
//bool hw_led_ins_0_rev = hw_led_ins_0[F("rev")]; // false
|
|
|
|
skipFirstLed = hw_led_ins_0[F("skip")]; // 0
|
2020-11-15 20:58:04 +01:00
|
|
|
useRGBW = (hw_led_ins_0[F("type")] == TYPE_SK6812_RGBW);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject hw_btn_ins_0 = hw[F("btn")][F("ins")][0];
|
|
|
|
buttonEnabled = hw_btn_ins_0[F("en")] | buttonEnabled;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
//int hw_btn_ins_0_pin_0 = hw_btn_ins_0[F("pin")][0]; // 0
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonArray hw_btn_ins_0_macros = hw_btn_ins_0[F("macros")];
|
2020-11-04 11:04:40 +01:00
|
|
|
CJSON(macroButton, hw_btn_ins_0_macros[0]);
|
|
|
|
CJSON(macroLongPress,hw_btn_ins_0_macros[1]);
|
|
|
|
CJSON(macroDoublePress, hw_btn_ins_0_macros[2]);
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
//int hw_btn_ins_0_type = hw_btn_ins_0[F("type")]; // 0
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
//int hw_ir_pin = hw[F("ir")][F("pin")]; // 4
|
|
|
|
CJSON(irEnabled, hw[F("ir")][F("type")]); // 0
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
//int hw_relay_pin = hw[F("relay")][F("pin")]; // 12
|
|
|
|
//bool hw_relay_rev = hw[F("relay")][F("rev")]; // false
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
//int hw_status_pin = hw[F("status")][F("pin")]; // -1
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject light = doc[F("light")];
|
|
|
|
CJSON(briMultiplier, light[F("scale-bri")]);
|
|
|
|
CJSON(strip.paletteBlend, light[F("pal-mode")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
float light_gc_bri = light[F("gc")]["bri"];
|
|
|
|
float light_gc_col = light[F("gc")][F("col")]; // 2.8
|
2020-11-04 11:04:40 +01:00
|
|
|
if (light_gc_bri > 1.5) strip.gammaCorrectBri = true;
|
|
|
|
else if (light_gc_bri > 0.5) strip.gammaCorrectBri = false;
|
|
|
|
if (light_gc_col > 1.5) strip.gammaCorrectCol = true;
|
|
|
|
else if (light_gc_col > 0.5) strip.gammaCorrectCol = false;
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject light_tr = light[F("tr")];
|
|
|
|
CJSON(fadeTransition, light_tr[F("mode")]);
|
|
|
|
int tdd = light_tr[F("dur")] | -1;
|
2020-11-04 11:04:40 +01:00
|
|
|
if (tdd >= 0) transitionDelayDefault = tdd * 100;
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(strip.paletteFade, light_tr[F("pal")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject light_nl = light["nl"];
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(nightlightMode, light_nl[F("mode")]);
|
|
|
|
CJSON(nightlightDelayMinsDefault, light_nl[F("dur")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
nightlightDelayMins = nightlightDelayMinsDefault;
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(nightlightTargetBri, light_nl[F("tbri")]);
|
|
|
|
CJSON(macroNl, light_nl[F("macro")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject def = doc[F("def")];
|
|
|
|
CJSON(bootPreset, def[F("ps")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
CJSON(turnOnAtBoot, def["on"]); // true
|
|
|
|
CJSON(briS, def["bri"]); // 128
|
|
|
|
if (briS == 0) briS = 255;
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject def_cy = def[F("cy")];
|
2020-11-04 11:04:40 +01:00
|
|
|
CJSON(presetCyclingEnabled, def_cy["on"]);
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(presetCycleMin, def_cy[F("range")][0]);
|
|
|
|
CJSON(presetCycleMax, def_cy[F("range")][1]);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
tdd = def_cy[F("dur")] | -1;
|
2020-11-04 11:04:40 +01:00
|
|
|
if (tdd >= 0) presetCycleTime = tdd * 100;
|
|
|
|
|
|
|
|
JsonObject interfaces = doc["if"];
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject if_sync = interfaces[F("sync")];
|
|
|
|
CJSON(udpPort, if_sync[F("port0")]); // 21324
|
|
|
|
CJSON(udpPort2, if_sync[F("port1")]); // 65506
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject if_sync_recv = if_sync[F("recv")];
|
2020-11-04 11:04:40 +01:00
|
|
|
CJSON(receiveNotificationBrightness, if_sync_recv["bri"]);
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(receiveNotificationColor, if_sync_recv[F("col")]);
|
|
|
|
CJSON(receiveNotificationEffects, if_sync_recv[F("fx")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
receiveNotifications = (receiveNotificationBrightness || receiveNotificationColor || receiveNotificationEffects);
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject if_sync_send = if_sync[F("send")];
|
|
|
|
CJSON(notifyDirectDefault, if_sync_send[F("dir")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
notifyDirect = notifyDirectDefault;
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(notifyButton, if_sync_send[F("btn")]);
|
|
|
|
CJSON(notifyAlexa, if_sync_send[F("va")]);
|
|
|
|
CJSON(notifyHue, if_sync_send[F("hue")]);
|
|
|
|
CJSON(notifyMacro, if_sync_send[F("macro")]);
|
|
|
|
CJSON(notifyTwice, if_sync_send[F("twice")]);
|
|
|
|
|
|
|
|
JsonObject if_live = interfaces[F("live")];
|
|
|
|
CJSON(receiveDirect, if_live[F("en")]);
|
|
|
|
CJSON(e131Port, if_live[F("port")]); // 5568
|
|
|
|
CJSON(e131Multicast, if_live[F("mc")]);
|
|
|
|
|
|
|
|
JsonObject if_live_dmx = if_live[F("dmx")];
|
|
|
|
CJSON(e131Universe, if_live_dmx[F("uni")]);
|
|
|
|
CJSON(e131SkipOutOfSequence, if_live_dmx[F("seqskip")]);
|
|
|
|
CJSON(DMXAddress, if_live_dmx[F("addr")]);
|
|
|
|
CJSON(DMXMode, if_live_dmx[F("mode")]);
|
|
|
|
|
|
|
|
tdd = if_live[F("timeout")] | -1;
|
2020-11-04 11:04:40 +01:00
|
|
|
if (tdd >= 0) realtimeTimeoutMs = tdd * 100;
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(arlsForceMaxBri, if_live[F("maxbri")]);
|
|
|
|
CJSON(arlsDisableGammaCorrection, if_live[F("no-gc")]); // false
|
|
|
|
CJSON(arlsOffset, if_live[F("offset")]); // 0
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(alexaEnabled, interfaces[F("va")][F("alexa")]); // false
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(macroAlexaOn, interfaces[F("va")][F("macros")][0]);
|
|
|
|
CJSON(macroAlexaOff, interfaces[F("va")][F("macros")][1]);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
const char* apikey = interfaces[F("blynk")][F("token")] | "Hidden";
|
2020-11-04 11:04:40 +01:00
|
|
|
tdd = strnlen(apikey, 36);
|
|
|
|
if (tdd > 20 || tdd == 0)
|
|
|
|
getStringFromJson(blynkApiKey, apikey, 36); //normally not present due to security
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject if_mqtt = interfaces[F("mqtt")];
|
|
|
|
CJSON(mqttEnabled, if_mqtt[F("en")]);
|
|
|
|
getStringFromJson(mqttServer, if_mqtt[F("broker")], 33);
|
|
|
|
CJSON(mqttPort, if_mqtt[F("port")]); // 1883
|
|
|
|
getStringFromJson(mqttUser, if_mqtt[F("user")], 41);
|
2020-11-04 11:04:40 +01:00
|
|
|
getStringFromJson(mqttPass, if_mqtt["psk"], 41); //normally not present due to security
|
2020-11-07 23:54:56 +01:00
|
|
|
getStringFromJson(mqttClientID, if_mqtt[F("cid")], 41);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
getStringFromJson(mqttDeviceTopic, if_mqtt[F("topics")][F("device")], 33); // "wled/test"
|
|
|
|
getStringFromJson(mqttGroupTopic, if_mqtt[F("topics")][F("group")], 33); // ""
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject if_hue = interfaces[F("hue")];
|
|
|
|
CJSON(huePollingEnabled, if_hue[F("en")]);
|
|
|
|
CJSON(huePollLightId, if_hue[F("id")]);
|
|
|
|
tdd = if_hue[F("iv")] | -1;
|
2020-11-04 11:04:40 +01:00
|
|
|
if (tdd >= 2) huePollIntervalMs = tdd * 100;
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject if_hue_recv = if_hue[F("recv")];
|
2020-11-04 11:04:40 +01:00
|
|
|
CJSON(hueApplyOnOff, if_hue_recv["on"]);
|
|
|
|
CJSON(hueApplyBri, if_hue_recv["bri"]);
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(hueApplyColor, if_hue_recv[F("col")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonArray if_hue_ip = if_hue[F("ip")];
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
for (byte i = 0; i < 4; i++)
|
|
|
|
CJSON(hueIP[i], if_hue_ip[i]);
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject if_ntp = interfaces[F("ntp")];
|
|
|
|
CJSON(ntpEnabled, if_ntp[F("en")]);
|
|
|
|
getStringFromJson(ntpServerName, if_ntp[F("host")], 33); // "1.wled.pool.ntp.org"
|
|
|
|
CJSON(currentTimezone, if_ntp[F("tz")]);
|
|
|
|
CJSON(utcOffsetSecs, if_ntp[F("offset")]);
|
|
|
|
CJSON(useAMPM, if_ntp[F("ampm")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject ol = doc[F("ol")];
|
|
|
|
CJSON(overlayDefault ,ol[F("clock")]); // 0
|
|
|
|
CJSON(countdownMode, ol[F("cntdwn")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
overlayCurrent = overlayDefault;
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonArray ol_cntdwn = ol[F("cntdwn")]; //[20,12,31,23,59,59]
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
//timed macro rules
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject tm = doc[F("timers")];
|
|
|
|
JsonObject cntdwn = tm[F("cntdwn")];
|
|
|
|
JsonArray cntdwn_goal = cntdwn[F("goal")];
|
2020-11-04 11:04:40 +01:00
|
|
|
CJSON(countdownYear, cntdwn_goal[0]);
|
|
|
|
CJSON(countdownMonth, cntdwn_goal[1]);
|
|
|
|
CJSON(countdownDay, cntdwn_goal[2]);
|
|
|
|
CJSON(countdownHour, cntdwn_goal[3]);
|
|
|
|
CJSON(countdownMin, cntdwn_goal[4]);
|
|
|
|
CJSON(countdownSec, cntdwn_goal[5]);
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(macroCountdown, cntdwn[F("macro")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonArray timers = tm[F("ins")];
|
2020-11-04 11:04:40 +01:00
|
|
|
uint8_t it = 0;
|
|
|
|
for (JsonObject timer : timers) {
|
|
|
|
if (it > 7) break;
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(timerHours[it], timer[F("hour")]);
|
|
|
|
CJSON(timerMinutes[it], timer[F("min")]);
|
|
|
|
CJSON(timerMacro[it], timer[F("macro")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
byte dowPrev = timerWeekday[it];
|
|
|
|
bool actPrev = timerWeekday[it] & 0x01;
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(timerWeekday[it], timer[F("dow")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
if (timerWeekday[it] != dowPrev) { //present in JSON
|
|
|
|
timerWeekday[it] <<= 1; //add active bit
|
2020-11-07 23:54:56 +01:00
|
|
|
bool act = timer[F("en")] | actPrev;
|
2020-11-04 11:04:40 +01:00
|
|
|
if (act) timerWeekday[it]++;
|
|
|
|
}
|
|
|
|
|
|
|
|
it++;
|
|
|
|
}
|
|
|
|
|
|
|
|
JsonObject ota = doc["ota"];
|
|
|
|
const char* pwd = ota["psk"]; //normally not present due to security
|
|
|
|
|
|
|
|
bool pwdCorrect = !otaLock; //always allow access if ota not locked
|
|
|
|
if (pwd != nullptr && strncmp(otaPass, pwd, 33) == 0) pwdCorrect = true;
|
|
|
|
|
|
|
|
if (pwdCorrect) { //only accept these values from cfg.json if ota is unlocked (else from wsec.json)
|
2020-11-07 23:54:56 +01:00
|
|
|
CJSON(otaLock, ota[F("lock")]);
|
|
|
|
CJSON(wifiLock, ota[F("lock-wifi")]);
|
|
|
|
CJSON(aOtaEnabled, ota[F("aota")]);
|
2020-11-04 11:04:40 +01:00
|
|
|
getStringFromJson(otaPass, pwd, 33); //normally not present due to security
|
|
|
|
}
|
2020-11-04 17:17:54 +01:00
|
|
|
|
2020-11-09 11:09:47 +01:00
|
|
|
#ifdef WLED_ENABLE_DMX
|
|
|
|
JsonObject dmx = doc["dmx"];
|
|
|
|
CJSON(DMXChannels, dmx[F("chan")]);
|
|
|
|
CJSON(DMXGap,dmx[F("gap")]);
|
|
|
|
CJSON(DMXStart, dmx[F("start")]);
|
|
|
|
CJSON(DMXStartLED,dmx[F("start-led")]);
|
|
|
|
|
|
|
|
JsonArray dmx_fixmap = dmx.createNestedArray("fixmap");
|
|
|
|
it = 0;
|
|
|
|
for (int i : dmx_fixmap) {
|
|
|
|
if (it > 14) break;
|
|
|
|
DMXFixtureMap[i] = i;
|
|
|
|
it++;
|
|
|
|
}
|
|
|
|
#endif
|
2020-11-11 15:50:15 +01:00
|
|
|
|
|
|
|
JsonObject usermods_settings = doc["um"];
|
|
|
|
usermods.readFromConfig(usermods_settings);
|
2020-11-04 11:04:40 +01:00
|
|
|
}
|
|
|
|
|
2020-11-05 22:54:13 +01:00
|
|
|
void serializeConfig() {
|
2020-11-07 23:54:56 +01:00
|
|
|
serializeConfigSec();
|
|
|
|
|
2020-11-06 22:12:48 +01:00
|
|
|
DEBUG_PRINTLN(F("Writing settings to /cfg.json..."));
|
|
|
|
|
2020-11-04 11:04:40 +01:00
|
|
|
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
|
|
|
|
|
2020-11-06 22:12:48 +01:00
|
|
|
//{ //scope this to reduce stack size
|
2020-11-04 11:04:40 +01:00
|
|
|
JsonArray rev = doc.createNestedArray("rev");
|
|
|
|
rev.add(1); //major settings revision
|
|
|
|
rev.add(0); //minor settings revision
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
doc[F("vid")] = VERSION;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject id = doc.createNestedObject("id");
|
2020-11-07 23:54:56 +01:00
|
|
|
id[F("mdns")] = cmDNS;
|
|
|
|
id[F("name")] = serverDescription;
|
|
|
|
id[F("inv")] = alexaInvocationName;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject nw = doc.createNestedObject("nw");
|
|
|
|
|
|
|
|
JsonArray nw_ins = nw.createNestedArray("ins");
|
|
|
|
|
|
|
|
JsonObject nw_ins_0 = nw_ins.createNestedObject();
|
2020-11-07 23:54:56 +01:00
|
|
|
nw_ins_0[F("ssid")] = clientSSID;
|
|
|
|
nw_ins_0[F("pskl")] = strlen(clientPass);
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonArray nw_ins_0_ip = nw_ins_0.createNestedArray("ip");
|
|
|
|
JsonArray nw_ins_0_gw = nw_ins_0.createNestedArray("gw");
|
|
|
|
JsonArray nw_ins_0_sn = nw_ins_0.createNestedArray("sn");
|
|
|
|
|
|
|
|
for (byte i = 0; i < 4; i++) {
|
|
|
|
nw_ins_0_ip.add(staticIP[i]);
|
|
|
|
nw_ins_0_gw.add(staticGateway[i]);
|
|
|
|
nw_ins_0_sn.add(staticSubnet[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
JsonObject ap = doc.createNestedObject("ap");
|
2020-11-07 23:54:56 +01:00
|
|
|
ap[F("ssid")] = apSSID;
|
|
|
|
ap[F("pskl")] = strlen(apPass);
|
|
|
|
ap[F("chan")] = apChannel;
|
|
|
|
ap[F("behav")] = apBehavior;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonArray ap_ip = ap.createNestedArray("ip");
|
|
|
|
ap_ip.add(4);
|
|
|
|
ap_ip.add(3);
|
|
|
|
ap_ip.add(2);
|
|
|
|
ap_ip.add(1);
|
|
|
|
|
|
|
|
JsonObject wifi = doc.createNestedObject("wifi");
|
2020-11-07 23:54:56 +01:00
|
|
|
wifi[F("sleep")] = !noWifiSleep;
|
|
|
|
wifi[F("phy")] = 1;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject hw = doc.createNestedObject("hw");
|
|
|
|
|
|
|
|
JsonObject hw_led = hw.createNestedObject("led");
|
2020-11-07 23:54:56 +01:00
|
|
|
hw_led[F("total")] = ledCount;
|
|
|
|
hw_led[F("maxpwr")] = strip.ablMilliampsMax;
|
|
|
|
hw_led[F("ledma")] = strip.milliampsPerLed;
|
|
|
|
hw_led[F("rev")] = strip.reverseMode;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonArray hw_led_ins = hw_led.createNestedArray("ins");
|
|
|
|
|
|
|
|
JsonObject hw_led_ins_0 = hw_led_ins.createNestedObject();
|
2020-11-07 23:54:56 +01:00
|
|
|
hw_led_ins_0[F("en")] = true;
|
|
|
|
hw_led_ins_0[F("start")] = 0;
|
|
|
|
hw_led_ins_0[F("len")] = ledCount;
|
2020-11-04 11:04:40 +01:00
|
|
|
JsonArray hw_led_ins_0_pin = hw_led_ins_0.createNestedArray("pin");
|
|
|
|
hw_led_ins_0_pin.add(LEDPIN);
|
|
|
|
#ifdef DATAPIN
|
|
|
|
hw_led_ins_0_pin.add(DATAPIN);
|
|
|
|
#endif
|
2020-11-27 23:59:00 +01:00
|
|
|
hw_led_ins_0[F("order")] = strip.getColorOrder();
|
2020-11-07 23:54:56 +01:00
|
|
|
hw_led_ins_0[F("rev")] = false;
|
|
|
|
hw_led_ins_0[F("skip")] = skipFirstLed ? 1 : 0;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
//this is very crude and temporary
|
|
|
|
byte ledType = TYPE_WS2812_RGB;
|
2020-11-15 22:52:59 +01:00
|
|
|
if (useRGBW) ledType = TYPE_SK6812_RGBW;
|
2020-11-04 11:04:40 +01:00
|
|
|
#ifdef USE_WS2801
|
|
|
|
ledType = TYPE_WS2801;
|
|
|
|
#endif
|
|
|
|
#ifdef USE_APA102
|
|
|
|
ledType = TYPE_APA102;
|
|
|
|
#endif
|
|
|
|
#ifdef USE_LPD8806
|
|
|
|
ledType = TYPE_LPD8806;
|
|
|
|
#endif
|
|
|
|
#ifdef USE_P9813
|
|
|
|
ledType = TYPE_P9813;
|
|
|
|
#endif
|
|
|
|
#ifdef USE_TM1814
|
|
|
|
ledType = TYPE_TM1814;
|
|
|
|
#endif
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
hw_led_ins_0[F("type")] = ledType;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject hw_btn = hw.createNestedObject("btn");
|
|
|
|
|
|
|
|
JsonArray hw_btn_ins = hw_btn.createNestedArray("ins");
|
|
|
|
|
2020-11-17 09:25:31 +01:00
|
|
|
#if defined(BTNPIN) && BTNPIN > -1
|
2020-11-04 11:04:40 +01:00
|
|
|
JsonObject hw_btn_ins_0 = hw_btn_ins.createNestedObject();
|
2020-11-07 23:54:56 +01:00
|
|
|
hw_btn_ins_0[F("type")] = (buttonEnabled) ? BTN_TYPE_PUSH : BTN_TYPE_NONE;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonArray hw_btn_ins_0_pin = hw_btn_ins_0.createNestedArray("pin");
|
|
|
|
hw_btn_ins_0_pin.add(BTNPIN);
|
|
|
|
|
|
|
|
JsonArray hw_btn_ins_0_macros = hw_btn_ins_0.createNestedArray("macros");
|
|
|
|
hw_btn_ins_0_macros.add(macroButton);
|
|
|
|
hw_btn_ins_0_macros.add(macroLongPress);
|
|
|
|
hw_btn_ins_0_macros.add(macroDoublePress);
|
2020-11-17 09:25:31 +01:00
|
|
|
#endif
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-17 09:25:31 +01:00
|
|
|
#if defined(IRPIN) && IRPIN > -1
|
2020-11-04 11:04:40 +01:00
|
|
|
JsonObject hw_ir = hw.createNestedObject("ir");
|
2020-11-29 20:47:13 +01:00
|
|
|
hw_ir[F("pin")] = IRPIN;
|
2020-11-29 22:29:44 +01:00
|
|
|
hw_ir[F("type")] = irEnabled; // the byte 'irEnabled' does contain the IR-Remote Type ( 0=disabled )
|
2020-11-17 09:25:31 +01:00
|
|
|
#endif
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-17 09:25:31 +01:00
|
|
|
#if defined(RLYPIN) && RLYPIN > -1
|
2020-11-04 11:04:40 +01:00
|
|
|
JsonObject hw_relay = hw.createNestedObject("relay");
|
2020-11-07 23:54:56 +01:00
|
|
|
hw_relay[F("pin")] = RLYPIN;
|
|
|
|
hw_relay[F("rev")] = (RLYMDE) ? false : true;
|
2020-11-04 11:04:40 +01:00
|
|
|
JsonObject hw_status = hw.createNestedObject("status");
|
2020-11-07 23:54:56 +01:00
|
|
|
hw_status[F("pin")] = -1;
|
2020-11-17 09:25:31 +01:00
|
|
|
#endif
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject light = doc.createNestedObject("light");
|
2020-11-07 23:54:56 +01:00
|
|
|
light[F("scale-bri")] = briMultiplier;
|
|
|
|
light[F("pal-mode")] = strip.paletteBlend;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject light_gc = light.createNestedObject("gc");
|
|
|
|
light_gc["bri"] = (strip.gammaCorrectBri) ? 2.8 : 1.0;
|
2020-11-07 23:54:56 +01:00
|
|
|
light_gc[F("col")] = (strip.gammaCorrectCol) ? 2.8 : 1.0;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject light_tr = light.createNestedObject("tr");
|
2020-11-07 23:54:56 +01:00
|
|
|
light_tr[F("mode")] = fadeTransition;
|
|
|
|
light_tr[F("dur")] = transitionDelayDefault / 100;
|
|
|
|
light_tr[F("pal")] = strip.paletteFade;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject light_nl = light.createNestedObject("nl");
|
2020-11-07 23:54:56 +01:00
|
|
|
light_nl[F("mode")] = nightlightMode;
|
|
|
|
light_nl[F("dur")] = nightlightDelayMinsDefault;
|
|
|
|
light_nl[F("tbri")] = nightlightTargetBri;
|
|
|
|
light_nl[F("macro")] = macroNl;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject def = doc.createNestedObject("def");
|
2020-11-07 23:54:56 +01:00
|
|
|
def[F("ps")] = bootPreset;
|
2020-11-04 11:04:40 +01:00
|
|
|
def["on"] = turnOnAtBoot;
|
|
|
|
def["bri"] = briS;
|
|
|
|
|
|
|
|
//to be removed once preset cycles are presets
|
|
|
|
if (saveCurrPresetCycConf) {
|
|
|
|
JsonObject def_cy = def.createNestedObject("cy");
|
|
|
|
def_cy["on"] = presetCyclingEnabled;
|
|
|
|
|
|
|
|
JsonArray def_cy_range = def_cy.createNestedArray("range");
|
|
|
|
def_cy_range.add(presetCycleMin);
|
|
|
|
def_cy_range.add(presetCycleMax);
|
2020-11-07 23:54:56 +01:00
|
|
|
def_cy[F("dur")] = presetCycleTime / 100;
|
2020-11-04 11:04:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
JsonObject interfaces = doc.createNestedObject("if");
|
|
|
|
|
|
|
|
JsonObject if_sync = interfaces.createNestedObject("sync");
|
2020-11-07 23:54:56 +01:00
|
|
|
if_sync[F("port0")] = udpPort;
|
|
|
|
if_sync[F("port1")] = udpPort2;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject if_sync_recv = if_sync.createNestedObject("recv");
|
|
|
|
if_sync_recv["bri"] = receiveNotificationBrightness;
|
2020-11-07 23:54:56 +01:00
|
|
|
if_sync_recv[F("col")] = receiveNotificationColor;
|
|
|
|
if_sync_recv[F("fx")] = receiveNotificationEffects;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject if_sync_send = if_sync.createNestedObject("send");
|
2020-11-07 23:54:56 +01:00
|
|
|
if_sync_send[F("dir")] = notifyDirect;
|
|
|
|
if_sync_send[F("btn")] = notifyButton;
|
|
|
|
if_sync_send[F("va")] = notifyAlexa;
|
|
|
|
if_sync_send[F("hue")] = notifyHue;
|
|
|
|
if_sync_send[F("macro")] = notifyMacro;
|
|
|
|
if_sync_send[F("twice")] = notifyTwice;
|
|
|
|
|
|
|
|
JsonObject if_live = interfaces.createNestedObject("live");
|
|
|
|
if_live[F("en")] = receiveDirect;
|
|
|
|
if_live[F("port")] = e131Port;
|
|
|
|
if_live[F("mc")] = e131Multicast;
|
|
|
|
|
|
|
|
JsonObject if_live_dmx = if_live.createNestedObject("dmx");
|
|
|
|
if_live_dmx[F("uni")] = e131Universe;
|
|
|
|
if_live_dmx[F("seqskip")] = e131SkipOutOfSequence;
|
|
|
|
if_live_dmx[F("addr")] = DMXAddress;
|
|
|
|
if_live_dmx[F("mode")] = DMXMode;
|
|
|
|
if_live[F("timeout")] = realtimeTimeoutMs / 100;
|
|
|
|
if_live[F("maxbri")] = arlsForceMaxBri;
|
|
|
|
if_live[F("no-gc")] = arlsDisableGammaCorrection;
|
|
|
|
if_live[F("offset")] = arlsOffset;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject if_va = interfaces.createNestedObject("va");
|
2020-11-07 23:54:56 +01:00
|
|
|
if_va[F("alexa")] = alexaEnabled;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonArray if_va_macros = if_va.createNestedArray("macros");
|
|
|
|
if_va_macros.add(macroAlexaOn);
|
|
|
|
if_va_macros.add(macroAlexaOff);
|
|
|
|
JsonObject if_blynk = interfaces.createNestedObject("blynk");
|
2020-11-07 23:54:56 +01:00
|
|
|
if_blynk[F("token")] = strlen(blynkApiKey) ? "Hidden":"";
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject if_mqtt = interfaces.createNestedObject("mqtt");
|
2020-11-07 23:54:56 +01:00
|
|
|
if_mqtt[F("en")] = mqttEnabled;
|
|
|
|
if_mqtt[F("broker")] = mqttServer;
|
|
|
|
if_mqtt[F("port")] = mqttPort;
|
|
|
|
if_mqtt[F("user")] = mqttUser;
|
|
|
|
if_mqtt[F("pskl")] = strlen(mqttPass);
|
|
|
|
if_mqtt[F("cid")] = mqttClientID;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject if_mqtt_topics = if_mqtt.createNestedObject("topics");
|
2020-11-07 23:54:56 +01:00
|
|
|
if_mqtt_topics[F("device")] = mqttDeviceTopic;
|
|
|
|
if_mqtt_topics[F("group")] = mqttGroupTopic;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject if_hue = interfaces.createNestedObject("hue");
|
2020-11-07 23:54:56 +01:00
|
|
|
if_hue[F("en")] = huePollingEnabled;
|
|
|
|
if_hue[F("id")] = huePollLightId;
|
|
|
|
if_hue[F("iv")] = huePollIntervalMs / 100;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject if_hue_recv = if_hue.createNestedObject("recv");
|
|
|
|
if_hue_recv["on"] = hueApplyOnOff;
|
|
|
|
if_hue_recv["bri"] = hueApplyBri;
|
2020-11-07 23:54:56 +01:00
|
|
|
if_hue_recv[F("col")] = hueApplyColor;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonArray if_hue_ip = if_hue.createNestedArray("ip");
|
|
|
|
for (byte i = 0; i < 4; i++) {
|
|
|
|
if_hue_ip.add(hueIP[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
JsonObject if_ntp = interfaces.createNestedObject("ntp");
|
2020-11-07 23:54:56 +01:00
|
|
|
if_ntp[F("en")] = ntpEnabled;
|
|
|
|
if_ntp[F("host")] = ntpServerName;
|
|
|
|
if_ntp[F("tz")] = currentTimezone;
|
|
|
|
if_ntp[F("offset")] = utcOffsetSecs;
|
|
|
|
if_ntp[F("ampm")] = useAMPM;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject ol = doc.createNestedObject("ol");
|
2020-11-07 23:54:56 +01:00
|
|
|
ol[F("clock")] = overlayDefault;
|
|
|
|
ol[F("cntdwn")] = countdownMode;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonObject timers = doc.createNestedObject("timers");
|
|
|
|
|
|
|
|
JsonObject cntdwn = timers.createNestedObject("cntdwn");
|
|
|
|
JsonArray goal = cntdwn.createNestedArray("goal");
|
|
|
|
goal.add(countdownYear); goal.add(countdownMonth); goal.add(countdownDay);
|
|
|
|
goal.add(countdownHour); goal.add(countdownMin); goal.add(countdownSec);
|
2020-11-07 23:54:56 +01:00
|
|
|
cntdwn[F("macro")] = macroCountdown;
|
2020-11-04 11:04:40 +01:00
|
|
|
|
|
|
|
JsonArray timers_ins = timers.createNestedArray("ins");
|
|
|
|
|
|
|
|
for (byte i = 0; i < 8; i++) {
|
2020-11-07 23:54:56 +01:00
|
|
|
if (timerMacro[i] == 0 && timerHours[i] == 0 && timerMinutes[i] == 0) continue;
|
2020-11-04 11:04:40 +01:00
|
|
|
JsonObject timers_ins0 = timers_ins.createNestedObject();
|
2020-11-07 23:54:56 +01:00
|
|
|
timers_ins0[F("en")] = (timerWeekday[i] & 0x01);
|
|
|
|
timers_ins0[F("hour")] = timerHours[i];
|
|
|
|
timers_ins0[F("min")] = timerMinutes[i];
|
|
|
|
timers_ins0[F("macro")] = timerMacro[i];
|
|
|
|
timers_ins0[F("dow")] = timerWeekday[i] >> 1;
|
2020-11-04 11:04:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
JsonObject ota = doc.createNestedObject("ota");
|
2020-11-07 23:54:56 +01:00
|
|
|
ota[F("lock")] = otaLock;
|
|
|
|
ota[F("lock-wifi")] = wifiLock;
|
|
|
|
ota[F("pskl")] = strlen(otaPass);
|
|
|
|
ota[F("aota")] = aOtaEnabled;
|
2020-11-08 23:44:10 +01:00
|
|
|
|
|
|
|
#ifdef WLED_ENABLE_DMX
|
|
|
|
JsonObject dmx = doc.createNestedObject("dmx");
|
|
|
|
dmx[F("chan")] = DMXChannels;
|
|
|
|
dmx[F("gap")] = DMXGap;
|
|
|
|
dmx[F("start")] = DMXStart;
|
|
|
|
dmx[F("start-led")] = DMXStartLED;
|
|
|
|
|
|
|
|
JsonArray dmx_fixmap = dmx.createNestedArray("fixmap");
|
|
|
|
for (byte i = 0; i < 15; i++)
|
|
|
|
dmx_fixmap.add(DMXFixtureMap[i]);
|
|
|
|
#endif
|
2020-11-06 22:12:48 +01:00
|
|
|
//}
|
2020-11-04 11:04:40 +01:00
|
|
|
|
2020-11-11 15:50:15 +01:00
|
|
|
JsonObject usermods_settings = doc.createNestedObject("um");
|
|
|
|
usermods.addToConfig(usermods_settings);
|
|
|
|
|
2020-11-06 22:12:48 +01:00
|
|
|
File f = WLED_FS.open("/cfg.json", "w");
|
|
|
|
if (f) serializeJson(doc, f);
|
|
|
|
f.close();
|
2020-11-04 17:17:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
//settings in /wsec.json, not accessible via webserver, for passwords and tokens
|
2020-11-05 22:54:13 +01:00
|
|
|
bool deserializeConfigSec() {
|
2020-11-06 22:12:48 +01:00
|
|
|
DEBUG_PRINTLN(F("Reading settings from /wsec.json..."));
|
|
|
|
|
2020-11-04 17:17:54 +01:00
|
|
|
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
|
|
|
|
|
2020-11-06 22:12:48 +01:00
|
|
|
bool success = readObjectFromFile("/wsec.json", nullptr, &doc);
|
|
|
|
if (!success) return false;
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject nw_ins_0 = doc["nw"][F("ins")][0];
|
2020-11-04 17:17:54 +01:00
|
|
|
getStringFromJson(clientPass, nw_ins_0["psk"], 65);
|
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject ap = doc[F("ap")];
|
2020-11-04 17:17:54 +01:00
|
|
|
getStringFromJson(apPass, ap["psk"] , 65);
|
|
|
|
|
2020-11-05 22:54:13 +01:00
|
|
|
JsonObject interfaces = doc["if"];
|
2020-11-04 17:17:54 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
const char* apikey = interfaces["blynk"][F("token")] | "Hidden";
|
2020-11-05 22:54:13 +01:00
|
|
|
int tdd = strnlen(apikey, 36);
|
|
|
|
if (tdd > 20 || tdd == 0)
|
|
|
|
getStringFromJson(blynkApiKey, apikey, 36);
|
2020-11-04 17:17:54 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
JsonObject if_mqtt = interfaces[F("mqtt")];
|
2020-11-05 22:54:13 +01:00
|
|
|
getStringFromJson(mqttPass, if_mqtt["psk"], 41);
|
2020-11-04 17:17:54 +01:00
|
|
|
|
2020-11-07 23:54:56 +01:00
|
|
|
getStringFromJson(hueApiKey, interfaces[F("hue")][F("key")], 47);
|
2020-11-05 22:54:13 +01:00
|
|
|
|
|
|
|
JsonObject ota = doc["ota"];
|
2020-11-07 23:54:56 +01:00
|
|
|
getStringFromJson(otaPass, ota[F("pwd")], 33);
|
|
|
|
CJSON(otaLock, ota[F("lock")]);
|
|
|
|
CJSON(wifiLock, ota[F("lock-wifi")]);
|
|
|
|
CJSON(aOtaEnabled, ota[F("aota")]);
|
2020-11-06 22:12:48 +01:00
|
|
|
|
|
|
|
return true;
|
2020-11-04 17:17:54 +01:00
|
|
|
}
|
|
|
|
|
2020-11-05 22:54:13 +01:00
|
|
|
void serializeConfigSec() {
|
2020-11-06 22:12:48 +01:00
|
|
|
DEBUG_PRINTLN(F("Writing settings to /wsec.json..."));
|
|
|
|
|
|
|
|
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
|
|
|
|
|
|
|
|
JsonObject nw = doc.createNestedObject("nw");
|
|
|
|
|
|
|
|
JsonArray nw_ins = nw.createNestedArray("ins");
|
|
|
|
|
|
|
|
JsonObject nw_ins_0 = nw_ins.createNestedObject();
|
|
|
|
nw_ins_0["psk"] = clientPass;
|
|
|
|
|
|
|
|
JsonObject ap = doc.createNestedObject("ap");
|
|
|
|
ap["psk"] = apPass;
|
|
|
|
|
|
|
|
JsonObject interfaces = doc.createNestedObject("if");
|
|
|
|
JsonObject if_blynk = interfaces.createNestedObject("blynk");
|
2020-11-07 23:54:56 +01:00
|
|
|
if_blynk[F("token")] = blynkApiKey;
|
2020-11-06 22:12:48 +01:00
|
|
|
JsonObject if_mqtt = interfaces.createNestedObject("mqtt");
|
|
|
|
if_mqtt["psk"] = mqttPass;
|
|
|
|
JsonObject if_hue = interfaces.createNestedObject("hue");
|
2020-11-07 23:54:56 +01:00
|
|
|
if_hue[F("key")] = hueApiKey;
|
2020-11-06 22:12:48 +01:00
|
|
|
|
|
|
|
JsonObject ota = doc.createNestedObject("ota");
|
2020-11-07 23:54:56 +01:00
|
|
|
ota[F("pwd")] = otaPass;
|
|
|
|
ota[F("lock")] = otaLock;
|
|
|
|
ota[F("lock-wifi")] = wifiLock;
|
|
|
|
ota[F("aota")] = aOtaEnabled;
|
2020-11-04 17:17:54 +01:00
|
|
|
|
2020-11-06 22:12:48 +01:00
|
|
|
File f = WLED_FS.open("/wsec.json", "w");
|
|
|
|
if (f) serializeJson(doc, f);
|
|
|
|
f.close();
|
2020-11-04 11:04:40 +01:00
|
|
|
}
|