config: disable awb_gain

Author: yoursunny

examples/AsyncCam/handlers.cpp

@@ -83,6 +83,7 @@ rewriteFrontpage(const esp32cam::Settings& s, const String& var) {
   b.printf("<option value=\"%d\" title=\"%s\"%s>%s</option>",                                      \
            static_cast<int>(esp32cam::LightMode::MODE), #MODE,                                     \
            s.lightMode == esp32cam::LightMode::MODE ? " selected" : "", SYMBOL)
+    SHOW_LM(NONE, "&#x1F6AB;");
     SHOW_LM(AUTO, "&#x2B55;");
     SHOW_LM(SUNNY, "&#x2600;&#xFE0F;");
     SHOW_LM(CLOUDY, "&#x2601;&#xFE0F;");

src/esp32cam/config.cpp

@@ -100,14 +100,15 @@ CameraClass::status() const {
     return result;
   }
 
-  result.resolution = Resolution(sensor->status.framesize);
-  result.brightness = sensor->status.brightness;
-  result.contrast = sensor->status.contrast;
-  result.saturation = sensor->status.saturation;
-  result.lightMode = static_cast<LightMode>(sensor->status.wb_mode);
-  result.specialEffect = static_cast<SpecialEffect>(sensor->status.special_effect);
-  result.hmirror = sensor->status.hmirror != 0;
-  result.vflip = sensor->status.vflip != 0;
+  const auto& ss = sensor->status;
+  result.resolution = Resolution(ss.framesize);
+  result.brightness = ss.brightness;
+  result.contrast = ss.contrast;
+  result.saturation = ss.saturation;
+  result.lightMode = ss.awb_gain ? static_cast<LightMode>(ss.wb_mode) : LightMode::NONE;
+  result.specialEffect = static_cast<SpecialEffect>(ss.special_effect);
+  result.hmirror = ss.hmirror != 0;
+  result.vflip = ss.vflip != 0;
   return result;
 }
 
@@ -127,33 +128,39 @@ CameraClass::update(const Settings& settings, int sleepFor) {
     }                                                                                              \
   } while (false)
 
-#define UPDATE(STATUS_MEM, SETTING_MEM, SETTER_TYP)                                                \
+#define UPDATE(STATUS_MEM, value, SETTER_TYP)                                                      \
   do {                                                                                             \
     int prev = static_cast<int>(sensor->status.STATUS_MEM);                                        \
-    int next = static_cast<int>(settings.SETTING_MEM);                                             \
-    if (prev != static_cast<int>(settings.SETTING_MEM)) {                                          \
-      int res = sensor->set_##STATUS_MEM(sensor, static_cast<SETTER_TYP>(next));                   \
-      ESP32CAM_LOG("update " #STATUS_MEM " %d => %d %s", prev, next,                               \
+    int desired = static_cast<int>(value);                                                         \
+    if (prev != desired) {                                                                         \
+      int res = sensor->set_##STATUS_MEM(sensor, static_cast<SETTER_TYP>(desired));                \
+      ESP32CAM_LOG("update " #STATUS_MEM " %d => %d %s", prev, desired,                            \
                    res == 0 ? "success" : "failure");                                              \
       if (res != 0) {                                                                              \
         return false;                                                                              \
       }                                                                                            \
     }                                                                                              \
   } while (false)
-#define UPDATE1(MEM) UPDATE(MEM, MEM, int)
+#define UPDATE1(MEM) UPDATE(MEM, settings.MEM, int)
 
   CHECK_RANGE(brightness, -2, 2);
   CHECK_RANGE(contrast, -2, 2);
   CHECK_RANGE(saturation, -2, 2);
-  CHECK_RANGE(lightMode, 0, 4);
+  CHECK_RANGE(lightMode, -1, 4);
   CHECK_RANGE(specialEffect, 0, 6);
 
-  UPDATE(framesize, resolution.as<framesize_t>(), framesize_t);
+  UPDATE(framesize, settings.resolution.as<framesize_t>(), framesize_t);
   UPDATE1(brightness);
   UPDATE1(contrast);
   UPDATE1(saturation);
-  UPDATE(wb_mode, lightMode, int);
-  UPDATE(special_effect, specialEffect, int);
+  if (settings.lightMode == LightMode::NONE) {
+    UPDATE(awb_gain, 0, int);
+    UPDATE(wb_mode, 0, int);
+  } else {
+    UPDATE(awb_gain, 1, int);
+    UPDATE(wb_mode, settings.lightMode, int);
+  }
+  UPDATE(special_effect, settings.specialEffect, int);
   UPDATE1(hmirror);
   UPDATE1(vflip);
 

src/esp32cam/config.hpp

@@ -54,6 +54,7 @@ class Config {
 
 /** @brief Light mode / white balance values. */
 enum class LightMode {
+  NONE = -1,
   AUTO = 0,
   SUNNY = 1,
   CLOUDY = 2,