Read about our upcoming Code of Conduct on this issue

Commit a9ea5c67 authored by a1ex's avatar a1ex
Browse files

600D: disabled WB workaround (not needed)

--HG--
branch : unified
parent 1d14d989e555
......@@ -13,6 +13,7 @@
CONFIG_INT("hdmi.force.vga", hdmi_force_vga, 0);
#ifndef CONFIG_600D
// WB workaround (not saved in movie mode)
//**********************************************************************
CONFIG_INT( "white.balance.workaround", white_balance_workaround, 1);
......@@ -26,15 +27,18 @@ void save_kelvin_wb()
workaround_wbs_gm = lens_info.wbs_gm + 100;
workaround_wbs_ba = lens_info.wbs_ba + 100;
}
#endif
void restore_kelvin_wb()
{
#ifndef CONFIG_600D
if (!white_balance_workaround) return;
// sometimes Kelvin WB and WBShift are not remembered, usually in Movie mode
lens_set_kelvin_value_only(workaround_wb_kelvin);
lens_set_wbs_gm(COERCE(((int)workaround_wbs_gm) - 100, -9, 9));
lens_set_wbs_ba(COERCE(((int)workaround_wbs_ba) - 100, -9, 9));
#endif
}
int mode_remap_done = 0;
......@@ -248,7 +252,9 @@ movtweak_task( void* unused )
do_movie_mode_remap();
#ifndef CONFIG_600D
save_kelvin_wb();
#endif
if ((enable_liveview && DLG_MOVIE_PRESS_LV_TO_RESUME) ||
(enable_liveview == 2 && DLG_MOVIE_ENSURE_A_LENS_IS_ATTACHED))
......@@ -274,6 +280,7 @@ movtweak_task( void* unused )
TASK_CREATE("movtweak_task", movtweak_task, 0, 0x1f, 0x1000 );
#ifndef CONFIG_600D
static void
wb_workaround_display(
void * priv,
......@@ -289,7 +296,7 @@ wb_workaround_display(
white_balance_workaround ? "ON(save WB in cfg)" : "OFF"
);
}
#endif
extern int zebra_nrec;
......@@ -377,6 +384,7 @@ static struct menu_entry mov_menus[] = {
.select = menu_binary_toggle,
.help = "Change the button used for recording. Hint: wired remote."
},
#ifndef CONFIG_600D
{
.name = "WB workaround",
.priv = &white_balance_workaround,
......@@ -384,6 +392,7 @@ static struct menu_entry mov_menus[] = {
.select = menu_binary_toggle,
.help = "Without this, camera forgets some WB params in Movie mode."
},
#endif
{
.name = "Zebra when REC",
.priv = &zebra_nrec,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment