Changeset 1105 for trunk

Timestamp:

03/26/11 23:03:11 (2 years ago)

Author:

reyalP

Message:

fix click command for sx30, like chdkde 576 but more generic

Location:

trunk

Files:

• core/action_stack.c (modified) (3 diffs)
• include/camera.h (modified) (4 diffs)

trunk/core/action_stack.c

@@ -122 +122 @@
 {
     // WARNING stack program flow is reversed
-    action_push_delay(20);
+    action_push_delay(CAM_KEY_PRESS_DELAY);
     action_push(key);
     action_push(AS_PRESS);
@@ -131 +131 @@
 {
     // WARNING stack program flow is reversed
-    action_push_delay(20);
+    action_push_delay(CAM_KEY_RELEASE_DELAY);
     action_push(key);
     action_push(AS_RELEASE);
@@ -140 +140 @@
 // WARNING stack program flow is reversed
     action_push_release(key);
+#if defined(CAM_KEY_CLICK_DELAY) // camera need delay for click
+    action_push_delay(CAM_KEY_CLICK_DELAY);
+#endif
     action_push_press(key);
 }

trunk/include/camera.h

@@ -100 +100 @@
 
     #undef CAM_DATE_FOLDER_NAMING                   // set if camera uses date based folder naming (Option "Create Folder" in Canon Menu) and get_target_dir_name is implemented
+
+    #undef CAM_KEY_CLICK_DELAY                      // additional delay between press and release for scripted click
+    #define CAM_KEY_PRESS_DELAY         20          // delay after a press - TODO can we combine this with above ?
+    #define CAM_KEY_RELEASE_DELAY       20          // delay after a release - TODO do we really need to wait after release ?
 
 //----------------------------------------------------------
@@ -3219 +3223 @@
         #define CAM_BITMAP_PALETTE              7
 
-   //zebra letterbox for saving memory
-   #undef ZEBRA_HMARGIN0
-   #define ZEBRA_HMARGIN0  30 //this 30 rows are not used by the display buffer is 720x240 effective, no 960x270, i.e. (270-240) reduction in widht possible but not done (more difficult to manage it and slower).
+        //zebra letterbox for saving memory
+        #undef ZEBRA_HMARGIN0
+        #define ZEBRA_HMARGIN0  30 //this 30 rows are not used by the display buffer is 720x240 effective, no 960x270, i.e. (270-240) reduction in widht possible but not done (more difficult to manage it and slower).
   
-   #undef EDGE_HMARGIN
-   #define EDGE_HMARGIN 2
-   #define CAM_CHDK_PTP 1
+        #undef EDGE_HMARGIN
+        #define EDGE_HMARGIN 2
+        #define CAM_CHDK_PTP 1
         
         #define CAM_DATE_FOLDER_NAMING  1
@@ -3233 +3237 @@
         #define EXMEM_BUFFER_SIZE (1024*1024*2)                                 // desired amount of exmem memory to allocate
 
+    #define CAM_KEY_CLICK_DELAY 150 // SX30 appears to need extra delay for clicks
 //----------------------------------------------------------
 #elif defined (CAMERA_g12)
@@ -3329 +3334 @@
         #define CAM_ZEBRA_ASPECT_ADJUST 1
 
-   //zebra letterbox for saving memory
-   #undef ZEBRA_HMARGIN0
-   #define ZEBRA_HMARGIN0  30 //this 30 rows are not used by the display buffer is 720x240 effective, no 960x270, i.e. (270-240) reduction in widht possible but not done (more difficult to manage it and slower).
+        //zebra letterbox for saving memory
+        #undef ZEBRA_HMARGIN0
+        #define ZEBRA_HMARGIN0  30 //this 30 rows are not used by the display buffer is 720x240 effective, no 960x270, i.e. (270-240) reduction in widht possible but not done (more difficult to manage it and slower).
         
         #define CAM_DATE_FOLDER_NAMING  1