diff --git a/src/CHANGES.md b/src/CHANGES.md index dccaa36a..e8b984e2 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -1,5 +1,8 @@ # Development Changes +## 0.8.136 - 2024-08-12 +* fix save settings for ESP32 devices #1720 + ## 0.8.135 - 2024-08-11 * translated `/system` #1717 * added default pin seetings for opendtufusion board diff --git a/src/defines.h b/src/defines.h index b1d7395d..fd6675cd 100644 --- a/src/defines.h +++ b/src/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 8 -#define VERSION_PATCH 135 +#define VERSION_PATCH 136 //------------------------------------- typedef struct { uint8_t ch; diff --git a/src/web/html/setup.html b/src/web/html/setup.html index 63b700bf..e7862489 100644 --- a/src/web/html/setup.html +++ b/src/web/html/setup.html @@ -682,20 +682,21 @@ } function parseSys(obj) { - for(var i of [["device", "device_name"], ["ssid", "ssid"], ["ap_pwd", "ap_pwd"]]) - document.getElementsByName(i[0])[0].value = obj[i[1]]; - document.getElementsByName("hidd")[0].checked = obj["hidd"]; + document.getElementsByName("device")[0].value = obj.device_name; + for(var i of [["ssid", "ssid"], ["ap_pwd", "ap_pwd"]]) + document.getElementsByName(i[0])[0].value = obj.network[i[1]]; + document.getElementsByName("hidd")[0].checked = obj.network.hidd; - document.getElementsByName("darkMode")[0].checked = obj["dark_mode"]; - document.getElementsByName("schedReboot")[0].checked = obj["sched_reboot"]; + document.getElementsByName("darkMode")[0].checked = obj.dark_mode; + document.getElementsByName("schedReboot")[0].checked = obj.sched_reboot; e = document.getElementsByName("adminpwd")[0]; - if(!obj["pwd_set"]) + if(!obj.pwd_set) e.value = ""; var d = document.getElementById("prot_mask"); var a = ["Index", "{#NAV_LIVE}", "{#NAV_WEBSERIAL}", "{#NAV_SETTINGS}", "Update", "System", "{#NAV_HISTORY}"]; var el = []; for(var i = 0; i < 7; i++) { - var chk = ((obj["prot_mask"] & (1 << i)) == (1 << i)); + var chk = ((obj.prot_mask & (1 << i)) == (1 << i)); el.push(mlCb("protMask" + i, a[i], chk)) } d.append(...el); @@ -720,7 +721,7 @@ document.getElementsByName("cstLnkTxt")[0].value = obj.cst_lnk_txt } - ts = obj["ts_now"]; + ts = obj.ts_now; window.setInterval("tick()", 1000); } @@ -1330,23 +1331,23 @@ function parse(root) { if(null != root) { - parseGeneric(root["generic"]); - parseSys(root["system"]); - parseStaticIp(root["static_ip"]); - parseMqtt(root["mqtt"]); - parseNtp(root["ntp"]); - parseSun(root["sun"]); + parseGeneric(root.generic); + parseSys(root.system); + parseStaticIp(root.static_ip); + parseMqtt(root.mqtt); + parseNtp(root.ntp); + parseSun(root.sun); parsePinout(root.pinout); - parseNrfRadio(root["radioNrf"], root["pinout"]); + parseNrfRadio(root.radioNrf, root.pinout); /*IF_ESP32*/ parseCmtRadio(root.radioCmt); /*ENDIF_ESP32*/ /*IF_ETHERNET*/ parseEth(root.eth) /*ENDIF_ETHERNET*/ - parseSerial(root["serial"]); + parseSerial(root.serial); /*IF_PLUGIN_DISPLAY*/ - parseDisplay(root["display"], root["system"]["esp_type"], root["system"]); + parseDisplay(root.display, root.system.esp_type, root.system); /*ENDIF_PLUGIN_DISPLAY*/ getAjax("/api/inverter/list", parseIv); }