Changeset 635

Timestamp:

12/14/08 02:16:49 (4 years ago)

Author:

phyrephox

Message:

fixed behaviour of shooting_set_zoom - see ​http://chdk.setepontos.com/index.php/topic,2691.msg25164.html#msg25164 (thx ewavr)
/* added zoom_status to a few cameras that still needed it */

Location:

trunk

Files:

• platform/generic/wrappers.c (modified) (1 diff)
• platform/ixus60_sd600/sub/100a/stubs_min.S (modified) (1 diff)
• platform/ixus60_sd600/sub/100d/stubs_min.S (modified) (1 diff)
• platform/ixus65_sd630/sub/100a/stubs_min.S (modified) (1 diff)
• platform/ixus960_sd950/sub/100d/stubs_min.S (modified) (1 diff)
• platform/s2is/sub/100e/stubs_min.S (modified) (1 diff)
• platform/s2is/sub/100f/stubs_min.S (modified) (1 diff)
• platform/s2is/sub/100g/stubs_min.S (modified) (1 diff)
• platform/s3is/sub/100a/stubs_min.S (modified) (1 diff)
• platform/s5is/sub/101a/stubs_min.S (modified) (1 diff)
• platform/s5is/sub/101b/stubs_min.S (modified) (1 diff)
• platform/tx1/sub/100g/stubs_min.S (modified) (1 diff)
• platform/tx1/sub/101b/stubs_min.S (modified) (1 diff)
• version.inc (modified) (1 diff)

trunk/platform/generic/wrappers.c

@@ -128 +128 @@
     _MoveZoomLensWithPoint((short*)&newpt);
     while (zoom_busy);
+    if (newpt==0) zoom_status=ZOOM_OPTICAL_MIN;
+    else if (newpt >= zoom_points) zoom_status=ZOOM_OPTICAL_MAX;
+    else zoom_status=ZOOM_OPTICAL_MEDIUM; 
 }
 

trunk/platform/ixus60_sd600/sub/100a/stubs_min.S

@@ -23 +23 @@
 DEF(focus_busy, 0x79EBC)        // FocusLensController, 0xFFAB4DD0 (zoom_busy + 0xFFAC)
 DEF(movie_compression, 0x6134)  // 0xFF955B1C (focus_busy - 15F2B4)
-
+DEF(zoom_status, 0x73D8)
 DEF(FlashParamsTable,0xFF9749F0)
 

trunk/platform/ixus60_sd600/sub/100d/stubs_min.S

@@ -23 +23 @@
 DEF(focus_busy, 0x79F34)        // FocusLensController, 0xFFAB58C8
 DEF(movie_compression, 0x6140)  // 0xFF956614
-
+DEF(zoom_status, 0x73D8)
 DEF(FlashParamsTable,0xFF9754E8)
 

trunk/platform/ixus65_sd630/sub/100a/stubs_min.S

@@ -24 +24 @@
 DEF(focus_busy, 0x7A13C)
 DEF(movie_compression, 0x617C)
-
+DEF(zoom_status, 0x7450)
 DEF(FlashParamsTable,0xFF975EB0)
 

trunk/platform/ixus960_sd950/sub/100d/stubs_min.S

@@ -16 +16 @@
 DEF(canon_shoot_menu_active,0xEDE5)   // 0xEDE4+1
 DEF(recreview_hold, 0xEBFC) // 0xEB50+0xAC
+DEF(zoom_status, 0x11E48)

trunk/platform/s2is/sub/100e/stubs_min.S

@@ -13 +13 @@
 DEF(recreview_hold, 0x60FB0)
 DEF(movie_status,0x5C95C)
+DEF(zoom_status, 0x6B38)

trunk/platform/s2is/sub/100f/stubs_min.S

@@ -13 +13 @@
 DEF(recreview_hold, 0x60FB0)
 DEF(movie_status,0x5C95C)
+DEF(zoom_status, 0x6B38)

trunk/platform/s2is/sub/100g/stubs_min.S

@@ -13 +13 @@
 DEF(recreview_hold, 0x60FD0)
 DEF(movie_status,0x5C95C)
+DEF(zoom_status, 0x6B68)

trunk/platform/s3is/sub/100a/stubs_min.S

@@ -12 +12 @@
 DEF(recreview_hold, 0x69480)
 DEF(movie_status,0x6115C)
+DEF(zoom_status, 0x7BCC)

trunk/platform/s5is/sub/101a/stubs_min.S

@@ -23 +23 @@
 DEF(recreview_hold, 0xBE2C) // 0xBD60 + 0xCC
 
+DEF(zoom_status, 0x68F8)

trunk/platform/s5is/sub/101b/stubs_min.S

@@ -89 +89 @@
 DEF(recreview_hold, 0xBE2C) // 0xBD60 + 0xCC
 DEF(movie_status,0x5868 + 0x38)
+DEF(zoom_status, 0x68F8)
 
 
 
 
-

trunk/platform/tx1/sub/100g/stubs_min.S

@@ -12 +12 @@
 DEF(movie_status, 0xB3F68)
 DEF(some_flag_for_af_scan, 0xD1C8)
+DEF(zoom_status, 0x2760)

trunk/platform/tx1/sub/101b/stubs_min.S

@@ -12 +12 @@
 DEF(movie_status, 0xB3F68)
 DEF(some_flag_for_af_scan, 0xD1C8)
+DEF(zoom_status, 0x2760)

trunk/version.inc

@@ -1 @@
-BUILD_NUMBER := 0.8.9
+BUILD_NUMBER := 0.8.10