Changeset 1570 for trunk

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.

Location:

trunk

Files:

• core/gui.c (modified) (6 diffs)
• core/gui_osd.c (modified) (1 diff)
• core/luascript.c (modified) (1 diff)
• include/camera.h (modified) (1 diff)
• include/platform.h (modified) (1 diff)
• platform/g12/platform_camera.h (modified) (1 diff)
• platform/generic/shooting.c (modified) (4 diffs)
• platform/generic/wrappers.c (modified) (2 diffs)
• platform/ixus310_elph500hs/platform_camera.h (modified) (1 diff)
• platform/sx30/platform_camera.h (modified) (1 diff)
• platform/sx40hs/platform_camera.h (modified) (1 diff)

trunk/core/gui.c

@@ -183 +183 @@
 static const char* gui_tv_override_value_enum(int change, int arg);
 static const char* gui_tv_enum_type_enum(int change, int arg);
-static const char* gui_subj_dist_override_value_enum(int change, int arg);
-static const char* gui_subj_dist_override_koef_enum(int change, int arg);
+const char* gui_subj_dist_override_value_enum(int change, int arg);
+const char* gui_subj_dist_override_koef_enum(int change, int arg);
 /*
 static const char* gui_tv_exposure_order_enum(int change, int arg);
@@ -232 +232 @@
 const char* gui_USB_switch_types[] = { "None","OnePush", "TwoPush", "CA-1", "P Width", "P Count" };
 const char* gui_USB_control_modes[] = { "None", "Normal", "Quick", "Burst", "Bracket","Zoom", "Video","gWIRE","Script" }; 
-
+  
 
 static CMenuItem remote_submenu_items[] = {
@@ -1214 +1214 @@
 
 const char* gui_subj_dist_override_value_enum(int change, int arg) {
-        static const int koef[] = {0, 1,10,100,1000};
-    static char buf[8];
-    conf.subj_dist_override_value+=(change*koef[conf.subj_dist_override_koef]);
-    if (conf.subj_dist_override_value<0)
-        conf.subj_dist_override_value=MAX_DIST;
-    else if (conf.subj_dist_override_value>MAX_DIST)
-        conf.subj_dist_override_value=0;
-    sprintf(buf, "%d", (int)conf.subj_dist_override_value);
+        int koef = shooting_get_subject_distance_override_koef();
+    static char buf[9];
+    if (koef == -1)
+    {
+        // If 'Infinity' selected in the 'koef' setting then set SD to the infinity value
+        // technically the same as MAX_DIST when it's sent to the firmware function 
+        // in the camera; but used here to alter the CHDK OSD display.
+        conf.subj_dist_override_value = INFINITY_DIST;
+    }
+    else
+    {
+        // Increment / decrement the SD value, wrapping around from MIN_DIST to MAX_DIST
+        conf.subj_dist_override_value += (change*koef);
+        if (conf.subj_dist_override_value < MIN_DIST)
+            conf.subj_dist_override_value = MAX_DIST;
+        else if (conf.subj_dist_override_value > MAX_DIST)
+            conf.subj_dist_override_value = MIN_DIST;
+    }
+    if (conf.subj_dist_override_value == INFINITY_DIST)
+        strcpy(buf,"Inf.");
+    else
+        sprintf(buf, "%d", (int)conf.subj_dist_override_value);
     return buf;
 }
@@ -1227 +1241 @@
 
 const char* gui_subj_dist_override_koef_enum(int change, int arg) {
-        return gui_change_simple_enum(&conf.subj_dist_override_koef,change,gui_override_koef_modes,sizeof(gui_override_koef_modes)/sizeof(gui_override_koef_modes[0]));
+    // Define the adjustment factor values for the subject distance override
+#if MAX_DIST > 1000000      // Superzoom - e.g. SX30, SX40
+    static const char* modes[] = { "Off", "1", "10", "100", "1000", "10K", "100K", "1M", "Inf." };
+#elif MAX_DIST > 100000     // G12, IXUS310
+    static const char* modes[] = { "Off", "1", "10", "100", "1000", "10K", "100K", "Inf." };
+#else                       // Original values (MAX_DIST = 65535)
+    static const char* modes[] = { "Off", "1", "10", "100", "1000" };
+#endif
+        const char *rv = gui_change_simple_enum(&conf.subj_dist_override_koef,change,modes,sizeof(modes)/sizeof(modes[0]));
+    // If we've selected 'Infinity' focus then set the SD override value
+    // Otherwise if we had previously selected 'Infinity' then reset back to MAX_DIST
+    if (shooting_get_subject_distance_override_koef() == -1)
+        conf.subj_dist_override_value = INFINITY_DIST;
+    else if (conf.subj_dist_override_value == INFINITY_DIST)
+        conf.subj_dist_override_value = MAX_DIST;
+    return rv;
 }
 
@@ -1665 +1694 @@
     gui_subj_dist_override_koef_enum(direction,0);
 #if !CAM_HAS_MANUAL_FOCUS
-    if (conf.subj_dist_override_koef==0) conf.subj_dist_override_koef=1;
+    if (conf.subj_dist_override_koef==0) gui_subj_dist_override_koef_enum(direction,0);
 #endif
     shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
@@ -1705 +1734 @@
             shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
 #else
-            if (conf.subj_dist_override_koef==4)
-                gui_subj_dist_override_koef_enum(-3,0);
-            else
-                gui_subj_dist_override_koef_enum(1,0);
+            gui_subj_dist_override_koef_enum(1,0);
 #endif
         }

trunk/core/gui_osd.c

@@ -601 +601 @@
             gui_print_osd_state_string_chr("AUTOISO:", ((conf.autoiso_enable==1)?"ON":"OFF"));
     if ((conf.subj_dist_override_value && conf.subj_dist_override_koef && shooting_can_focus() && !(conf.override_disable==1)) || ((gui_get_mode()==GUI_MODE_ALT) && shooting_get_common_focus_mode())  || gui_mode==GUI_MODE_OSD)   {
-        gui_print_osd_state_string_int("SD:",shooting_get_subject_distance_override_value());
+        extern const char* gui_subj_dist_override_value_enum(int change, int arg);
+        extern const char* gui_subj_dist_override_koef_enum(int change, int arg);
+        gui_print_osd_state_string_chr("SD:",gui_subj_dist_override_value_enum(0,0));
         if (gui_mode==GUI_MODE_ALT)  
-                  gui_print_osd_state_string_int("FACTOR:",shooting_get_subject_distance_override_koef());      
+                  gui_print_osd_state_string_chr("FACTOR:",gui_subj_dist_override_koef_enum(0,0));
       }
     if ((conf.iso_override_value && conf.iso_override_koef && !(conf.override_disable==1))       || gui_mode==GUI_MODE_OSD)

trunk/core/luascript.c

@@ -581 +581 @@
     else shooting_set_focus(to, SET_LATER);
 #else
-    if (mode_video) shooting_set_focus(to, SET_NOW);
+    if (shooting_get_common_focus_mode() || mode_video) shooting_set_focus(to, SET_NOW);
     else shooting_set_focus(to, SET_LATER);    
 #endif    

trunk/include/camera.h

@@ -189 +189 @@
 
 #define CAM_USB_EVENTID         0x902           // Levent ID for USB control. Changed to 0x202 in DryOS R49 so needs to be overridable.
+
+#undef CAM_NEED_SET_ZOOM_DELAY                  // Define to add a delay after setting the zoom position before resetting the focus position in shooting_set_zoom
+
+#define CAMERA_MIN_DIST         0               // Define min distance that can be set in _MoveFocusLensToDistance (allow override - e.g. G12 min dist = 1)
+#define CAMERA_MAX_DIST         65535           // Define max distance that can be set in _MoveFocusLensToDistance (allow override for superzooms - SX30/SX40)
 
 //----------------------------------------------------------

trunk/include/platform.h

@@ -33 +33 @@
 #endif
 
-#define MAX_DIST 65535
-#define MAX_DIST_HYPER_FOCAL 999999
+#define MIN_DIST                CAMERA_MIN_DIST     // Defined in camera.h (can be overridden in platform_camera.h)
+#define MAX_DIST                CAMERA_MAX_DIST     // Defined in camera.h (can be overridden in platform_camera.h)
+#define INFINITY_DIST           0xFFFFFFFF          // Value to send to firmware to select 'infinity' focus
+#define MAX_DIST_HYPER_FOCAL    999999
 
 //********************

trunk/platform/g12/platform_camera.h

@@ -125 +125 @@
 //      #define REMOTE_SYNC_STATUS_LED  0xC0xxyyyy              // specifies an LED that turns on while camera waits for USB remote to sync
 
+    #undef CAMERA_MIN_DIST
+    #define CAMERA_MIN_DIST                 68      // Override min subject distance
+    #undef CAMERA_MAX_DIST
+    #define CAMERA_MAX_DIST                 258065  // Override max subject distance
+
 //----------------------------------------------------------
 

trunk/platform/generic/shooting.c

@@ -764 +764 @@
     return 1;
  #endif
-  return (shooting_get_focus_mode() || MODE_IS_VIDEO(m));
+  return (shooting_get_common_focus_mode() || MODE_IS_VIDEO(m));
 #elif !CAM_CAN_SD_OVERRIDE
   return MODE_IS_VIDEO(m);
@@ -938 +938 @@
     dist = shooting_get_focus();
     lens_set_zoom_point(v);
+#if defined(CAM_NEED_SET_ZOOM_DELAY)
+    msleep(CAM_NEED_SET_ZOOM_DELAY);
+#endif
     shooting_set_focus(dist, SET_NOW);
   }
@@ -964 +967 @@
         if ((is_now) && shooting_can_focus()) {
           if (conf.dof_dist_from_lens) s+=shooting_get_lens_to_focal_plane_width();
-          if ((!conf.dof_subj_dist_as_near_limit) && (s>0)) lens_set_focus_pos((s<MAX_DIST)?s:MAX_DIST);
+          if (!conf.dof_subj_dist_as_near_limit) lens_set_focus_pos(s);
           else {
         int near=shooting_get_near_limit_f(s,shooting_get_min_real_aperture(),get_focal_length(lens_get_zoom_point()));
-        if (near>0) lens_set_focus_pos((near<MAX_DIST)?near:MAX_DIST);
+        if (near>0) lens_set_focus_pos(near);
           }
         }
@@ -1084 +1087 @@
 int shooting_get_subject_distance_override_koef()
 {
-  static const short koef[] = {0, 1,10,100,1000};
+    // Define the adjustment factor values for the subject distance override
+#if MAX_DIST > 1000000      // Superzoom - e.g. SX30, SX40
+  static const int koef[] = {0,1,10,100,1000,10000,100000,1000000,-1};
+#elif MAX_DIST > 100000     // G12, IXUS310
+  static const int koef[] = {0,1,10,100,1000,10000,100000,-1};
+#else                       // Original values (MAX_DIST = 65535)
+  static const int koef[] = {0,1,10,100,1000};
+#endif
   return koef[(conf.subj_dist_override_koef)];
-
 }
 

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));

trunk/platform/ixus310_elph500hs/platform_camera.h

@@ -127 +127 @@
 
 //      #define REMOTE_SYNC_STATUS_LED  0xC0xxyyyy              // specifies an LED that turns on while camera waits for USB remote to sync
-        
+
+    #undef CAMERA_MIN_DIST
+    #define CAMERA_MIN_DIST                 71      // Override min subject distance
+    #undef CAMERA_MAX_DIST
+    #define CAMERA_MAX_DIST                 125392  // Override max subject distance
+
 //----------------------------------------------------------
 

trunk/platform/sx30/platform_camera.h

@@ -124 +124 @@
 
 //      #define REMOTE_SYNC_STATUS_LED  0xC0xxyyyy              // specifies an LED that turns on while camera waits for USB remote to sync
-        
+
+    #define CAM_NEED_SET_ZOOM_DELAY         300     // SX30 needs a short delay after setting the zoom before resetting focus in shooting_set_zoom()
+
+    #undef CAMERA_MIN_DIST
+    #define CAMERA_MIN_DIST                 95      // Override min subject distance
+    #undef CAMERA_MAX_DIST
+    #define CAMERA_MAX_DIST                 9090910 // Override max subject distance
+
 //----------------------------------------------------------

trunk/platform/sx40hs/platform_camera.h

@@ -133 +133 @@
  
 //      #define REMOTE_SYNC_STATUS_LED  0xC0xxyyyy              // specifies an LED that turns on while camera waits for USB remote to sync
- 
+
+    #undef CAMERA_MIN_DIST
+    #define CAMERA_MIN_DIST                 95      // Override min subject distance
+    #undef CAMERA_MAX_DIST
+    #define CAMERA_MAX_DIST                 9523810 // Override max subject distance
+    
 //----------------------------------------------------------