Use new version of libraries, should fix current build.

Also introduce new CommandParser object

Author: GuLinux

platformio.ini

@@ -17,8 +17,8 @@ lib_deps =
 	Wire
 	SPI
 	https://github.com/GuLinux/AsyncBufferedTcpLogger#v0.0.5
-	https://github.com/GuLinux/AsyncWebserverUtils#v0.1.0
-	https://github.com/GuLinux/WiFiManager.git#v0.0.4
+	https://github.com/GuLinux/AsyncWebserverUtils#v0.3.0
+	https://github.com/GuLinux/WiFiManager.git#v0.1.0
 	https://github.com/GuLinux/ArduinoOTA-Manager.git#v0.0.2
 	ESP32Async/AsyncTCP@^3.3.8
 	ESP32Async/ESPAsyncWebServer@^3.7.4

src/commandparser.cpp

@@ -0,0 +1,16 @@
+#include "commandparser.h"
+#include "heater.h"
+#include <ArduinoLog.h>
+#define LOG_SCOPE "APB::CommandParser "
+
+using namespace APB;
+
+CommandParser &CommandParser::Instance = *new CommandParser();
+
+CommandParser::CommandParser() {
+}
+
+void CommandParser::getHeaters(JsonArray response) {
+    Log.infoln(LOG_SCOPE "onGetHeaters: %d", Heaters::Instance.size());
+    Heaters::toJson(response);
+}

src/commandparser.h

@@ -0,0 +1,12 @@
+#pragma once
+#include <ArduinoJson.h>
+
+namespace APB {
+class CommandParser {
+public:
+    CommandParser();
+    static CommandParser &Instance;
+    void getHeaters(JsonArray response);
+    void setHeaters(JsonVariant request);
+};
+}

src/main.cpp

@@ -5,6 +5,7 @@
 #include <wifimanager.h>
 
 #include "configuration.h"
+#include "commandparser.h"
 
 #include "webserver.h"
 

src/webserver.cpp

@@ -11,6 +11,7 @@
 #include <LittleFS.h>
 #include <map>
 #include "utils.h"
+#include "commandparser.h"
 
 #define LOG_SCOPE "APB::WebServer "
 
@@ -33,8 +34,8 @@ void APB::WebServer::setup() {
     setupCors();
 #endif
 
-    onJsonRequest("/api/config/accessPoint", std::bind(&WiFiManager::onConfigAccessPoint, &WiFiManager::Instance, _1, _2), HTTP_POST | HTTP_DELETE);
-    onJsonRequest("/api/config/station", std::bind(&WiFiManager::onConfigStation, &WiFiManager::Instance, _1, _2), HTTP_POST | HTTP_DELETE);
+    onJsonRequest("/api/config/accessPoint", [](AsyncWebServerRequest *request, JsonVariant &json){ WiFiManager::Instance.onConfigAccessPoint(request, json); }, HTTP_POST | HTTP_DELETE);
+    onJsonRequest("/api/config/station", [](AsyncWebServerRequest *request, JsonVariant &json){ WiFiManager::Instance.onConfigStation(request, json); }, HTTP_POST | HTTP_DELETE);
     onJsonRequest("/api/config/statusLedDuty", std::bind(&WebServer::onConfigStatusLedDuty, this, _1, _2), HTTP_POST);
     onJsonRequest("/api/config/powerSourceType", std::bind(&WebServer::onConfigPowerSourceType, this, _1, _2), HTTP_POST);
     webserver.on("/api/metrics", HTTP_GET, std::bind(&WebServer::onGetMetrics, this, _1));
@@ -51,7 +52,7 @@ void APB::WebServer::setup() {
         response.root()["status"] = "Dropping WiFi";
     });
     #endif
-    webserver.on("/api/wifi", HTTP_GET, std::bind(&WiFiManager::onGetWiFiStatus, &WiFiManager::Instance, _1));
+    webserver.on("/api/wifi", HTTP_GET, [](AsyncWebServerRequest *request){ WiFiManager::Instance.onGetWiFiStatus(request); });
     webserver.on("/api/restart", HTTP_POST, std::bind(&WebServer::onRestart, this, _1));
 
     webserver.on("/api/status", HTTP_GET, std::bind(&WebServer::onGetStatus, this, _1));
@@ -144,9 +145,7 @@ void APB::WebServer::onGetAmbient(AsyncWebServerRequest *request) {
 
 void APB::WebServer::onGetHeaters(AsyncWebServerRequest *request) {
     JsonResponse response(request);
-    Log.infoln(LOG_SCOPE "onGetHeaters: %d", Heaters::Instance.size());
-    JsonArray responseArray = response.root().to<JsonArray>();
-    Heaters::toJson(responseArray);
+    CommandParser::Instance.getHeaters(response.root().to<JsonArray>());
 }
 
 void APB::WebServer::onGetPower(AsyncWebServerRequest *request) {