forked from Akcelerometry_drgania_WMT/PI_mikrokontroler
Revert "Dodanie REST API w tle (endpoint /api/wifi) sluzacego do zdalnego dopisywania nowej sieci WiFi do pliku konfiguracyjnego w czasie normalnej pracy"
This reverts commit 37b9c8160f.
This commit is contained in:
@@ -46,7 +46,6 @@ class WiFiManager {
|
|||||||
|
|
||||||
void handleClient();
|
void handleClient();
|
||||||
void startCaptivePortal();
|
void startCaptivePortal();
|
||||||
void handleApiWifi();
|
|
||||||
void handleRoot();
|
void handleRoot();
|
||||||
void handleSave();
|
void handleSave();
|
||||||
void handleNotFound();
|
void handleNotFound();
|
||||||
@@ -71,7 +70,6 @@ class WiFiManager {
|
|||||||
private:
|
private:
|
||||||
bool isAccessPoint = false;
|
bool isAccessPoint = false;
|
||||||
bool captivePortalActive = false;
|
bool captivePortalActive = false;
|
||||||
bool serverActive = false;
|
|
||||||
WebServer server{80};
|
WebServer server{80};
|
||||||
DNSServer dnsServer;
|
DNSServer dnsServer;
|
||||||
int expectedCaptchaAnswer = 0;
|
int expectedCaptchaAnswer = 0;
|
||||||
|
|||||||
@@ -107,12 +107,6 @@ void WiFiManager::connectToWiFi() {
|
|||||||
ESP_LOGI(WIFI, "%s", gatewayInfo.c_str());
|
ESP_LOGI(WIFI, "%s", gatewayInfo.c_str());
|
||||||
String dnsInfo = "DNS: " + WiFi.dnsIP().toString();
|
String dnsInfo = "DNS: " + WiFi.dnsIP().toString();
|
||||||
ESP_LOGI(WIFI, "%s", dnsInfo.c_str());
|
ESP_LOGI(WIFI, "%s", dnsInfo.c_str());
|
||||||
|
|
||||||
// Start background API server
|
|
||||||
server.on("/api/wifi", HTTP_POST, std::bind(&WiFiManager::handleApiWifi, this));
|
|
||||||
server.begin();
|
|
||||||
serverActive = true;
|
|
||||||
ESP_LOGI(WIFI, "REST API Server started on port 80");
|
|
||||||
} else {
|
} else {
|
||||||
String infoWiFi = "WIFI CONNECTION ERROR: ALL FAILED";
|
String infoWiFi = "WIFI CONNECTION ERROR: ALL FAILED";
|
||||||
ESP_LOGI(WIFI, "%s", infoWiFi.c_str());
|
ESP_LOGI(WIFI, "%s", infoWiFi.c_str());
|
||||||
@@ -306,33 +300,10 @@ void WiFiManager::startCaptivePortal() {
|
|||||||
void WiFiManager::handleClient() {
|
void WiFiManager::handleClient() {
|
||||||
if (captivePortalActive) {
|
if (captivePortalActive) {
|
||||||
dnsServer.processNextRequest();
|
dnsServer.processNextRequest();
|
||||||
}
|
|
||||||
if (captivePortalActive || serverActive) {
|
|
||||||
server.handleClient();
|
server.handleClient();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void WiFiManager::handleApiWifi() {
|
|
||||||
if (!server.hasArg("ssid") || !server.hasArg("password")) {
|
|
||||||
server.send(400, "text/plain", "Error: Missing 'ssid' or 'password' parameter.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String newSSID = server.arg("ssid");
|
|
||||||
String newPass = server.arg("password");
|
|
||||||
|
|
||||||
File f = SD.open("/wifi.txt", FILE_APPEND);
|
|
||||||
if (f) {
|
|
||||||
f.println(newSSID + ";" + newPass);
|
|
||||||
f.close();
|
|
||||||
server.send(200, "text/plain", "Success: WiFi credentials saved to SD card.");
|
|
||||||
ESP_LOGI(WIFI, "API received new WiFi config: %s", newSSID.c_str());
|
|
||||||
} else {
|
|
||||||
server.send(500, "text/plain", "Error: Cannot open wifi.txt on SD card.");
|
|
||||||
ESP_LOGE(WIFI, "API Error: Cannot open wifi.txt");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void WiFiManager::handleRoot() {
|
void WiFiManager::handleRoot() {
|
||||||
int bases[] = {2, 2, 2, 2, 3, 3, 10, 10};
|
int bases[] = {2, 2, 2, 2, 3, 3, 10, 10};
|
||||||
int vals[] = {4, 8, 16, 32, 9, 27, 100, 1000};
|
int vals[] = {4, 8, 16, 32, 9, 27, 100, 1000};
|
||||||
|
|||||||
Reference in New Issue
Block a user