Code Cleanup

PlummersSoftwareLLC · Feb 3, 2023 · a80d47d · a80d47d
1 parent ecd89b1
commit a80d47d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/include/globals.h b/include/globals.h
@@ -1602,7 +1602,7 @@ inline bool CheckBlueBuffer(CRGB * prgb, size_t count)
 #endif
 
 #if ENABLE_WIFI && ENABLE_WEBSERVER
-    #include "spiffswebserver.h"
+    #include "webserver.h"
 #endif
 
 #if ENABLE_REMOTE

diff --git a/include/webserver.h b/include/webserver.h
@@ -259,6 +259,8 @@ class CWebServer
     void begin()
     {
         debugI("Connecting Web Endpoints");
+        extern const char html_start[] asm("_binary_data_index_html_start");
+        extern const char jsx_start[] asm("_binary_data_main_jsx_start");
 
         _server.on("/getEffectList",         HTTP_GET, [this](AsyncWebServerRequest * pRequest) { this->GetEffectListText(pRequest); });
         _server.on("/getStatistics",         HTTP_GET, [this](AsyncWebServerRequest * pRequest) { this->GetStatistics(pRequest); });
@@ -271,16 +273,8 @@ class CWebServer
 
         _server.on("/settings",              HTTP_POST, [this](AsyncWebServerRequest * pRequest)    { this->SetSettings(pRequest); });
 
-        extern const char html_start[] asm("_binary_data_index_html_start");
-        extern const char jsx_start[] asm("_binary_data_main_jsx_start");
-
-        _server.on("/", HTTP_GET, [this](AsyncWebServerRequest * pRequest) { 
-            pRequest->send(200, "text/html", html_start);
-         });
-
-        _server.on("/main.jsx", HTTP_GET, [this](AsyncWebServerRequest * pRequest) { 
-            pRequest->send(200, "application/javascript", jsx_start);
-         });
+        _server.on("/", HTTP_GET, [this](AsyncWebServerRequest * pRequest) { pRequest->send(200, "text/html", html_start);});
+        _server.on("/main.jsx", HTTP_GET, [this](AsyncWebServerRequest * pRequest) { pRequest->send(200, "application/javascript", jsx_start); });
 
         _server.onNotFound([](AsyncWebServerRequest *request) 
         {