config: raw gamma & lens correction

refs #16
yoursunny · Jan 13, 2025 · 73611fc · 73611fc
1 parent 04601d8
commit 73611fc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/examples/AsyncCam/handlers.cpp b/examples/AsyncCam/handlers.cpp
@@ -16,6 +16,8 @@ static const char FRONTPAGE[] = R"EOT(
 <select name="specialEffect" title="special effect">%specialEffect%</select>
 %hmirror%
 %vflip%
+%rawGma%
+%lensCorrection%
 <input type="submit" value="update">
 </p></form>
 <p id="controls">
@@ -82,12 +84,12 @@ rewriteFrontpage(const esp32cam::Settings& s, const String& var) {
   } else if (var == "gain") {
 #define SHOW_GAIN(val, dsp)                                                                        \
   b.printf("<option value=\"%d\"%s>%dx</option>", val, s.gain == val ? " selected" : "", dsp)
-    b.printf("<optgroup label=\"AGC=off\">");
+    b.printf("<optgroup label=\"AGC=0\">");
     for (int i = 1; i <= 31; ++i) {
       SHOW_GAIN(i, i);
     }
     b.printf("</optgroup>");
-    b.printf("<optgroup label=\"AGC=on\">");
+    b.printf("<optgroup label=\"AGC=1\">");
     for (int i = 2; i <= 128; i <<= 1) {
       SHOW_GAIN(-i, i);
     }
@@ -138,6 +140,8 @@ rewriteFrontpage(const esp32cam::Settings& s, const String& var) {
   SHOW_INT(saturation, -2, 2)
   SHOW_BOOL(hmirror)
   SHOW_BOOL(vflip)
+  SHOW_BOOL(rawGma)
+  SHOW_BOOL(lensCorrection)
 #undef SHOW_INT
 #undef SHOW_BOOL
   return b;
@@ -164,6 +168,8 @@ handleUpdate(AsyncWebServerRequest* req) {
     SAVE_INT(specialEffect);
     SAVE_BOOL(hmirror);
     SAVE_BOOL(vflip);
+    SAVE_BOOL(rawGma);
+    SAVE_BOOL(lensCorrection);
 #undef SAVE_BOOL
 #undef SAVE_INT
   });

diff --git a/src/esp32cam/config.cpp b/src/esp32cam/config.cpp
@@ -107,13 +107,11 @@ CameraClass::status() const {
   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);
-  if (ss.agc) {
-    result.gain = (-2) << ss.gainceiling;
-  } else {
-    result.gain = 1 + static_cast<int8_t>(ss.agc_gain);
-  }
+  result.gain = ss.agc ? ((-2) << ss.gainceiling) : (1 + static_cast<int8_t>(ss.agc_gain));
   result.hmirror = ss.hmirror != 0;
   result.vflip = ss.vflip != 0;
+  result.rawGma = ss.raw_gma != 0;
+  result.lensCorrection = ss.lenc != 0;
   return result;
 }
 
@@ -165,6 +163,8 @@ CameraClass::update(const Settings& settings, int sleepFor) {
   UPDATE2(special_effect, settings.specialEffect);
   UPDATE1(hmirror);
   UPDATE1(vflip);
+  UPDATE2(raw_gma, settings.rawGma);
+  UPDATE2(lenc, settings.lensCorrection);
 
   if (settings.gain > 0) {
     UPDATE4(agc, 0, set_gain_ctrl, int);

diff --git a/src/esp32cam/config.hpp b/src/esp32cam/config.hpp
@@ -106,6 +106,12 @@ struct Settings {
 
   /** @brief Vertical flip. */
   bool vflip = false;
+
+  /** @brief Raw gamma mode. */
+  bool rawGma = false;
+
+  /** @brief Lens correction mode. */
+  bool lensCorrection = false;
 };
 
 } // namespace esp32cam