From 3338b86974836107e233e7a6f58db5a96142c9a3 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Sun, 8 May 2022 04:14:50 +0200 Subject: [PATCH] Update script.js to allow filler to use multiple forms --- data/script.js | 5 ++--- data/script.js.gz | Bin 2010 -> 2006 bytes src/hasp_debug.cpp | 3 --- src/hasp_debug.h | 2 -- src/sys/svc/hasp_http.cpp | 22 ++++++++++++++-------- src/sys/svc/hasp_http_async.cpp | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data/script.js b/data/script.js index ff8ba7d8..5cc11ab3 100644 --- a/data/script.js +++ b/data/script.js @@ -40,9 +40,8 @@ function loader(e, t, o) { }); } function fill() { - (data = JSON.parse(this.response)), - (form = document.forms.item(0)), - populate(form, data); + data = JSON.parse(this.response); + for (const form of document.forms) populate(form, data); } function filler(e, t) { window.addEventListener("load", function () { diff --git a/data/script.js.gz b/data/script.js.gz index 768c3cbec5560b63b49fdccb041f194b0d4909f9..cc985c52405aacc0f114b25665a21046850ee9fc 100644 GIT binary patch literal 2006 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 diff --git a/src/hasp_debug.cpp b/src/hasp_debug.cpp index f554cdd6..f056db21 100644 --- a/src/hasp_debug.cpp +++ b/src/hasp_debug.cpp @@ -297,9 +297,6 @@ void debug_get_tag(uint8_t tag, char* buffer) case TAG_OTA: memcpy_P(buffer, PSTR("OTA "), 5); break; - case TAG_FWUP: - memcpy_P(buffer, PSTR("FWUP"), 5); - break; case TAG_LVGL: memcpy_P(buffer, PSTR("LVGL"), 5); diff --git a/src/hasp_debug.h b/src/hasp_debug.h index 68c6db96..f4a68901 100644 --- a/src/hasp_debug.h +++ b/src/hasp_debug.h @@ -182,8 +182,6 @@ enum { TAG_FILE = 31, TAG_GPIO = 40, - TAG_FWUP = 50, - TAG_ETH = 60, TAG_WIFI = 61, TAG_HTTP = 62, diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp index d84021d6..6070cad7 100644 --- a/src/sys/svc/hasp_http.cpp +++ b/src/sys/svc/hasp_http.cpp @@ -90,12 +90,12 @@ const char MAIN_MENU_BUTTON[] PROGMEM = "" D_HTTP_MAIN_MENU ""; const char HTTP_DOCTYPE[] PROGMEM = ""; const char HTTP_META_GO_BACK[] PROGMEM = ""; +const char HTTP_STYLESHEET[] PROGMEM = ""; const char HTTP_HEADER[] PROGMEM = "%s"; -const char HTTP_HEADER_END[] PROGMEM = - "" - "
"; -const char HTTP_FOOTER[] PROGMEM = "
" D_MANUFACTURER " "; -const char HTTP_END[] PROGMEM = " " D_HTTP_FOOTER "
"; +const char HTTP_HEADER_END[] PROGMEM = "" + "
"; +const char HTTP_FOOTER[] PROGMEM = "
" D_MANUFACTURER " "; +const char HTTP_END[] PROGMEM = " " D_HTTP_FOOTER "
"; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -218,7 +218,8 @@ static void webSendHeader(const char* nodename, uint32_t httpdatalength, uint8_t /* Calculate Content Length upfront */ uint32_t contentLength = strlen(haspDevice.get_version()); // version length contentLength += sizeof(HTTP_DOCTYPE) - 1; - contentLength += sizeof(HTTP_HEADER) - 1 - 2 + strlen(nodename); // -2 for %s + contentLength += sizeof(HTTP_HEADER) - 1 - 2 + strlen(nodename); // -2 for %s + contentLength += sizeof(HTTP_STYLESHEET) - 1 - 2 + strlen("vars"); // -2 for %s if(gohome > 0) { snprintf_P(buffer, sizeof(buffer), HTTP_META_GO_BACK, gohome); contentLength += strlen(buffer); // gohome @@ -241,6 +242,9 @@ static void webSendHeader(const char* nodename, uint32_t httpdatalength, uint8_t #endif webServer.sendContent(buffer); // gohome + snprintf_P(buffer, sizeof(buffer), HTTP_STYLESHEET, "vars"); + webServer.sendContent(buffer); // stylesheet + snprintf_P(buffer, sizeof(buffer), HTTP_HEADER, nodename); webServer.sendContent(buffer); // 17-2+len } @@ -1230,7 +1234,7 @@ static void webHandleGuiConfig() // Backlight Pin int8_t bcklpin = settings[FPSTR(FP_GUI_BACKLIGHTPIN)].as(); - httpMessage += F("
"); + httpMessage += F("
"); httpMessage += F("
"); + httpMessage += F("

Backlight Pin