Changeset 1797

Timestamp:

04/11/12 04:14:42 (14 months ago)

Author:

philmoz

Message:

Add option to disable the 'zoom assist' button on the SX30 and SX40.

Location:

trunk

Files:

• CHDK/LANG/english.lng (modified) (1 diff)
• core/conf.c (modified) (1 diff)
• core/gui.c (modified) (1 diff)
• core/gui_lang.h (modified) (1 diff)
• include/camera.h (modified) (1 diff)
• include/conf.h (modified) (1 diff)
• platform/sx30/kbd.c (modified) (1 diff)
• platform/sx30/platform_camera.h (modified) (1 diff)
• platform/sx40hs/kbd.c (modified) (1 diff)
• platform/sx40hs/platform_camera.h (modified) (1 diff)

trunk/CHDK/LANG/english.lng

@@ -672 +672 @@
 
 551 "Enable script start"
+
+552 "Disable Zoom Assist button"

trunk/core/conf.c

@@ -454 +454 @@
     CONF_INFO(286, conf.overexp_threshold,          CONF_DEF_VALUE,     i:5, NULL),
     CONF_INFO(287, conf.overexp_ev_enum,            CONF_DEF_VALUE,     i:3, conf_change_autoiso),
+
+#if defined(CAM_ZOOM_ASSIST_BUTTON_CONTROL)
+    CONF_INFO(288, conf.zoom_assist_button_disable, CONF_DEF_VALUE,     i:0, NULL),
+#endif
     };
 #define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0]))

trunk/core/gui.c

@@ -494 +494 @@
 #if CAM_ADJUSTABLE_ALT_BUTTON
     MENU_ITEM(0x22,LANG_MENU_MISC_ALT_BUTTON,               MENUITEM_ENUM,                  gui_alt_mode_button_enum,           0 ),
+#endif
+#if defined(CAM_ZOOM_ASSIST_BUTTON_CONTROL)
+    MENU_ITEM   (0x5c,LANG_MENU_MISC_ZOOM_ASSIST,           MENUITEM_BOOL,                  &conf.zoom_assist_button_disable,   0 ),
 #endif
     MENU_ITEM(0x5d,LANG_MENU_MISC_DISABLE_LCD_OFF,    MENUITEM_ENUM,    gui_alt_power_enum, 0 ),

trunk/core/gui_lang.h

@@ -677 +677 @@
 #define LANG_MENU_SCRIPT_START_ENABLE                   551
 
-#define GUI_LANG_ITEMS                          551
+#define LANG_MENU_MISC_ZOOM_ASSIST              552
+
+#define GUI_LANG_ITEMS                          552
 
 //-------------------------------------------------------------------

trunk/include/camera.h

@@ -197 +197 @@
         #undef  DRAW_ON_ACTIVE_BITMAP_BUFFER_ONLY       // Draw pixels on active bitmap buffer only. Requires active_bitmap_buffer location in stubs_min.S or stubs_entry.S.
         
+    #undef  CAM_ZOOM_ASSIST_BUTTON_CONTROL      // Activate menu option to enable/disable the zoom assist button on the SX30/SX40
+                                                // For other cameras, requires additional support code in kbd.c (see the SX30 or SX40 version)
+
 //----------------------------------------------------------
 // Overridden values for each camera

trunk/include/conf.h

@@ -327 +327 @@
 
         // gen 2 USB remote
-        int remote_switch_type ;
-        int remote_control_mode ;
+        int remote_switch_type;
+        int remote_control_mode;
 
     int ext_video_time;
     
-    int remote_enable_scripts ;  // usb remote activates scripts in <ALT> mode
+    int remote_enable_scripts;  // usb remote activates scripts in <ALT> mode
     
+#if defined(CAM_ZOOM_ASSIST_BUTTON_CONTROL)
+    int zoom_assist_button_disable;    // used to disable the zoom assist button on SX30 & SX40 for people who keep accidentaly pressing it
+#endif
+
 #ifdef CAM_HAS_GPS
     int gps_record;

trunk/platform/sx30/kbd.c

@@ -174 +174 @@
         }
 
+    // Disable Zoom Assist button
+    if (conf.zoom_assist_button_disable)
+        physw_status[0] |= 0x00010000;
+
         //_kbd_read_keys_r2(physw_status);
 

trunk/platform/sx30/platform_camera.h

@@ -127 +127 @@
     #define CAMERA_MAX_DIST                 9090910 // Override max subject distance
 
+    #define CAM_ZOOM_ASSIST_BUTTON_CONTROL      1       // Activate the menu option to allow disabling the zoom assist button
+
 //----------------------------------------------------------
 

trunk/platform/sx40hs/kbd.c

@@ -174 +174 @@
         }
 
+    // Disable Zoom Assist button
+    if (conf.zoom_assist_button_disable)
+        physw_status[0] |= 0x00010000;
+
         //_kbd_read_keys_r2(physw_status);
 

trunk/platform/sx40hs/platform_camera.h

@@ -133 +133 @@
     #undef  CAMERA_MAX_DIST
     #define CAMERA_MAX_DIST                     9523810 // Override max subject distance
+
+    #define CAM_ZOOM_ASSIST_BUTTON_CONTROL      1       // Activate the menu option to allow disabling the zoom assist button
+
 //----------------------------------------------------------