From 847f7b2e6ed5004ba0935f9950ab3339d64dcdfc Mon Sep 17 00:00:00 2001
From: Eric Duminil <eric.duminil@gmail.com>
Date: Fri, 14 May 2021 17:38:16 +0200
Subject: [PATCH] Works (Password 12345678) but still blocking
---
ampel-firmware/ampel-firmware.ino | 36 +++++--------------------------
ampel-firmware/web_server.cpp | 8 +++++--
ampel-firmware/web_server.h | 1 +
3 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/ampel-firmware/ampel-firmware.ino b/ampel-firmware/ampel-firmware.ino
index 39f6b0c..b4de502 100644
--- a/ampel-firmware/ampel-firmware.ino
+++ b/ampel-firmware/ampel-firmware.ino
@@ -84,29 +84,14 @@ void setup() {
#endif
#ifdef AMPEL_WIFI
- wifi::connect(ampel.sensorId);
+// wifi::connect(ampel.sensorId);
- Serial.print(F("WiFi - Status: "));
- Serial.println(WiFi.status());
+// Serial.print(F("WiFi - Status: "));
+// Serial.println(WiFi.status());
- if (WiFi.status() == WL_CONNECTED) {
# ifdef AMPEL_HTTP
- web_server::initialize();
+ web_server::initialize();
# endif
-
- ntp::initialize();
-
- if (MDNS.begin(ampel.sensorId)) { // Start the mDNS responder for SENSOR_ID.local
- MDNS.addService("http", "tcp", 80);
- Serial.println(F("mDNS responder started"));
- } else {
- Serial.println(F("Error setting up MDNS responder!"));
- }
-
-# ifdef AMPEL_MQTT
- mqtt::initialize(ampel.sensorId);
-# endif
- }
#endif
#if defined(AMPEL_LORAWAN) && defined(ESP32)
@@ -199,19 +184,8 @@ void checkFlashButton() {
void keepServicesAlive() {
#ifdef AMPEL_WIFI
- if (WiFi.status() == WL_CONNECTED) {
-# if defined(ESP8266)
- //NOTE: Sadly, there seems to be a bug in the current MDNS implementation.
- // It stops working after 2 minutes. And forcing a restart leads to a memory leak.
- MDNS.update();
-# endif
- ntp::update(); // NTP client has its own timer. It will connect to NTP server every 60s.
# ifdef AMPEL_HTTP
- web_server::update();
+ web_server::update();
# endif
-# ifdef AMPEL_MQTT
- mqtt::keepConnection(); // MQTT client has its own timer. It will keep alive every 15s.
-# endif
- }
#endif
}
diff --git a/ampel-firmware/web_server.cpp b/ampel-firmware/web_server.cpp
index b17e666..92e54dc 100644
--- a/ampel-firmware/web_server.cpp
+++ b/ampel-firmware/web_server.cpp
@@ -35,8 +35,11 @@ namespace web_server {
WebServer http(80);
#endif
+ AutoConnect PORTAL(http);
+
void update() {
- http.handleClient(); // Listen for HTTP requests from clients
+ PORTAL.handleClient();
+ // http.handleClient(); // Listen for HTTP requests from clients
}
void initialize() {
@@ -183,7 +186,8 @@ namespace web_server {
http.on("/delete_csv", HTTP_POST, handleDeleteCSV);
#endif
http.onNotFound(handlePageNotFound);
- http.begin();
+// http.begin();
+ PORTAL.begin();
Serial.print(F("You can access this sensor via http://"));
Serial.print(ampel.sensorId);
diff --git a/ampel-firmware/web_server.h b/ampel-firmware/web_server.h
index bc2c010..3fa1703 100644
--- a/ampel-firmware/web_server.h
+++ b/ampel-firmware/web_server.h
@@ -7,6 +7,7 @@
# include <WebServer.h>
#endif
+#include "src/lib/AutoConnect/AutoConnect.h"
#include "config.h"
#include "util.h"
#include "wifi_util.h"
--
GitLab