Fixed issue with LittleFS (webSpiffs) setup
This commit is contained in:
parent
4e7264bc4f
commit
8c289baf33
|
@ -117,9 +117,6 @@ void setup() {
|
||||||
displayUI.mode = DISPLAY_MODE::INTRO;
|
displayUI.mode = DISPLAY_MODE::INTRO;
|
||||||
}
|
}
|
||||||
|
|
||||||
// copy web files to SPIFFS
|
|
||||||
// copyWebFiles(false);
|
|
||||||
|
|
||||||
// load everything else
|
// load everything else
|
||||||
names.load();
|
names.load();
|
||||||
ssids.load();
|
ssids.load();
|
||||||
|
|
|
@ -196,6 +196,11 @@ namespace wifi {
|
||||||
setHidden(settings::getAccessPointSettings().hidden);
|
setHidden(settings::getAccessPointSettings().hidden);
|
||||||
setCaptivePortal(settings::getWebSettings().captive_portal);
|
setCaptivePortal(settings::getWebSettings().captive_portal);
|
||||||
|
|
||||||
|
// copy web files to SPIFFS
|
||||||
|
if (settings::getWebSettings().use_spiffs) {
|
||||||
|
copyWebFiles(false);
|
||||||
|
}
|
||||||
|
|
||||||
// Set mode
|
// Set mode
|
||||||
mode = wifi_mode_t::off;
|
mode = wifi_mode_t::off;
|
||||||
WiFi.mode(WIFI_OFF);
|
WiFi.mode(WIFI_OFF);
|
||||||
|
@ -404,6 +409,11 @@ namespace wifi {
|
||||||
// ================================================================
|
// ================================================================
|
||||||
#endif /* ifdef USE_PROGMEM_WEB_FILES */
|
#endif /* ifdef USE_PROGMEM_WEB_FILES */
|
||||||
|
|
||||||
|
// aggressively caching static assets
|
||||||
|
if (settings::getWebSettings().use_spiffs) {
|
||||||
|
server.serveStatic("/", LittleFS, String(ap_settings.path).c_str(), "max-age=86400");
|
||||||
|
}
|
||||||
|
|
||||||
server.on("/run", HTTP_GET, []() {
|
server.on("/run", HTTP_GET, []() {
|
||||||
server.send(200, str(W_TXT), str(W_OK).c_str());
|
server.send(200, str(W_TXT), str(W_OK).c_str());
|
||||||
String input = server.arg("cmd");
|
String input = server.arg("cmd");
|
||||||
|
@ -414,9 +424,6 @@ namespace wifi {
|
||||||
server.send(200, str(W_JSON), attack.getStatusJSON());
|
server.send(200, str(W_JSON), attack.getStatusJSON());
|
||||||
});
|
});
|
||||||
|
|
||||||
// aggressively caching static assets
|
|
||||||
server.serveStatic("/js", LittleFS, String(String(ap_settings.path) + "/js").c_str(), "max-age=86400");
|
|
||||||
|
|
||||||
// called when the url is not defined here
|
// called when the url is not defined here
|
||||||
// use it to load content from SPIFFS
|
// use it to load content from SPIFFS
|
||||||
server.onNotFound([]() {
|
server.onNotFound([]() {
|
||||||
|
|
Loading…
Reference in New Issue