From fff43f6d16fc437859a8710b46b4e09614fc6fde Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Sun, 8 Jan 2023 13:39:46 +0000 Subject: [PATCH] fix pointer syntax for server object - fix lower casing for wifi statemanager --- ESP/lib/src/network/api/baseAPI/baseAPI.cpp | 2 +- ESP/lib/src/network/api/baseAPI/baseAPI.hpp | 4 ++-- ESP/lib/src/network/api/webserverHandler.cpp | 8 ++++---- ESP/lib/src/network/api/webserverHandler.hpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ESP/lib/src/network/api/baseAPI/baseAPI.cpp b/ESP/lib/src/network/api/baseAPI/baseAPI.cpp index dbff11a..fecd761 100644 --- a/ESP/lib/src/network/api/baseAPI/baseAPI.cpp +++ b/ESP/lib/src/network/api/baseAPI/baseAPI.cpp @@ -17,7 +17,7 @@ BaseAPI::BaseAPI(int CONTROL_PORT, const std::string &api_url) : server(CONTROL_PORT), projectConfig(projectConfig), camera(camera), - WiFiStateManager(WiFiStateManager), + wiFiStateManager(wiFiStateManager), api_url(api_url) {} BaseAPI::~BaseAPI() {} diff --git a/ESP/lib/src/network/api/baseAPI/baseAPI.hpp b/ESP/lib/src/network/api/baseAPI/baseAPI.hpp index 7714ed7..ca42f3a 100644 --- a/ESP/lib/src/network/api/baseAPI/baseAPI.hpp +++ b/ESP/lib/src/network/api/baseAPI/baseAPI.hpp @@ -98,13 +98,13 @@ protected: /// @brief Local instance of the AsyncWebServer - so that we dont need to use new and delete AsyncWebServer server; CameraHandler *camera; - StateManager *WiFiStateManager; + StateManager *wiFiStateManager; public: BaseAPI(int CONTROL_PORT, ProjectConfig *projectConfig, CameraHandler *camera, - StateManager *WiFiStateManager, + StateManager *wiFiStateManager, const std::string &api_url); virtual ~BaseAPI(); diff --git a/ESP/lib/src/network/api/webserverHandler.cpp b/ESP/lib/src/network/api/webserverHandler.cpp index 1428284..97e477a 100644 --- a/ESP/lib/src/network/api/webserverHandler.cpp +++ b/ESP/lib/src/network/api/webserverHandler.cpp @@ -7,11 +7,11 @@ APIServer::APIServer(int CONTROL_PORT, ProjectConfig *projectConfig, CameraHandler *camera, - StateManager *WiFiStateManager, + StateManager *wiFiStateManager, const std::string &api_url) : BaseAPI(CONTROL_PORT, projectConfig, camera, - WiFiStateManager, + wiFiStateManager, api_url) {} APIServer::~APIServer() {} @@ -25,9 +25,9 @@ void APIServer::begin() char buffer[1000]; snprintf(buffer, sizeof(buffer), "^\\%s\\/([a-zA-Z0-9]+)\\/command\\/([a-zA-Z0-9]+)$", this->api_url.c_str()); log_d("API URL: %s", buffer); - server->on(buffer, 0b01111111, [&](AsyncWebServerRequest *request) + server.on(buffer, 0b01111111, [&](AsyncWebServerRequest *request) { handleRequest(request); }); - server->begin(); + server.begin(); } void APIServer::setupServer() diff --git a/ESP/lib/src/network/api/webserverHandler.hpp b/ESP/lib/src/network/api/webserverHandler.hpp index 366b46d..1e2bed1 100644 --- a/ESP/lib/src/network/api/webserverHandler.hpp +++ b/ESP/lib/src/network/api/webserverHandler.hpp @@ -10,7 +10,7 @@ public: APIServer(int CONTROL_PORT, ProjectConfig *projectConfig, CameraHandler *camera, - StateManager *WiFiStateManager, + StateManager *wiFiStateManager, const std::string &api_url); virtual ~APIServer();