Changeset 651

Timestamp:

05/01/11 10:41:44 (2 years ago)

Author:

msl

Message:

Aktualisierung auf Rev. 1162 offizieller Trunk

• ​http://tools.assembla.com/chdk/changeset/1162/trunk
• Betrifft G12, SX30
• Korrektur Av-Reihe im fortlaufenden Modus

Location:

trunk/platform

Files:

• g12/sub/100c/stubs_entry_2.S (modified) (1 diff)
• g12/sub/100e/stubs_entry_2.S (modified) (1 diff)
• generic/shooting.c (modified) (1 diff)
• sx30/sub/100e/stubs_entry_2.S (modified) (1 diff)
• sx30/sub/100h/stubs_entry_2.S (modified) (1 diff)
• sx30/sub/100l/stubs_entry_2.S (modified) (1 diff)

trunk/platform/g12/sub/100c/stubs_entry_2.S

@@ -95 +95 @@
 NHSTUB(rand,                                                    0xFFA5B364)     // search for 0x41C64E6D. Function before this value is rand.
 NHSTUB(srand,                                                   0xFFA5B358)     // search for 0x41C64E6D. Function before rand is srand.
+NHSTUB(MoveIrisWithAv,                                  0xFFB04878)
 
 # From stubs_entry_ida.s

trunk/platform/g12/sub/100e/stubs_entry_2.S

@@ -95 +95 @@
 NHSTUB(rand,                                                    0xFFA5B370)     // search for 0x41C64E6D. Function before this value is rand.
 NHSTUB(srand,                                                   0xFFA5B364)     // search for 0x41C64E6D. Function before rand is srand.
+NHSTUB(MoveIrisWithAv,                                  0xFFB04A28)
 
 # From stubs_entry_ida.s

trunk/platform/generic/shooting.c

@@ -1224 +1224 @@
 
 void shooting_av_bracketing(){
- short value, is_odd;
- int m=mode_get()&MODE_SHOOTING_MASK;
- if (bracketing.shoot_counter==0) { // first shoot
-    bracketing.shoot_counter=1;
-    //short av_override_value=shooting_get_av96_override_value;
-    //if (av_override_value) bracketing.av96=av_override_value;
-    if (!(m==MODE_M || m==MODE_AV)) bracketing.av96=shooting_get_av96(); 
-        else bracketing.av96=shooting_get_user_av96();
-    bracketing.av96_step=32*conf.av_bracket_value;
-  }
-  // other shoots
-   bracketing.shoot_counter++;   
-   is_odd=(bracketing.shoot_counter&1);
-   if (((!is_odd) || (conf.bracket_type>0)) || (((is_odd) && (conf.bracket_type==0)) && ((bracketing.av96-bracketing.dav96)<AV96_MIN))) 
-       bracketing.dav96+=bracketing.av96_step;
-   if ((((!is_odd) && (conf.bracket_type==0)) || (conf.bracket_type==1)) && ((bracketing.av96-bracketing.dav96)>=AV96_MIN))
-     {
-     value=bracketing.av96-bracketing.dav96;
-     shooting_set_av96_direct(value, SET_NOW);
-     }
-   else if (((is_odd) && (conf.bracket_type==0)) || (conf.bracket_type==2)  || (((!is_odd) && (conf.bracket_type==0)) && ((bracketing.av96-bracketing.dav96)<AV96_MIN)))
-     { 
-     value=bracketing.av96+bracketing.dav96;
-     shooting_set_av96_direct(value, SET_NOW);
-     }
+    short value,is_odd;
+
+    int m = mode_get()&MODE_SHOOTING_MASK;
+
+    if (bracketing.shoot_counter == 0) { // first shoot
+        bracketing.shoot_counter = 1;
+        //short av_override_value=shooting_get_av96_override_value;
+        //if (av_override_value) bracketing.av96=av_override_value;
+        if (!(m==MODE_M || m==MODE_AV))
+            bracketing.av96 = shooting_get_av96();
+        else
+            bracketing.av96 = shooting_get_user_av96();
+        bracketing.av96_step = 32*conf.av_bracket_value;
+    }
+    // other shoots
+    bracketing.shoot_counter++;
+    is_odd = (bracketing.shoot_counter&1);
+    value = bracketing.av96;
+
+    if ( !is_odd || (conf.bracket_type > 0) ||
+         ( is_odd && (conf.bracket_type == 0) && ((bracketing.av96 - bracketing.dav96) < AV96_MIN) ))
+    {
+       bracketing.dav96 += bracketing.av96_step;
+    }
+
+    if (((!is_odd && (conf.bracket_type == 0)) || (conf.bracket_type == 1)) && ((bracketing.av96 - bracketing.dav96) >= AV96_MIN))
+    {
+        value -= bracketing.dav96;
+    }
+    else if ((is_odd && (conf.bracket_type == 0)) 
+                || (conf.bracket_type == 2) 
+                || ((!is_odd && (conf.bracket_type == 0)) && ((bracketing.av96 - bracketing.dav96) < AV96_MIN)))
+    {
+        value += bracketing.dav96;
+    }
+
+    if (value != bracketing.av96)
+    {
+        shooting_set_av96_direct(value, SET_NOW);
+// sx30 and g12 apparently do not set aperture from propcase in continuous mode
+// TODO if this is common to other models it should become a camera.h define
+#if defined(CAMERA_sx30) || defined(CAMERA_g12)
+        extern int _MoveIrisWithAv(short*);
+        _MoveIrisWithAv(&value);
+#endif
+    }
 }
 

trunk/platform/sx30/sub/100e/stubs_entry_2.S

@@ -92 +92 @@
 NHSTUB(rand,                                                    0xFFA4D8C8)     // search for 0x41C64E6D. Function before this value is rand.
 NHSTUB(srand,                                                   0xFFA4D8BC)     // search for 0x41C64E6D. Function before rand is srand.
+NHSTUB(MoveIrisWithAv,                                  0xFFAE8D58)
 
 # from stubs_entry_ida.S

trunk/platform/sx30/sub/100h/stubs_entry_2.S

@@ -92 +92 @@
 NHSTUB(rand,                                                    0xFFA4D984)     // search for 0x41C64E6D. Function before this value is rand.
 NHSTUB(srand,                                                   0xFFA4D978)     // search for 0x41C64E6D. Function before rand is srand.
+NHSTUB(MoveIrisWithAv,                                  0xFFAE8E14)
 
 # from stubs_entry_ida.S

trunk/platform/sx30/sub/100l/stubs_entry_2.S

@@ -92 +92 @@
 NHSTUB(rand,                                                    0xFFA4DB2C)     // search for 0x41C64E6D. Function before this value is rand.
 NHSTUB(srand,                                                   0xFFA4DB20)     // search for 0x41C64E6D. Function before rand is srand.
+NHSTUB(MoveIrisWithAv,                                  0xFFAE8FBC)
 
 # from stubs_entry_ida.S