Extract various classes/methods from main.cpp

Author: GuLinux

platformio.ini

@@ -54,11 +54,8 @@ framework = arduino
 [debug]
 build_type = debug
 
-
 [env:lolin_s2_mini]
 board = lolin_s2_mini
 
 [env:esp32_c3_supermini]
 board = lolin_c3_mini
-
-

src/asyncbufferedtcplogger.cpp

@@ -0,0 +1,24 @@
+#include "asyncbufferedtcplogger.h"
+
+APB::AsyncBufferedTCPLogger::AsyncBufferedTCPLogger(AsyncServer & loggerServer) {
+    loggerServer.onClient([this](void *,AsyncClient *c){
+      this->client = c;
+    }, nullptr);
+}
+
+size_t APB::AsyncBufferedTCPLogger::write(uint8_t c) {
+    if(!client) {
+      return 0;
+    }
+    buffer[currentPosition++] = c;
+    if(c == '\n') {
+      client->write(buffer.data(), currentPosition);
+      reset();
+    }
+    return 1;
+}
+
+void APB::AsyncBufferedTCPLogger::reset() {
+    std::fill(std::begin(buffer), std::end(buffer), 0);
+    currentPosition = 0;
+}

src/asyncbufferedtcplogger.h

@@ -0,0 +1,18 @@
+#pragma once
+#include <Print.h>
+#include <AsyncTCP.h>
+
+namespace APB {
+class AsyncBufferedTCPLogger: public Print {
+public:
+  AsyncBufferedTCPLogger(AsyncServer &loggerServer);
+
+  virtual size_t write(uint8_t c);
+private:
+  AsyncClient *client = nullptr;
+  void reset();
+  std::array<char, 1024> buffer = {0};
+  uint16_t currentPosition = 0;
+};
+
+}

src/history.cpp

@@ -66,18 +66,34 @@ void APB::History::Entry::setNullableFloat(JsonObject object, const char *field,
     }
 }
 
-void APB::History::add(const Entry &entry)
-{
-    if(lockInserts) {
-        Log.warningln("[HISTORY] Inserts locked, unable to add entry");
-        return;
-    }
-    _entries.push_back(entry);
-    while(_entries.size() > maxSize) {
-        _entries.pop_front();
-    }
+void APB::History::add() {
+  if(lockInserts) {
+      Log.warningln("[HISTORY] Inserts locked, unable to add entry");
+      return;
+  }
+
+  APB::History::Entry entry {
+    esp_timer_get_time() / 1000'000
+  };
+
+#ifndef APB_AMBIENT_TEMPERATURE_SENSOR_NONE
+  entry.setAmbient(APB::Ambient::Instance.reading());
+#endif
+  
+#if APB_HEATERS_SIZE > 0
+  for(uint8_t i=0; i<APB_HEATERS_TEMP_SENSORS; i++) {
+    entry.heaters[i].set(APB::Heaters::Instance[i]);
+  }
+#endif
+  entry.setPower(APB::PowerMonitor::Instance.status());
+
+  _entries.push_back(entry);
+  while(_entries.size() > maxSize) {
+      _entries.pop_front();
+  }
 }
 
+
 #define JSON_SERIALISER_TAG "[History::JsonSerialiser] "
 
 APB::History::JsonSerialiser::JsonSerialiser(History &history) : history{history} {
@@ -127,3 +143,7 @@ int APB::History::JsonSerialiser::write(uint8_t *buffer, size_t maxLen, size_t i
     }
     return response;
 }
+
+void APB::History::setup(Scheduler &scheduler) {
+  new Task(APB_HISTORY_TASK_SECONDS, TASK_FOREVER, std::bind(&History::add, this), &scheduler, true);
+}

src/history.h

@@ -6,6 +6,7 @@
 #include <optional>
 #include <ArduinoJson.h>
 #include <memory>
+#include <TaskSchedulerDeclarations.h>
 
 #include "ambient/ambient.h"
 #include "powermonitor.h"
@@ -73,9 +74,10 @@ class History {
         std::unique_ptr<OverflowPrint> overflowPrint;
     };
 
+    void setup(Scheduler &scheduler);
     void setMaxSize(uint16_t maxSize) { this->maxSize = maxSize; }
+    void add();
 
-    void add(const Entry &entry);
     Entries entries() const { return _entries; }
 
     size_t jsonSize() const { return _entries.size() * HISTORY_ENTRY_SIZE; }

src/main.cpp

@@ -17,41 +17,15 @@
 #include "statusled.h"
 #include <ArduinoOTA.h>
 #include <AsyncTCP.h>
+#include "asyncbufferedtcplogger.h"
 
+#include "time.h"
+#include "esp_sntp.h"
 Scheduler scheduler;
 AsyncServer loggerServer{9911};
 
-class BufferedLogger: public Print {
-public:
-  BufferedLogger() {
-    loggerServer.onClient([this](void *,AsyncClient *c){
-      this->client = c;
-    }, nullptr);
-  }
-
-  virtual size_t write(uint8_t c) {
-    if(!client) {
-      return 0;
-    }
-    buffer[currentPosition++] = c;
-    if(c == '\n') {
-      client->write(buffer.data(), currentPosition);
-      reset();
-    }
-    return 1;
-  }
-
-private:
-  AsyncClient *client = nullptr;
-  void reset() {
-    std::fill(std::begin(buffer), std::end(buffer), 0);
-    currentPosition = 0;
-  }
-  std::array<char, 1024> buffer = {0};
-  uint16_t currentPosition = 0;
-};
-
-BufferedLogger bufferedLogger;
+
+APB::AsyncBufferedTCPLogger bufferedLogger{loggerServer};
 
 #ifdef ONEBUTTON_USER_BUTTON_1
 OneButton userButton;
@@ -66,7 +40,6 @@ APB::WebServer webServer(scheduler);
 using namespace std::placeholders;
 
 void setupArduinoOTA();
-void addHistoryEntry();
 
 void setup() {
   Serial.begin(115200);
@@ -97,6 +70,7 @@ void setup() {
 
   webServer.setup();
   setupArduinoOTA();
+  APB::History::Instance.setup(scheduler);
 
 #ifdef ONEBUTTON_USER_BUTTON_1
   userButton.attachDoubleClick([]() {
@@ -105,10 +79,8 @@ void setup() {
   });
   userButton.setup(ONEBUTTON_USER_BUTTON_1, INPUT, false);
 #endif
-  new Task(APB_HISTORY_TASK_SECONDS, TASK_FOREVER, addHistoryEntry, &scheduler, true);
 }
 
-uint64_t el = 0;
 void loop() {
   APB::WiFiManager::Instance.loop(); 
   scheduler.execute();
@@ -120,24 +92,6 @@ void loop() {
   ArduinoOTA.handle();
 }
 
-void addHistoryEntry() {
-  APB::History::Entry entry {
-    esp_timer_get_time() / 1000'000
-  };
-
-#ifndef APB_AMBIENT_TEMPERATURE_SENSOR_NONE
-  entry.setAmbient(APB::Ambient::Instance.reading());
-#endif
-  
-#if APB_HEATERS_SIZE > 0
-  for(uint8_t i=0; i<APB_HEATERS_TEMP_SENSORS; i++) {
-    entry.heaters[i].set(APB::Heaters::Instance[i]);
-  }
-#endif
-  entry.setPower(APB::PowerMonitor::Instance.status());
-  APB::History::Instance.add(entry);
-}
-
 void setupArduinoOTA() {
   ArduinoOTA
     .onStart([]() {