remove experimental code

This commit is contained in:
ZanzyTHEbar 2022-12-31 02:44:49 +00:00
parent 8baa6fbef7
commit 27fc62a43f
6 changed files with 5 additions and 37 deletions

View File

@ -14,12 +14,10 @@ BaseAPI::BaseAPI(int CONTROL_PORT,
ProjectConfig *projectConfig,
CameraHandler *camera,
StateManager<WiFiState_e> *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\" }");
}
}

View File

@ -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<WiFiState_e> *WiFiStateManager;
GithubOTAHandler *otaHandler;
public:
BaseAPI(int CONTROL_PORT,
ProjectConfig *projectConfig,
CameraHandler *camera,
StateManager<WiFiState_e> *WiFiStateManager,
GithubOTAHandler *otaHandler,
const std::string &api_url);
virtual ~BaseAPI();
@ -115,4 +112,4 @@ public:
void notFound(AsyncWebServerRequest *request) const;
};
#endif // BASEAPI_HPP
#endif // BASEAPI_HPP

View File

@ -8,12 +8,10 @@ APIServer::APIServer(int CONTROL_PORT,
ProjectConfig *projectConfig,
CameraHandler *camera,
StateManager<WiFiState_e> *WiFiStateManager,
GithubOTAHandler *otaHandler,
const std::string &api_url) : BaseAPI(CONTROL_PORT,
projectConfig,
camera,
WiFiStateManager,
otaHandler,
api_url) {}
APIServer::~APIServer() {}

View File

@ -11,7 +11,6 @@ public:
ProjectConfig *projectConfig,
CameraHandler *camera,
StateManager<WiFiState_e> *WiFiStateManager,
GithubOTAHandler *otaHandler,
const std::string &api_url);
virtual ~APIServer();

View File

@ -1,7 +1,6 @@
#include <Arduino.h>
#include <network/WifiHandler/WifiHandler.hpp>
#include <network/mDNS/MDNSManager.hpp>
#include <network/mDNS/auto/AutoDiscovery.hpp>
#include <io/camera/cameraHandler.hpp>
#include <io/LEDManager/LEDManager.hpp>
#include <network/stream/streamServer.hpp>
@ -10,7 +9,6 @@
//! TODO: Setup OTA enabled state to be controllable by API if enabled at compile time
#if ENABLE_OTA
#include <network/OTA/OTA.hpp>
#include "network/OTA/Github_OTA/GithubOTAHandler.hpp"
#endif // ENABLE_OTA
#include <logo/logo.hpp>
#include <data/config/project_config.hpp>
@ -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();
}
}

View File

@ -1 +1 @@
v1.4.10
v1.6.10