Merge remote-tracking branch 'upstream/main' into mdev

This commit is contained in:
Ewoud
2023-05-11 17:39:12 +02:00
33 changed files with 4706 additions and 3339 deletions

View File

@@ -9,6 +9,7 @@
#ifdef WLED_ENABLE_PIXART
#include "html_pixart.h"
#endif
#include "html_cpal.h"
/*
* Integrated HTTP web server page declarations
@@ -225,7 +226,7 @@ void initServer()
}
}
request->send(200, "application/json", F("{\"success\":true}"));
});
}, JSON_BUFFER_SIZE);
server.addHandler(handler);
server.on("/version", HTTP_GET, [](AsyncWebServerRequest *request){
@@ -382,6 +383,15 @@ void initServer()
});
#endif
server.on("/cpal.htm", HTTP_GET, [](AsyncWebServerRequest *request){
if (handleFileRead(request, "/cpal.htm")) return;
if (handleIfNoneMatchCacheHeader(request)) return;
AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", PAGE_cpal, PAGE_cpal_L);
response->addHeader(FPSTR(s_content_enc),"gzip");
setStaticContentCacheHeaders(response);
request->send(response);
});
#ifdef WLED_ENABLE_WEBSOCKETS
server.addHandler(&ws);
#endif