Initial implementation of API/user config controlled auto exposure and gain settings

Author: lorow

ESP/ini/dev_config.ini

@@ -28,8 +28,13 @@ build_flags =
 	-DENABLE_ADHOC=${wifi.enableadhoc}
 	-DADHOC_CHANNEL=${wifi.adhocchannel}
 	-DWIFI_CHANNEL=${wifi.channel}
-	-DDEBUG_ESP_PORT=Serial
-	'-DMDNS_HOSTNAME=${wifi.mdnsname}'
+	-DSIMPLE_AUTO_EXPOSURE_ON=${autoexposure.simple_auto_exposure_on}
+	-DFANCY_AUTO_EXPOSURE_ON=${autoexposure.fancy_auto_exposure_on}
+	-DAE_LEVEL=${autoexposure.ae_level}
+	-DAEC_VALUE=${autoexposure.aec_value}
+	-DAUTO_GAIN_ON=${autoexposure.auto_gain_on}
+	-DDEBUG_ESP_PORT=Serial                            ; set the debug port
+	'-DMDNS_HOSTNAME=${wifi.mdnsname}'                 ; Set the OTA password
 	'-DWIFI_SSID=${wifi.ssid}'
 	'-DWIFI_PASSWORD=${wifi.password}'
 	'-DWIFI_AP_SSID=${wifi.ap_ssid}'

ESP/ini/user_config.ini

@@ -17,3 +17,14 @@ otaserverip = "openiristracker.local"
 otalogin = "openiris"
 otapassword = "12345678"
 otaserverport = 3232
+
+[autoexposure]
+simple_auto_exposure_on = 0 ; should the auto exposure be enabled, 0 - off, 1 - on
+fancy_auto_exposure_on = 0 ; should the more advanced auto exposure be enabled, 0 - on, 1 - off
+
+ae_level = 0 ; auto exposure level, -2 to 2, 0 is the default
+aec_value = 300 ; auto exposure control, a sort of brightness, 0 - 1200
+
+auto_gain_on = 0 ; should the auto gain be enabled, 0 - off, 1 - on
+
+brightness = 2 ; controls the brightness, -2 to 2, to is the default

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

@@ -238,13 +238,23 @@ void ProjectConfig::setCameraConfig(uint8_t* vflip,
                                     uint8_t* href,
                                     uint8_t* quality,
                                     uint8_t* brightness,
+                                    bool simple_auto_exposure_on,
+                                    bool fancy_auto_exposure_on,
+                                    int ae_level,
+                                    unsigned int aec_value,
+                                    bool auto_gain_on,
                                     bool shouldNotify) {
   log_d("Updating camera config");
   this->config.camera.vflip = *vflip;
   this->config.camera.href = *href;
   this->config.camera.framesize = *framesize;
   this->config.camera.quality = *quality;
   this->config.camera.brightness = *brightness;
+  this->config.camera.simple_auto_exposure_on = simple_auto_exposure_on;
+  this->config.camera.fancy_auto_exposure_on = fancy_auto_exposure_on;
+  this->config.camera.ae_level = ae_level;
+  this->config.camera.aec_value = aec_value;
+  this->config.camera.auto_gain_on = auto_gain_on;
 
   log_d("Updating Camera config");
   if (shouldNotify)
@@ -372,9 +382,10 @@ std::string ProjectConfig::MDNSConfig_t::toRepresentation() {
 std::string ProjectConfig::CameraConfig_t::toRepresentation() {
   std::string json = Helpers::format_string(
       "\"camera_config\": {\"vflip\": %d,\"framesize\": %d,\"href\": "
-      "%d,\"quality\": %d,\"brightness\": %d}",
+      "%d,\"quality\": %d,\"brightness\": %d, \"simple_auto_exposure_on\": %d, \"fancy_auto_exposure_on\": %d,\"ae_level\": %d, \"aec_value\": %d, \"auto_gain_on\": %d }",
       this->vflip, this->framesize, this->href, this->quality,
-      this->brightness);
+      this->brightness, this->simple_auto_exposure_on, this->fancy_auto_exposure_on,
+      this->aec_value, this->ae_level, this->auto_gain_on);
   return json;
 }
 

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

@@ -45,6 +45,11 @@ class ProjectConfig : public Preferences, public ISubject {
     uint8_t framesize;
     uint8_t quality;
     uint8_t brightness;
+    bool simple_auto_exposure_on;
+    bool fancy_auto_exposure_on;
+    int ae_level;
+    unsigned int aec_value;
+    bool auto_gain_on;
 
     std::string toRepresentation();
   };
@@ -114,6 +119,11 @@ class ProjectConfig : public Preferences, public ISubject {
                        uint8_t* href,
                        uint8_t* quality,
                        uint8_t* brightness,
+                       bool simple_auto_exposure_on,
+                       bool fancy_auto_exposure_on,
+                       int ae_level,
+                       unsigned int aec_value,
+                       bool auto_gain_on,
                        bool shouldNotify);
   void setWifiConfig(const std::string& networkName,
                      const std::string& ssid,

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

@@ -284,8 +284,17 @@ void BaseAPI::setCamera(AsyncWebServerRequest* request) {
       uint8_t temp_camera_hflip = 0;
       uint8_t temp_camera_quality = 0;
       uint8_t temp_camera_brightness = 0;
+      uint8_t temp_simple_auto_exposure_on = SIMPLE_AUTO_EXPOSURE_ON;
+      uint8_t temp_fancy_auto_exposure_on = FANCY_AUTO_EXPOSURE_ON;
+      int temp_ae_level = AE_LEVEL;
+      unsigned int temp_aec_value = AEC_VALUE;
+      uint8_t temp_auto_gain_on = AUTO_GAIN_ON;
+
 
       int params = request->params();
+      // TODO we probably should refactor this at some point, maybe some serialization of sorts, or direct mapping of
+      // TODO get parameters? Can we even do that?
+
       //! Using the else if statements to ensure that the values do not need to
       //! be set in a specific order This means the order of the URL params does
       //! not matter
@@ -301,13 +310,25 @@ void BaseAPI::setCamera(AsyncWebServerRequest* request) {
           temp_camera_quality = (uint8_t)param->value().toInt();
         } else if (param->name() == "brightness") {
           temp_camera_brightness = (uint8_t)param->value().toInt();
+        } else if (param->name() == "simple_auto_exposure_on") {
+          temp_simple_auto_exposure_on = (uint8_t)param->value().toInt();
+        } else if (param->name() == "fancy_auto_exposure_on") {
+          temp_fancy_auto_exposure_on = (uint8_t)param->value().toInt();
+        } else if (param->name() == "ae_level") {
+          temp_ae_level = param->value().toInt();
+        } else if (param->name() == "aec_value") {
+          temp_aec_value = (uint8_t)param->value().toInt();
+        } else if (param->name() == "auto_gain_on") {
+          temp_auto_gain_on = (uint8_t)param->value().toInt();
         }
       }
       // note: We're passing empty params by design, this is done to reset
       // specific fields
       projectConfig->setCameraConfig(&temp_camera_vflip, &temp_camera_framesize,
                                      &temp_camera_hflip, &temp_camera_quality,
-                                     &temp_camera_brightness, true);
+                                     &temp_camera_brightness, temp_simple_auto_exposure_on,
+                                     temp_fancy_auto_exposure_on, temp_ae_level,
+                                     temp_aec_value, temp_auto_gain_on, true);
 
       request->send(200, MIMETYPE_JSON,
                     "{\"msg\":\"Done. Camera Settings have been set.\"}");