Changeset 1113

Timestamp:

03/27/11 04:49:37 (2 years ago)

Author:

reyalP

Message:

from philmoz in ​http://chdk.setepontos.com/index.php?topic=650.msg63494#msg63494
Update to lens_set_zoom_point function for G12 & SX30 (platform/generic/wrappers.c).

• Set zoom_status value.
• Zoom out of digital zoom range if camera was in this range when lens_set_zoom_point is called.

File:

• trunk/platform/generic/wrappers.c (modified) (3 diffs)

trunk/platform/generic/wrappers.c

@@ -142 +142 @@
         newpt = zoom_points-1;
     }
-#if defined(CAMERA_sx30)
-// SX30 - Can't find zoom_status, _MoveZoomLensWithPoint crashes camera
-// _PT_MoveOpticalZoomAt works, and updates PROPCASE_OPTICAL_ZOOM_POSITION; but doesn't wait for zoom to finish
-        extern void _PT_MoveOpticalZoomAt(long*);
+
+#if defined(CAMERA_sx30) || defined(CAMERA_g12)
         if (lens_get_zoom_point() != newpt)
         {
+                // Get current digital zoom mode & state
+                // state == 1 && mode == 0 --> Digital Zoom Standard
+                int digizoom_mode, digizoom_state, digizoom_pos;
+                get_property_case(PROPCASE_DIGITAL_ZOOM_MODE,&digizoom_mode,sizeof(digizoom_mode));
+                get_property_case(PROPCASE_DIGITAL_ZOOM_STATE,&digizoom_state,sizeof(digizoom_state));
+                get_property_case(PROPCASE_DIGITAL_ZOOM_POSITION,&digizoom_pos,sizeof(digizoom_pos));
+                if ((digizoom_state == 1) && (digizoom_mode == 0) && (digizoom_pos != 0))
+                {
+                        // reset digital zoom in case camera is in this zoom range
+                        extern void _PT_MoveDigitalZoomToWide();
+                        _PT_MoveDigitalZoomToWide();
+                }
+
+  #if defined(CAMERA_sx30)
+                // SX30 - _MoveZoomLensWithPoint crashes camera
+                // _PT_MoveOpticalZoomAt works, and updates PROPCASE_OPTICAL_ZOOM_POSITION; but doesn't wait for zoom to finish
+                extern void _PT_MoveOpticalZoomAt(long*);
                 _PT_MoveOpticalZoomAt(&newpt);
+  #else
+            _MoveZoomLensWithPoint((short*)&newpt);
+  #endif
+
+                // have to sleep here, zoom_busy set in another task, without sleep this will hang
                 while (zoom_busy) msleep(10);
+
+                // g12 & sx30 only use this value for optical zoom
+                zoom_status=ZOOM_OPTICAL_MAX;
+
+  #if defined(CAMERA_g12)
+            _SetPropertyCase(PROPCASE_OPTICAL_ZOOM_POSITION, &newpt, sizeof(newpt));
+  #endif
         }
-#elif defined(CAMERA_g12)
-// G12 - Can't find zoom_status, _MoveZoomLensWithPoint works anyway; but doesn't wait for zoom to finish
-        if (lens_get_zoom_point() != newpt)
-        {
-            _MoveZoomLensWithPoint((short*)&newpt);
-                while (zoom_busy) msleep(10);
-            _SetPropertyCase(PROPCASE_OPTICAL_ZOOM_POSITION, &newpt, sizeof(newpt));
-        }
-#else   // !CAMERA_g12
+#else   // !(CAMERA_g12 || CAMERA_sx30)
     _MoveZoomLensWithPoint((short*)&newpt);
 
-#if defined (CAMERA_s95)
+  #if defined (CAMERA_s95)
         // this will hang sometimes on s95 when zoom_busy gets stuck as a 1
         // we add a timeout as a work-around for this problem
@@ -170 +189 @@
                         break;
         }
-#else   // !CAMERA_s95
+  #else // !CAMERA_s95
         while (zoom_busy) ;
-#endif  // CAMERA_s95
+  #endif // !CAMERA_s95
 
     if (newpt==0) zoom_status=ZOOM_OPTICAL_MIN;
@@ -178 +197 @@
     else zoom_status=ZOOM_OPTICAL_MEDIUM;
     _SetPropertyCase(PROPCASE_OPTICAL_ZOOM_POSITION, &newpt, sizeof(newpt));
-#endif  // CAMERA_g12
+#endif  // !(CAMERA_g12 || CAMERA_sx30)
 }