Move AsyncServer inside AsyncBufferedTCPLogger

Author: GuLinux

src/asyncbufferedtcplogger.cpp

@@ -1,7 +1,9 @@
+#include <WiFi.h>
+
 #include "asyncbufferedtcplogger.h"
 #include "configuration.h"
 
-APB::AsyncBufferedTCPLogger::AsyncBufferedTCPLogger(AsyncServer & loggerServer) {
+APB::AsyncBufferedTCPLogger::AsyncBufferedTCPLogger(uint16_t port) : loggerServer{port} {
     loggerServer.onClient([this](void *,AsyncClient *c){
       this->client = c;
       if(!this->backlog.empty()) {
@@ -15,6 +17,23 @@ APB::AsyncBufferedTCPLogger::AsyncBufferedTCPLogger(AsyncServer & loggerServer)
     }, nullptr);
 }
 
+void APB::AsyncBufferedTCPLogger::setup() {
+  WiFi.onEvent([this](arduino_event_id_t event, arduino_event_info_t info){
+    switch (event) {
+    case ARDUINO_EVENT_WIFI_STA_CONNECTED:
+    case ARDUINO_EVENT_WIFI_AP_START:
+      this->loggerServer.begin();
+      break;
+    case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
+    case ARDUINO_EVENT_WIFI_AP_STOP:
+      this->loggerServer.end();
+      this->client = nullptr;
+    default:
+      break;
+    }
+  });
+}
+
 #include "utils.h"
 size_t APB::AsyncBufferedTCPLogger::write(uint8_t c) {
     buffer[currentPosition++] = c;

src/asyncbufferedtcplogger.h

@@ -2,11 +2,13 @@
 #include <Print.h>
 #include <AsyncTCP.h>
 #include <queue>
+#include <AsyncTCP.h>
 
 namespace APB {
 class AsyncBufferedTCPLogger: public Print {
 public:
-  AsyncBufferedTCPLogger(AsyncServer &loggerServer);
+  AsyncBufferedTCPLogger(uint16_t port);
+  void setup();
 
   virtual size_t write(uint8_t c);
 private:
@@ -16,6 +18,7 @@ class AsyncBufferedTCPLogger: public Print {
   std::array<char, 1024> buffer = {0};
   std::queue<String> backlog;
   uint16_t currentPosition = 0;
+  AsyncServer loggerServer;
 };
 
 }

src/main.cpp

@@ -21,10 +21,9 @@
 #include "influxdb.h"
 
 Scheduler scheduler;
-AsyncServer loggerServer{9911};
 
 
-APB::AsyncBufferedTCPLogger bufferedLogger{loggerServer};
+APB::AsyncBufferedTCPLogger bufferedLogger{9911};
 
 #ifdef ONEBUTTON_USER_BUTTON_1
 OneButton userButton;
@@ -49,10 +48,12 @@ void setup() {
   delay(BOOT_DELAY);
   #endif
 
+  bufferedLogger.setup();
   Log.begin(LOG_LEVEL_VERBOSE, &Serial, true);
+  Log.addHandler(&bufferedLogger);
   Log.infoln(LOG_SCOPE "setup, core: %d", xPortGetCoreID());
 
-  Log.addHandler(&bufferedLogger);
+  
 
   LittleFS.begin();
   APB::Settings::Instance.setup();
@@ -61,7 +62,6 @@ void setup() {
   APB::StatusLed::Instance.setup();
 
   APB::WiFiManager::Instance.setup(scheduler);
-  loggerServer.begin();
   Wire.begin(I2C_SDA_PIN, I2C_SCL_PIN);
   Wire.setClock(100000);
   APB::Ambient::Instance.setup(scheduler);