Changeset 1570 for trunk/platform/generic/wrappers.c

Timestamp:

01/16/12 09:46:33 (16 months ago)

Author:

philmoz

Message:

Add support for cameras that allow subject distance overrides greater than the current max value of 65535.

File:

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

trunk/platform/generic/wrappers.c

@@ -182 +182 @@
                 zoom_status=ZOOM_OPTICAL_MAX;
 
-  #if defined(CAMERA_g12)|| defined(CAMERA_g10) 
+  #if defined(CAMERA_g12)|| defined(CAMERA_g10)
             _SetPropertyCase(PROPCASE_OPTICAL_ZOOM_POSITION, &newpt, sizeof(newpt));
   #endif
@@ -212 +212 @@
 void lens_set_focus_pos(long newpos)
 {
-        _MoveFocusLensToDistance((short*)&newpos);
-        //while (focus_busy);
-        while ((shooting_is_flash_ready()!=1) || (focus_busy));
+    if (newpos >= MAX_DIST) newpos = INFINITY_DIST; // Set to infinity value that will work on all cameras
+    _MoveFocusLensToDistance((short*)&newpos);
+        while ((shooting_is_flash_ready()!=1) || (focus_busy)) msleep(10);
         newpos = _GetFocusLensSubjectDistance();
         _SetPropertyCase(PROPCASE_SUBJECT_DIST1, &newpos, sizeof(newpos));