3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-10 07:26:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

setup page complete converted to static version

Browse source
This commit is contained in:
lumapu 2022-08-28 13:54:34 +02:00
parent b6ac416665
commit 08d8658737
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tools/esp8266/api.cpp
View file

@ -44,8 +44,12 @@ void api::onSystem(AsyncWebServerRequest *request) {
AsyncJsonResponse* response = new AsyncJsonResponse(); AsyncJsonResponse* response = new AsyncJsonResponse();
JsonObject root = response->getRoot(); JsonObject root = response->getRoot();
root[F("ssid")] = mSysCfg->stationSsid; root[F("ssid")] = mSysCfg->stationSsid;
root[F("device_name")] = mSysCfg->deviceName; root[F("device_name")] = mSysCfg->deviceName;
root[F("version")] = String(mVersion);
root[F("build")] = String(AUTO_GIT_HASH);
root[F("ts_uptime")] = mApp->getUptime();
root[F("ts_now")] = mApp->getTimestamp();
response->setLength(); response->setLength();
//response->addHeader("Access-Control-Allow-Origin", "*"); //response->addHeader("Access-Control-Allow-Origin", "*");
@ -80,8 +84,8 @@ void api::onInverterList(AsyncWebServerRequest *request) {
obj[F("power_limit_option")] = iv->powerLimit[1]; obj[F("power_limit_option")] = iv->powerLimit[1];
} }
} }
root[F("interval")] = String(mConfig->sendInterval); root[F("interval")] = String(mConfig->sendInterval);
root[F("retries")] = String(mConfig->maxRetransPerPyld); root[F("retries")] = String(mConfig->maxRetransPerPyld);
root[F("max_num_inverters")] = MAX_NUM_INVERTERS; root[F("max_num_inverters")] = MAX_NUM_INVERTERS;
response->setLength(); response->setLength();
@ -150,8 +154,7 @@ void api::onSerial(AsyncWebServerRequest *request) {
AsyncJsonResponse* response = new AsyncJsonResponse(); AsyncJsonResponse* response = new AsyncJsonResponse();
JsonObject root = response->getRoot(); JsonObject root = response->getRoot();
// next line cause a chrash but why? root[F("interval")] = (uint16_t)mConfig->serialInterval;
//root[F("interval")] = mConfig->serialInterval;
root[F("show_live_data")] = mConfig->serialShowIv; root[F("show_live_data")] = mConfig->serialShowIv;
root[F("debug")] = mConfig->serialDebug; root[F("debug")] = mConfig->serialDebug;

10
tools/esp8266/html/setup.html
View file

@ -145,7 +145,7 @@
<div id="footer"> <div id="footer">
<p class="left"><a href="/">Home</a></p> <p class="left"><a href="/">Home</a></p>
<p class="left"><a href="/update">Update Firmware</a></p> <p class="left"><a href="/update">Update Firmware</a></p>
<p class="right">AHOY - {#VERSION}</p> <p class="right" id="version"></p>
<p class="right"><a href="/factory">Factory Reset</a></p> <p class="right"><a href="/factory">Factory Reset</a></p>
<p class="right"><a href="/reboot">Reboot</a></p> <p class="right"><a href="/reboot">Reboot</a></p>
</div> </div>
@ -265,6 +265,7 @@
function parseSys(obj) { function parseSys(obj) {
for(var i of [["device", "device_name"], ["ssid", "ssid"]]) for(var i of [["device", "device_name"], ["ssid", "ssid"]])
document.getElementsByName(i[0])[0].value = obj[i[1]]; document.getElementsByName(i[0])[0].value = obj[i[1]];
document.getElementById("version").innerHTML = "Git SHA: " + obj["build"] + " :: " + obj["version"];
} }
function parseIv(obj) { function parseIv(obj) {
@ -322,12 +323,19 @@
], obj["power_level"])); ], obj["power_level"]));
} }
function parseSerial(obj) {
for(var i of [["serEn", "show_live_data"], ["serDbg", "debug"]])
document.getElementsByName(i[0])[0].checked = obj[i[1]];
document.getElementsByName("serIntvl")[0].value = obj["interval"];
}
getAjax("/api/system", parseSys); getAjax("/api/system", parseSys);
getAjax("/api/inverter/list", parseIv); getAjax("/api/inverter/list", parseIv);
getAjax("/api/mqtt", parseMqtt); getAjax("/api/mqtt", parseMqtt);
getAjax("/api/ntp", parseNtp); getAjax("/api/ntp", parseNtp);
getAjax("/api/pinout", parsePinout); getAjax("/api/pinout", parsePinout);
getAjax("/api/radio", parseRadio); getAjax("/api/radio", parseRadio);
getAjax("/api/serial", parseSerial);
</script> </script>
</body> </body>
</html> </html>