Feature/espidf uvc support

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ESP/components/esp32-camera"]
+	path = ESP/components/esp32-camera
+	url = https://github.com/espressif/esp32-camera.git

ESP/CMakeLists.txt

@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.16.0)
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(TestingESPIDF)

ESP/dependencies.lock

@@ -0,0 +1,9 @@
+dependencies:
+  idf:
+    component_hash: null
+    source:
+      type: idf
+    version: 4.4.7
+manifest_hash: 3e6980bc5fca475de2a39d94c3ea3944c0528040d862609e810d1d8f5ea7f661
+target: esp32s3
+version: 1.0.0

ESP/ini/dev_config.ini

@@ -3,7 +3,7 @@
 
 [env]
 platform = https://github.com/platformio/platform-espressif32.git
-framework = arduino
+framework = arduino, espidf
 monitor_speed = 115200
 custom_firmware_version = 2.6.0
 monitor_rts = 0
@@ -22,15 +22,20 @@ lib_ldf_mode = deep+
 ;115200 is used for compatability - if you are on windows and want the code to flash faster use 921600
 upload_speed = 921600
 lib_deps =
-	# https://github.com/espressif/esp32-camera
-  	esp32-camera
+	; # https://github.com/espressif/esp32-camera
+	espressif/esp32-camera
 	https://github.com/me-no-dev/ESPAsyncWebServer.git
 	https://github.com/me-no-dev/AsyncTCP.git
 	https://github.com/bblanchon/ArduinoJson.git
 extra_scripts =
 	pre:tools/customname.py
 	post:tools/createzip.py
 build_flags =
+	 -I ../components/esp32-camera
+   ; esp32-camera esp-idf settings
+	 -D CONFIG_CAMERA_JPEG_MODE_FRAME_SIZE_AUTO
+   -D CONFIG_SCCB_CLK_FREQ=100000
+
 	-DENABLE_ADHOC=${wifi.enableadhoc}
 	-DADHOC_CHANNEL=${wifi.adhocchannel}
 	-DWIFI_CHANNEL=${wifi.channel}

ESP/lib/src/data/config/project_config.hpp

@@ -63,8 +63,8 @@ class ProjectConfig : public Preferences, public ISubject<ConfigState_e> {
           ssid(std::move(ssid)),
           password(std::move(password)),
           channel(channel),
-          adhoc(adhoc),
-          power(power) {}
+          power(power),
+          adhoc(adhoc) {}
     std::string name;
     std::string ssid;
     std::string password;

ESP/lib/src/io/camera/cameraHandler.cpp

@@ -197,13 +197,7 @@ void CameraHandler::loadConfigData() {
 
 int CameraHandler::setCameraResolution(framesize_t frameSize) {
   if (camera_sensor->pixformat == PIXFORMAT_JPEG) {
-    try {
-      return camera_sensor->set_framesize(camera_sensor, frameSize);
-    } catch (...) {
-      // they sent us a malformed or unsupported frameSize - rather than crash -
-      // tell them about it
-      return -1;
-    }
+    return camera_sensor->set_framesize(camera_sensor, frameSize);
   }
   return -1;
 }

ESP/lib/src/network/api/baseAPI/baseAPI.cpp

@@ -164,18 +164,14 @@ void BaseAPI::getJsonConfig(AsyncWebServerRequest* request) {
 
 void BaseAPI::setDeviceConfig(AsyncWebServerRequest* request) {
   switch (_networkMethodsMap_enum[request->method()]) {
-    case GET: {
-      request->send(400, MIMETYPE_JSON, "{\"msg\":\"Invalid Request\"}");
-      break;
-    }
     case POST: {
       int params = request->params();
 
       std::string hostname;
       std::string service;
       std::string ota_password;
       std::string ota_login;
-      int ota_port;
+      int ota_port = 3232;
 
       for (int i = 0; i < params; i++) {
         AsyncWebParameter* param = request->getParam(i);
@@ -203,6 +199,11 @@ void BaseAPI::setDeviceConfig(AsyncWebServerRequest* request) {
       projectConfig.setMDNSConfig(hostname, service, true);
       request->send(200, MIMETYPE_JSON,
                     "{\"msg\":\"Done. Device Config has been set.\"}");
+
+      break;
+    }
+    default: {
+      request->send(400, MIMETYPE_JSON, "{\"msg\":\"Invalid Request\"}");
     }
   }
 }
@@ -225,6 +226,10 @@ void BaseAPI::setWiFiTXPower(AsyncWebServerRequest* request) {
       projectConfig.wifiTxPowerConfigSave();
       request->send(200, MIMETYPE_JSON,
                     "{\"msg\":\"Done. TX Power has been set.\"}");
+      break;
+    }
+    default: {
+      request->send(400, MIMETYPE_JSON, "{\"msg\":\"Invalid Request\"}");
     }
   }
 }
@@ -234,6 +239,7 @@ void BaseAPI::rebootDevice(AsyncWebServerRequest* request) {
     case GET: {
       request->send(200, MIMETYPE_JSON, "{\"msg\":\"Rebooting Device\"}");
       OpenIrisTasks::ScheduleRestart(2000);
+      break;
     }
     default: {
       request->send(400, MIMETYPE_JSON, "{\"msg\":\"Invalid Request\"}");
@@ -248,6 +254,7 @@ void BaseAPI::factoryReset(AsyncWebServerRequest* request) {
       log_d("Factory Reset");
       projectConfig.reset();
       request->send(200, MIMETYPE_JSON, "{\"msg\":\"Factory Reset\"}");
+      break;
     }
     default: {
       request->send(400, MIMETYPE_JSON, "{\"msg\":\"Invalid Request\"}");

ESP/lib/src/network/api/baseAPI/baseAPI.hpp

@@ -3,7 +3,6 @@
 
 //! Warning do not format this file with clang-format or it will break the code
 
-#include <unordered_map>
 #include <string>
 #include <unordered_map>
 
@@ -43,7 +42,6 @@ constexpr int HTTP_ANY = 0b01111111;
 
 class BaseAPI {
  protected:
-  std::string api_url;
   bool _authRequired;
 
   static const char* MIMETYPE_HTML;
@@ -54,7 +52,6 @@ class BaseAPI {
   /* static const char *MIMETYPE_ICO; */
   static const char* MIMETYPE_JSON;
 
- protected:
   /* Commands */
   void setWiFi(AsyncWebServerRequest* request);
   void setWiFiTXPower(AsyncWebServerRequest* request);
@@ -100,33 +97,36 @@ class BaseAPI {
   typedef std::unordered_map<std::string, WebRequestMethodComposite>
       networkMethodsMap_t;
 
-	ProjectConfig &projectConfig;
-	/// @brief Local instance of the AsyncWebServer - so that we dont need to use new and delete
-    AsyncWebServer server;
+  /// @brief Local instance of the AsyncWebServer - so that we dont need to use
+  /// new and delete
+  AsyncWebServer server;
+  ProjectConfig& projectConfig;
+
 #ifndef SIM_ENABLED
-        CameraHandler &camera;
+  CameraHandler& camera;
 #endif  // SIM_ENABLED
+  std::string api_url;
 
-public :
-    BaseAPI(ProjectConfig& projectConfig,
+ public:
+  BaseAPI(ProjectConfig& projectConfig,
 #ifndef SIM_ENABLED
-            CameraHandler& camera,
+          CameraHandler& camera,
 #endif  // SIM_ENABLED
-            const std::string& api_url,
+          const std::string& api_url,
 #ifndef SIM_ENABLED
-            int port = 81
+          int port = 81
 #else
-            int port = 80
+          int port = 80
 #endif
   );
 
- virtual ~BaseAPI();
- virtual void begin();
- void checkAuthentication(AsyncWebServerRequest* request,
-                          const char* login,
-                          const char* password);
- void beginOTA();
- void notFound(AsyncWebServerRequest* request) const;
+  virtual ~BaseAPI();
+  virtual void begin();
+  void checkAuthentication(AsyncWebServerRequest* request,
+                           const char* login,
+                           const char* password);
+  void beginOTA();
+  void notFound(AsyncWebServerRequest* request) const;
 };
 
 #endif  // BASEAPI_HPP

ESP/lib/src/network/api/webserverHandler.cpp

@@ -28,11 +28,10 @@ void APIServer::setup() {
            "^\\%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) {
-      handleRequest(request);
-  });
+  server.on(buffer, 0b01111111,
+            [&](AsyncWebServerRequest* request) { handleRequest(request); });
 #ifndef SIM_ENABLED
-    //this->_authRequired = true;
+  // this->_authRequired = true;
 #endif  // SIM_ENABLED
   beginOTA();
   server.begin();
@@ -85,30 +84,26 @@ void APIServer::addRouteMap(const std::string& index,
 }
 
 void APIServer::handleRequest(AsyncWebServerRequest* request) {
-  try {
-    // Get the route
-    log_i("Request URL: %s", request->url().c_str());
-    log_i("Request: %s", request->pathArg(0).c_str());
-    log_i("Request: %s", request->pathArg(1).c_str());
+  // Get the route
+  log_i("Request URL: %s", request->url().c_str());
+  log_i("Request: %s", request->pathArg(0).c_str());
+  log_i("Request: %s", request->pathArg(1).c_str());
 
-    auto it_map = route_map.find(request->pathArg(0).c_str());
-    auto it_method = it_map->second.find(request->pathArg(1).c_str());
+  auto it_map = route_map.find(request->pathArg(0).c_str());
+  auto it_method = it_map->second.find(request->pathArg(1).c_str());
 
-    if (it_map != route_map.end()) {
-      if (it_method != it_map->second.end()) {
-        log_d("We are trying to execute the function");
-        (*this.*(it_method->second))(request);
-      } else {
-        log_e("Invalid Command");
-        request->send(400, MIMETYPE_JSON, "{\"msg\":\"Invalid Command\"}");
-        return;
-      }
+  if (it_map != route_map.end()) {
+    if (it_method != it_map->second.end()) {
+      log_d("We are trying to execute the function");
+      (*this.*(it_method->second))(request);
     } else {
-      log_e("Invalid Map Index");
-      request->send(400, MIMETYPE_JSON, "{\"msg\":\"Invalid Map Index\"}");
+      log_e("Invalid Command");
+      request->send(400, MIMETYPE_JSON, "{\"msg\":\"Invalid Command\"}");
       return;
     }
-  } catch (...) {
-    log_e("Error handling request");
+  } else {
+    log_e("Invalid Map Index");
+    request->send(400, MIMETYPE_JSON, "{\"msg\":\"Invalid Map Index\"}");
+    return;
   }
 }

ESP/lib/src/network/mDNS/MDNSManager.cpp

@@ -6,7 +6,8 @@ MDNSHandler::MDNSHandler(ProjectConfig& configManager)
 bool MDNSHandler::startMDNS() {
   const std::string service = "_openiristracker";
   auto mdnsConfig = configManager.getMDNSConfig();
-  if (!MDNS.begin(mdnsConfig.hostname.c_str()))  // lowercase only - as this will be the url
+  if (!MDNS.begin(mdnsConfig.hostname
+                      .c_str()))  // lowercase only - as this will be the url
   {
     mdnsStateManager.setState(MDNSState_e::MDNSState_Error);
     log_e("Error initializing MDNS");
@@ -15,7 +16,6 @@ bool MDNSHandler::startMDNS() {
 
   mdnsStateManager.setState(MDNSState_e::MDNSState_Starting);
   MDNS.addService(service.c_str(), "_tcp", 80);
-  char port[20];
   //! Add service needs leading _ on ESP32 implementation for some reason
   //! (according to the docs)
   MDNS.addServiceTxt(service.c_str(), "_tcp", "stream_port", "80");