gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2025-12-05 20:40:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

Update ESPAsyncWebServer version

Browse Source
This commit is contained in:
Just Call Me Koko
2025-09-24 16:19:06 -04:00
parent 74f09ee86f
commit 24f3e18b69
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/build_parallel.yml vendored
View File

@@ -81,8 +81,8 @@ jobs:
- name: Install AsyncTCP
uses: actions/checkout@v2
with:
repository: me-no-dev/AsyncTCP
ref: master
repository: ESP32Async/AsyncTCP
ref: v3.4.8
path: CustomAsyncTCP
- name: Install MicroNMEA
@@ -92,16 +92,16 @@ jobs:
ref: v2.0.6
path: CustomMicroNMEA
#- name: Install ESPAsyncWebServer
# uses: actions/checkout@v2
# with:
# repository: ${{ matrix.board.esp_async }}
# ref: ${{ matrix.board.esp_async_ver }}
# path: CustomESPAsyncWebServer
- name: Install ESPAsyncWebServer
run: |
cp -r libraries/ESPAsyncWebServer ./CustomESPAsyncWebServer
uses: actions/checkout@v2
with:
repository: ESP32Async/ESPAsyncWebServer
ref: v3.8.1
path: CustomESPAsyncWebServer
#- name: Install ESPAsyncWebServer
# run: |
# cp -r libraries/ESPAsyncWebServer ./CustomESPAsyncWebServer
- name: Install TFT_eSPI
uses: actions/checkout@v2

6
esp32_marauder/EvilPortal.cpp
View File

@@ -125,7 +125,6 @@ void EvilPortal::setupServer() {
200, "text/html",
"<html><head><script>setTimeout(() => { window.location.href ='/' }, 100);</script></head><body></body></html>");
});
Serial.println("web server up");
}
void EvilPortal::setHtmlFromSerial() {
@@ -340,9 +339,14 @@ void EvilPortal::startAP() {
this->setupServer();
Serial.println("Server endpoints configured");
this->dnsServer.start(53, "*", WiFi.softAPIP());
Serial.println("DNS Server started");
server.addHandler(new CaptiveRequestHandler()).setFilter(ON_AP_FILTER);
Serial.println("Captive Portal handler started");
server.begin();
Serial.println("Server started");
#ifdef HAS_SCREEN
this->sendToDisplay("Evil Portal READY");
#endif

1
esp32_marauder/EvilPortal.h
View File

@@ -6,6 +6,7 @@
#include "ESPAsyncWebServer.h"
#include <AsyncTCP.h>
#include <DNSServer.h>
#include <WiFi.h>
#include "configs.h"
#include "settings.h"

2
esp32_marauder/WiFiScan.cpp
View File

@@ -2021,7 +2021,7 @@ void WiFiScan::RunEvilPortal(uint8_t scan_mode, uint16_t color)
#ifdef HAS_DUAL_BAND
esp_wifi_init(&cfg);
esp_wifi_set_country(&country);
//esp_wifi_set_country(&country);
#endif
evil_portal_obj.begin(ssids, access_points);