diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp index e324d406..cf034d44 100644 --- a/src/sys/svc/hasp_http.cpp +++ b/src/sys/svc/hasp_http.cpp @@ -103,8 +103,7 @@ const char MAIN_MENU_BUTTON[] PROGMEM = const char MIT_LICENSE[] PROGMEM = "
MIT License

"; const char HTTP_DOCTYPE[] PROGMEM = ""; + "name=\"viewport\" content=\"width=device-width,initial-scale=1\"/>"; const char HTTP_META_GO_BACK[] PROGMEM = ""; const char HTTP_HEADER[] PROGMEM = "%s"; const char HTTP_STYLE[] PROGMEM = ""; @@ -123,19 +122,19 @@ const char HTTP_CSS[] PROGMEM = ";line-height:2.4rem;font-size:1.2rem;width:100%;}" //".q{float:right;width:64px;text-align:right;}" ".red{background-color:" D_HTTP_COLOR_BUTTON_RESET ";}" + "#doc{text-align:left;display:inline-block;color:" D_HTTP_COLOR_TEXT ";min-width:260px;}" // ".button3{background-color:#f44336;}" // ".button4{background-color:#e7e7e7;color:black;}" // ".button5{background-color:#555555;}" // ".button6{background-color:#4CAF50;}" "td{font-size:0.87rem;padding-bottom:0px;padding-top:0px;}th{padding-top:0.5em;}"; -const char HTTP_SCRIPT[] PROGMEM = ""; +// const char HTTP_SCRIPT[] PROGMEM = ""; const char HTTP_HEADER_END[] PROGMEM = - "
"; -const char HTTP_END[] PROGMEM = "
" D_MANUFACTURER " "; -const char HTTP_FOOTER[] PROGMEM = " " D_HTTP_FOOTER "
"; + "
"; +const char HTTP_FOOTER[] PROGMEM = "
" D_MANUFACTURER " "; +const char HTTP_END[] PROGMEM = " " D_HTTP_FOOTER "
"; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -146,12 +145,6 @@ const char HTTP_FOOTER[] PROGMEM = " " D_HTTP_FOOTER "
"; // // Default link to compiled Nextion firmware images // String lcdFirmwareUrl = "http://haswitchplate.com/update/HASwitchPlate.tft"; -// #if HASP_USE_MQTT > 0 -// extern char mqttNodeName[16]; -// #else -// char mqttNodeName[3] = "na"; -// #endif - //////////////////////////////////////////////////////////////////////////////////////////////////// String getOption(int value, String label, bool selected) { @@ -251,13 +244,13 @@ bool httpIsAuthenticated(const __FlashStringHelper* notused) void webSendFooter() { #if defined(STM32F4xx) - webServer.sendContent(HTTP_END); - webServer.sendContent(haspDevice.get_version()); webServer.sendContent(HTTP_FOOTER); -#else - webServer.sendContent_P(HTTP_END); webServer.sendContent(haspDevice.get_version()); + webServer.sendContent(HTTP_END); +#else webServer.sendContent_P(HTTP_FOOTER); + webServer.sendContent(haspDevice.get_version()); + webServer.sendContent_P(HTTP_END); #endif } @@ -281,13 +274,13 @@ void webSendPage(const char* nodename, uint32_t httpdatalength, bool gohome = fa 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_SCRIPT) - 1; + // contentLength += sizeof(HTTP_SCRIPT) - 1; contentLength += sizeof(HTTP_STYLE) - 1; // contentLength += sizeof(HASP_STYLE) - 1; if(gohome) contentLength += sizeof(HTTP_META_GO_BACK) - 1; contentLength += sizeof(HTTP_HEADER_END) - 1; - contentLength += sizeof(HTTP_END) - 1; contentLength += sizeof(HTTP_FOOTER) - 1; + contentLength += sizeof(HTTP_END) - 1; if(httpdatalength > HTTP_PAGE_SIZE) { LOG_WARNING(TAG_HTTP, F("Sending page with %u static and %u dynamic bytes"), contentLength, httpdatalength); @@ -305,13 +298,13 @@ void webSendPage(const char* nodename, uint32_t httpdatalength, bool gohome = fa } #if defined(STM32F4xx) - webServer.sendContent(HTTP_SCRIPT); // 131 + // webServer.sendContent(HTTP_SCRIPT); // 131 webServer.sendContent(HTTP_STYLE); // 487 // webServer.sendContent(HASP_STYLE); // 145 if(gohome) webServer.sendContent(HTTP_META_GO_BACK); // 47 webServer.sendContent(HTTP_HEADER_END); // 80 #else - webServer.sendContent_P(HTTP_SCRIPT); // 131 + // webServer.sendContent_P(HTTP_SCRIPT); // 131 webServer.sendContent_P(HTTP_STYLE); // 487 // webServer.sendContent_P(HASP_STYLE); // 145 if(gohome) webServer.sendContent_P(HTTP_META_GO_BACK); // 47 diff --git a/src/sys/svc/hasp_http_async.cpp b/src/sys/svc/hasp_http_async.cpp index a3385d0e..1f010cfa 100644 --- a/src/sys/svc/hasp_http_async.cpp +++ b/src/sys/svc/hasp_http_async.cpp @@ -104,8 +104,7 @@ const char MAIN_MENU_BUTTON[] PROGMEM = const char MIT_LICENSE[] PROGMEM = "
MIT License

"; const char HTTP_DOCTYPE[] PROGMEM = ""; + "name=\"viewport\" content=\"width=device-width,initial-scale=1\"/>"; const char HTTP_META_GO_BACK[] PROGMEM = ""; const char HTTP_HEADER[] PROGMEM = "%s"; const char HTTP_STYLE[] PROGMEM = ""; @@ -124,19 +123,19 @@ const char HTTP_CSS[] PROGMEM = ";line-height:2.4rem;font-size:1.2rem;width:100%;}" //".q{float:right;width:64px;text-align:right;}" ".red{background-color:" D_HTTP_COLOR_BUTTON_RESET ";}" + "#doc{text-align:left;display:inline-block;color:" D_HTTP_COLOR_TEXT ";min-width:260px;}" // ".button3{background-color:#f44336;}" // ".button4{background-color:#e7e7e7;color:black;}" // ".button5{background-color:#555555;}" // ".button6{background-color:#4CAF50;}" "td{font-size:0.87rem;padding-bottom:0px;padding-top:0px;}th{padding-top:0.5em;}"; -const char HTTP_SCRIPT[] PROGMEM = ""; +// const char HTTP_SCRIPT[] PROGMEM = ""; const char HTTP_HEADER_END[] PROGMEM = - "
"; -const char HTTP_END[] PROGMEM = "
" D_MANUFACTURER " "; -const char HTTP_FOOTER[] PROGMEM = " " D_HTTP_FOOTER "
"; + ""; // // Default link to compiled Nextion firmware images // String lcdFirmwareUrl = "http://haswitchplate.com/update/HASwitchPlate.tft"; -// #if HASP_USE_MQTT > 0 -// extern char mqttNodeName[16]; -// #else -// char mqttNodeName[3] = "na"; -// #endif - //////////////////////////////////////////////////////////////////////////////////////////////////// String getOption(int value, String label, bool selected) { @@ -284,7 +277,7 @@ void webSendPage(AsyncWebServerRequest* request, const char* nodename, const cha 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_SCRIPT) - 1; + // contentLength += sizeof(HTTP_SCRIPT) - 1; contentLength += sizeof(HTTP_STYLE) - 1; // contentLength += sizeof(HASP_STYLE) - 1; if(gohome) contentLength += sizeof(HTTP_META_GO_BACK) - 1; @@ -313,7 +306,7 @@ void webSendPage(AsyncWebServerRequest* request, const char* nodename, const cha if(gohome) // webSendFooter(reponse);(HTTP_META_GO_BACK); // 47 // webSendFooter(reponse);(HTTP_HEADER_END); // 80 #else - response->printf_P(HTTP_SCRIPT); // 131 + // response->printf_P(HTTP_SCRIPT); // 131 response->printf_P(HTTP_STYLE); // 487 // //webSendFooter(reponse);_P(HASP_STYLE); // 145 if(gohome) response->printf_P(HTTP_META_GO_BACK); // 47