Commits

a1ex committed 6177cc2

5D3: disabled auto exposure on zoom (seems to cause black pictures). Defined FEATURE_LV_ZOOM_AUTO_EXPOSURE and FEATURE_LV_ZOOM_SHARP_CONTRAST.

Comments (0)

Files changed (3)

platform/5D3.113/features.h

 //~ #define FEATURE_REMEMBER_LAST_ZOOM_POS_5D3 // too many conflicts with other features
 #undef FEATURE_IMAGE_POSITION
 
+
+#undef FEATURE_LV_ZOOM_AUTO_EXPOSURE // seems to cause black pictures
+
 //~ #define FEATURE_VIDEO_HACKS

src/all_features.h

     #define FEATURE_QUICK_ERASE
     
     #define FEATURE_LV_ZOOM_SETTINGS
+    #define FEATURE_LV_ZOOM_SHARP_CONTRAST
+    #ifdef CONFIG_EXPSIM
+    #define FEATURE_LV_ZOOM_AUTO_EXPOSURE
+    #endif
     //~ #define FEATURE_ZOOM_TRICK_5D3 // not reliable
     
     #define FEATURE_LV_FOCUS_BOX_FAST
 // called from some prop_handlers (shoot.c and zebra.c)
 void zoom_sharpen_step()
 {
+#ifdef FEATURE_LV_ZOOM_SHARP_CONTRAST
     if (!zoom_sharpen) return;
 
     static int co = 100;
             co = sa = sh = 100;
         }
     }
+#endif
 }
 
 #ifdef CONFIG_EXPSIM
 // to be called from the same places as zoom_sharpen_step
 void zoom_auto_exposure_step()
 {
-#ifdef CONFIG_EXPSIM
+#ifdef FEATURE_LV_ZOOM_AUTO_EXPOSURE
     if (!zoom_auto_exposure) return;
 
     static int es = -1;
                 .help = "Disable x10 zoom in LiveView.",
                 .icon_type = IT_DISABLE_SOME_FEATURE,
             },
-            #ifdef CONFIG_EXPSIM
+            #ifdef FEATURE_LV_ZOOM_AUTO_EXPOSURE
+                #ifndef CONFIG_EXPSIM
+                #error This requires CONFIG_EXPSIM.
+                #endif
             {
                 .name = "Auto exposure on Zoom ",
                 .priv = &zoom_auto_exposure,
                 .help = "Auto adjusts exposure, so you can focus manually wide open."
             },
             #endif
+            #ifdef FEATURE_LV_ZOOM_SHARP_CONTRAST
             {
                 .name = "Increase SharpContrast",
                 .priv = &zoom_sharpen,
                 .max = 1,
                 .help = "Increase sharpness and contrast when you zoom in LiveView."
             },
+            #endif
             {
                 .name = "Zoom on HalfShutter   ",
                 .priv = &zoom_halfshutter,