diff --git a/src/webserver.cpp b/src/webserver.cpp index bddecbe..24b17dc 100644 --- a/src/webserver.cpp +++ b/src/webserver.cpp @@ -1025,32 +1025,9 @@ void WebServerHandler::webHandlePageNotFound() { _server->send(404, "text/plain", F("URL not found")); } -int indexHtmLength = 0; -int configHtmLength = 0; -int calibrationHtmLength = 0; -int formatHtmLength = 0; -int testHtmLength = 0; -int aboutHtmLength = 0; -int firmwareHtmLength = 0; - bool WebServerHandler::setupWebServer() { Log.notice(F("WEB : Configuring web server." CR)); - _server = new ESP8266WebServer(); - indexHtmLength = strlen(reinterpret_cast(&indexHtmStart[0])); - configHtmLength = strlen(reinterpret_cast(&configHtmStart[0])); - calibrationHtmLength = - strlen(reinterpret_cast(&calibrationHtmStart[0])); - formatHtmLength = strlen(reinterpret_cast(&formatHtmStart[0])); - testHtmLength = strlen(reinterpret_cast(&testHtmStart[0])); - aboutHtmLength = strlen(reinterpret_cast(&aboutHtmStart[0])); - firmwareHtmLength = - strlen(reinterpret_cast(&firmwareHtmStart[0])); - Log.notice(F("WEB : Embedded HTML size; index=%d, config=%d, calibration=%d, " - "format=%d, test=%d, about=%d, firmware=%d." CR), - indexHtmLength, configHtmLength, calibrationHtmLength, - formatHtmLength, testHtmLength, aboutHtmLength, firmwareHtmLength); - MDNS.begin(myConfig.getMDNS()); MDNS.addService("http", "tcp", 80); diff --git a/src/webserver.hpp b/src/webserver.hpp index de063af..78c4c2f 100644 --- a/src/webserver.hpp +++ b/src/webserver.hpp @@ -46,7 +46,7 @@ INCBIN_EXTERN(FormatHtm); INCBIN_EXTERN(TestHtm); INCBIN_EXTERN(AboutHtm); INCBIN_EXTERN(FirmwareHtm); -#else +#else // ESP32 extern const uint8_t indexHtmStart[] asm("_binary_html_index_min_htm_start"); extern const uint8_t indexHtmEnd[] asm("_binary_html_index_min_htm_end"); extern const uint8_t configHtmStart[] asm("_binary_html_config_min_htm_start"); @@ -64,13 +64,6 @@ extern const uint8_t aboutHtmEnd[] asm("_binary_html_about_min_htm_end"); extern const uint8_t firmwareHtmStart[] asm( "_binary_html_firmware_min_htm_start"); extern const uint8_t firmwareHtmEnd[] asm("_binary_html_firmware_min_htm_end"); -extern int indexHtmLength; -extern int configHtmLength; -extern int calibrationHtmLength; -extern int formatHtmLength; -extern int testHtmLength; -extern int aboutHtmLength; -extern int firmwareHtmLength; #endif class WebServerHandler { @@ -136,33 +129,36 @@ class WebServerHandler { _server->send_P(200, "text/html", (const char*)gFirmwareHtmData, gFirmwareHtmSize); } -#else +#else // ESP32 void webReturnIndexHtm() { _server->send_P(200, "text/html", (const char*)indexHtmStart, - indexHtmLength); + strlen(reinterpret_cast(&indexHtmStart[0]))); } void webReturnConfigHtm() { _server->send_P(200, "text/html", (const char*)configHtmStart, - configHtmLength); + strlen(reinterpret_cast(&configHtmStart[0]))); } void webReturnCalibrationHtm() { - _server->send_P(200, "text/html", (const char*)calibrationHtmStart, - calibrationHtmLength); + _server->send_P( + 200, "text/html", (const char*)calibrationHtmStart, + strlen(reinterpret_cast(&calibrationHtmStart[0]))); } void webReturnFormatHtm() { _server->send_P(200, "text/html", (const char*)formatHtmStart, - formatHtmLength); + strlen(reinterpret_cast(&formatHtmStart[0]))); } void webReturnAboutHtm() { _server->send_P(200, "text/html", (const char*)aboutHtmStart, - aboutHtmLength); + strlen(reinterpret_cast(&aboutHtmStart[0]))); } void webReturnTestHtm() { - _server->send_P(200, "text/html", (const char*)testHtmStart, testHtmLength); + _server->send_P(200, "text/html", (const char*)testHtmStart, + strlen(reinterpret_cast(&testHtmStart[0]))); } void webReturnFirmwareHtm() { - _server->send_P(200, "text/html", (const char*)firmwareHtmStart, - firmwareHtmLength); + _server->send_P( + 200, "text/html", (const char*)firmwareHtmStart, + strlen(reinterpret_cast(&firmwareHtmStart[0]))); } #endif