From a93360e45fc40783ceec822874a67872bee63f96 Mon Sep 17 00:00:00 2001 From: DaOfficialWizard <45744329+ZanzyTHEbar@users.noreply.github.com> Date: Thu, 19 Oct 2023 14:03:42 +0100 Subject: [PATCH] feat: implement EasyNetworkManager lib - replace old network stack --- .../local/network/api_server/api_server.cpp | 18 ++++++++++++------ .../local/network/api_server/api_server.hpp | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ESP/lib/src/local/network/api_server/api_server.cpp b/ESP/lib/src/local/network/api_server/api_server.cpp index 510cf30..7db4fff 100644 --- a/ESP/lib/src/local/network/api_server/api_server.cpp +++ b/ESP/lib/src/local/network/api_server/api_server.cpp @@ -2,7 +2,13 @@ RestAPI::RestAPI(API& api) : api(api), - server(80, api.projectConfig, "/control", "/wifimanager", "/openiris") {} + async_server(80, + api.projectConfig, + "/control", + "/wifimanager", + "/openiris"), + ota(api.projectConfig, async_server), + server(api.projectConfig, async_server, &ota) {} RestAPI::~RestAPI() {} @@ -39,10 +45,10 @@ void RestAPI::begin() { * @note Add all the routes and handlers here */ void RestAPI::setupServer() { - server.setOTAHandler([this](void) { api.cameraHandler.handleOTA(); }); - server.addAPICommand("/setCamera", [this](AsyncWebServerRequest* request) { - setCamera(request); - }); + ota.setOTAHandler([this](void) { api.cameraHandler.handleOTA(); }); + server.addAPICommand( + "/setCamera", + [this](AsyncWebServerRequest* request) { setCamera(request); }); server.addAPICommand( "/restartCamera", @@ -52,7 +58,7 @@ void RestAPI::setupServer() { } void RestAPI::setCamera(AsyncWebServerRequest* request) { - switch (server._networkMethodsMap_enum[request->method()]) { + switch (async_server._networkMethodsMap_enum[request->method()]) { case BaseAPI::GET: { // create temporary variables to store the values uint8_t temp_camera_framesize = 0; diff --git a/ESP/lib/src/local/network/api_server/api_server.hpp b/ESP/lib/src/local/network/api_server/api_server.hpp index ac2e913..873800c 100644 --- a/ESP/lib/src/local/network/api_server/api_server.hpp +++ b/ESP/lib/src/local/network/api_server/api_server.hpp @@ -6,6 +6,8 @@ class RestAPI { private: API& api; + AsyncServer_t async_server; + AsyncOTA ota; APIServer server; void setupServer(); void setCamera(AsyncWebServerRequest* request);