diff --git a/ESP/lib/src/network/api/baseAPI/baseAPI.cpp b/ESP/lib/src/network/api/baseAPI/baseAPI.cpp index 5997de2..e02feab 100644 --- a/ESP/lib/src/network/api/baseAPI/baseAPI.cpp +++ b/ESP/lib/src/network/api/baseAPI/baseAPI.cpp @@ -14,12 +14,10 @@ BaseAPI::BaseAPI(int CONTROL_PORT, ProjectConfig *projectConfig, CameraHandler *camera, StateManager *WiFiStateManager, - GithubOTAHandler *otaHandler, const std::string &api_url) : server(new AsyncWebServer(CONTROL_PORT)), projectConfig(projectConfig), camera(camera), WiFiStateManager(WiFiStateManager), - otaHandler(otaHandler), api_url(api_url) {} BaseAPI::~BaseAPI() {} @@ -296,25 +294,6 @@ void BaseAPI::factoryReset(AsyncWebServerRequest *request) } } -void BaseAPI::initOTAHandler(AsyncWebServerRequest *request) -{ - switch (_networkMethodsMap_enum[request->method()]) - { - case POST: - { - log_d("OTA Update Initiated"); - auto otaConfig = projectConfig->getDeviceConfig(); - // start the OTA update - otaHandler->updateFirmware(otaConfig->binaryName); - request->send(200, MIMETYPE_JSON, "{\"msg\":\"OTA Update In progress\"}"); - } - default: - { - request->send(400, MIMETYPE_JSON, "{\"msg\":\"Invalid Request\"}"); - break; - } - } -} //********************************************************************************************* //! Camera Command Functions @@ -392,4 +371,4 @@ void BaseAPI::save(AsyncWebServerRequest *request) { projectConfig->save(); request->send(200, MIMETYPE_JSON, "{\"msg\": \"ok\" }"); -} \ No newline at end of file +} diff --git a/ESP/lib/src/network/api/baseAPI/baseAPI.hpp b/ESP/lib/src/network/api/baseAPI/baseAPI.hpp index b15f080..b956bfa 100644 --- a/ESP/lib/src/network/api/baseAPI/baseAPI.hpp +++ b/ESP/lib/src/network/api/baseAPI/baseAPI.hpp @@ -15,7 +15,6 @@ #define XHTTP_OPTIONS 0b01000000; #define XHTTP_ANY 0b01111111; */ -#include "network/OTA/Github_OTA/GithubOTAHandler.hpp" #define HTTP_ANY 0b01111111 #define HTTP_GET 0b00000001 @@ -100,14 +99,12 @@ protected: AsyncWebServer *server; CameraHandler *camera; StateManager *WiFiStateManager; - GithubOTAHandler *otaHandler; public: BaseAPI(int CONTROL_PORT, ProjectConfig *projectConfig, CameraHandler *camera, StateManager *WiFiStateManager, - GithubOTAHandler *otaHandler, const std::string &api_url); virtual ~BaseAPI(); @@ -115,4 +112,4 @@ public: void notFound(AsyncWebServerRequest *request) const; }; -#endif // BASEAPI_HPP \ No newline at end of file +#endif // BASEAPI_HPP diff --git a/ESP/lib/src/network/api/webserverHandler.cpp b/ESP/lib/src/network/api/webserverHandler.cpp index e65c91c..1428284 100644 --- a/ESP/lib/src/network/api/webserverHandler.cpp +++ b/ESP/lib/src/network/api/webserverHandler.cpp @@ -8,12 +8,10 @@ APIServer::APIServer(int CONTROL_PORT, ProjectConfig *projectConfig, CameraHandler *camera, StateManager *WiFiStateManager, - GithubOTAHandler *otaHandler, const std::string &api_url) : BaseAPI(CONTROL_PORT, projectConfig, camera, WiFiStateManager, - otaHandler, api_url) {} APIServer::~APIServer() {} diff --git a/ESP/lib/src/network/api/webserverHandler.hpp b/ESP/lib/src/network/api/webserverHandler.hpp index 13a41c9..366b46d 100644 --- a/ESP/lib/src/network/api/webserverHandler.hpp +++ b/ESP/lib/src/network/api/webserverHandler.hpp @@ -11,7 +11,6 @@ public: ProjectConfig *projectConfig, CameraHandler *camera, StateManager *WiFiStateManager, - GithubOTAHandler *otaHandler, const std::string &api_url); virtual ~APIServer(); diff --git a/ESP/src/main.cpp b/ESP/src/main.cpp index b01a24b..01d078e 100644 --- a/ESP/src/main.cpp +++ b/ESP/src/main.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include #include #include @@ -10,7 +9,6 @@ //! TODO: Setup OTA enabled state to be controllable by API if enabled at compile time #if ENABLE_OTA #include -#include "network/OTA/Github_OTA/GithubOTAHandler.hpp" #endif // ENABLE_OTA #include #include @@ -29,15 +27,13 @@ int CONTROL_SERVER_PORT = 81; ProjectConfig deviceConfig("openiris", MDNS_HOSTNAME); #if ENABLE_OTA OTA ota(&deviceConfig); -GithubOTAHandler otaHandler; #endif // ENABLE_OTA LEDManager ledManager(33); CameraHandler cameraHandler(&deviceConfig, &ledStateManager); // SerialManager serialManager(&deviceConfig); WiFiHandler wifiHandler(&deviceConfig, &wifiStateManager, WIFI_SSID, WIFI_PASSWORD, WIFI_CHANNEL); -APIServer apiServer(CONTROL_SERVER_PORT, &deviceConfig, &cameraHandler, &wifiStateManager, &otaHandler, "/control"); +APIServer apiServer(CONTROL_SERVER_PORT, &deviceConfig, &cameraHandler, &wifiStateManager, "/control"); MDNSHandler mdnsHandler(&mdnsStateManager, &deviceConfig); -AutoDiscovery autoDiscoveryHandler(&mdnsStateManager, &deviceConfig); StreamServer streamServer(STREAM_SERVER_PORT); void setup() @@ -59,7 +55,6 @@ void setup() switch (mdnsStateManager.getCurrentState()) { case MDNSState_e::MDNSState_Starting: - autoDiscoveryHandler.start(); break; case MDNSState_e::MDNSState_Error: break; @@ -121,4 +116,4 @@ void loop() #endif // ENABLE_OTA ledManager.handleLED(&ledStateManager); // serialManager.handleSerial(); -} \ No newline at end of file +} diff --git a/ESP/tools/version.txt b/ESP/tools/version.txt index c6986f9..d91c6f4 100644 --- a/ESP/tools/version.txt +++ b/ESP/tools/version.txt @@ -1 +1 @@ -v1.4.10 \ No newline at end of file +v1.6.10 \ No newline at end of file