Changeset 814 for trunk

Timestamp:

10/11/09 22:46:27 (4 years ago)

Author:

reyalp

Message:

• fix tv backeting with overrides for cameras with EXT_TV_RANGE, thanks to Atnas and fudgey ​http://chdk.setepontos.com/index.php/topic,4314.0.html
• dancingbits flavors

Location:

trunk

Files:

• platform/generic/shooting.c (modified) (3 diffs)
• tools/dancingbits.c (modified) (1 diff)

trunk/platform/generic/shooting.c

@@ -46 +46 @@
 const int tv_override_amount = sizeof(tv_override)/sizeof(tv_override[0]);
 
+// offset index into tv_override to translate into 1/3 stops in APEX
 #if CAM_EXT_TV_RANGE
 const int tv_override_zero_shift = 18+15;
@@ -1095 +1096 @@
       // ...use Tv override value as seed for bracketing:
       if (conf.tv_enum_type) 
-        bracketing.tv96 = 32*(conf.tv_override_value-18);
+        bracketing.tv96 = 32*(conf.tv_override_value-tv_override_zero_shift);
       else 
         bracketing.tv96 = shooting_get_tv96_from_shutter_speed(shooting_get_shutter_speed_override_value());
@@ -1281 +1282 @@
    { 
    if (conf.tv_enum_type) 
-//     shooting_set_tv96_direct(32*(conf.tv_override_value-18),SET_NOW);
      shooting_set_tv96_direct(32*(conf.tv_override_value-(tv_override_zero_shift)),SET_NOW);
    else   

trunk/tools/dancingbits.c

@@ -15 +15 @@
 #define VITALY 3
 unsigned char _chr_[VITALY][8] = {
-                                                                        { 4,6,1,0,7,2,5,3 },
-                                                                        { 5,3,6,1,2,7,0,4 },
-                                                                        { 2,5,0,4,6,1,3,7 }
+                                                                        { 4,6,1,0,7,2,5,3 }, // original flavor
+                                                                        { 5,3,6,1,2,7,0,4 }, // nacho cheese sx200is, ixus100_sd780, ixu95_sd1200
+                                                                        { 2,5,0,4,6,1,3,7 }  // mesquite bbq ixus200_sd980
                                                                 };