Changeset 986

Timestamp:

11/28/10 00:07:15 (2 years ago)

Author:

reyalp

Message:

add "always" option to "disable lcd off", prevents lcd off when not in alt mode. From atalwar in ​http://chdk.setepontos.com/index.php?topic=5854.0 with modifications.

Location:

trunk

Files:

• core/conf.c (modified) (2 diffs)
• core/gui.c (modified) (4 diffs)
• core/kbd.c (modified) (2 diffs)
• include/conf.h (modified) (2 diffs)

trunk/core/conf.c

@@ -211 +211 @@
     CONF_INFO( 65, conf.font_cp,                CONF_DEF_VALUE, i:FONT_CP_WIN_1251, conf_change_font_cp),
     CONF_INFO( 66, conf.menu_rbf_file,          CONF_DEF_PTR,   ptr:"", conf_change_menu_rbf_file),
-    CONF_INFO( 67, conf.alt_prevent_shutdown,   CONF_DEF_VALUE, i:ALT_PREVENT_SHUTDOWN_ALT, NULL),
+    CONF_INFO( 67, conf.alt_prevent_shutdown,   CONF_DEF_VALUE, i:ALT_PREVENT_SHUTDOWN_ALT, conf_update_prevent_shutdown),
     CONF_INFO( 68, conf.show_grid_lines,        CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO( 69, conf.grid_lines_file,        CONF_DEF_PTR,   ptr:"", conf_change_grid_file),
@@ -468 +468 @@
 }
 
+/*
+update the prevent display off/prevent shutdown based on current state
+doesn't really belong in conf but not clear where else it should go
+*/
+void conf_update_prevent_shutdown(void) {
+        if(conf.alt_prevent_shutdown == ALT_PREVENT_SHUTDOWN_ALWAYS 
+                || (conf.alt_prevent_shutdown == ALT_PREVENT_SHUTDOWN_ALT && gui_get_mode() != GUI_MODE_NONE)
+                || (conf.alt_prevent_shutdown == ALT_PREVENT_SHUTDOWN_ALT_SCRIPT && state_kbd_script_run)) {
+        disable_shutdown();
+        } else {
+        enable_shutdown();
+        }
+}
+
 //-------------------------------------------------------------------
 static void conf_init_defaults() {

trunk/core/gui.c

@@ -1484 +1484 @@
 //-------------------------------------------------------------------
 const char* gui_alt_power_enum(int change, int arg) {
-    static const char* modes[]={ "No", "Alt", "Script" };
+    static const char* modes[]={ "Never", "Alt", "Script","Always" };
 
     conf.alt_prevent_shutdown+=change;
@@ -1491 +1491 @@
     else if (conf.alt_prevent_shutdown>=(sizeof(modes)/sizeof(modes[0])))
         conf.alt_prevent_shutdown=0;
+        
+        conf_update_prevent_shutdown();
 
     return modes[conf.alt_prevent_shutdown];
@@ -2504 +2506 @@
     conf_store_old_settings();
 #endif
-    if ((conf.alt_prevent_shutdown == ALT_PREVENT_SHUTDOWN_ALT && !state_kbd_script_run) 
-        || conf.alt_prevent_shutdown == ALT_PREVENT_SHUTDOWN_ALT_SCRIPT) {
-        disable_shutdown();
-    }
     gui_mode = GUI_MODE_ALT;
+
+        conf_update_prevent_shutdown();
+
     vid_turn_off_updates();
 
@@ -2533 +2534 @@
         rbf_load_from_8x16(current_font);
     rbf_set_codepage(FONT_CP_WIN);
-    enable_shutdown();
     vid_turn_on_updates();
     gui_mode = GUI_MODE_NONE;
+
+        conf_update_prevent_shutdown();
 }
 //------------------------------------------------------------------- 

trunk/core/kbd.c

@@ -356 +356 @@
     state_kbd_script_run = 1;
 
-    if (conf.alt_prevent_shutdown != ALT_PREVENT_SHUTDOWN_ALT_SCRIPT) {
-        enable_shutdown();
-    }
+    conf_update_prevent_shutdown();
+
 }
 
@@ -372 +371 @@
         md_close_motion_detector();
         shot_histogram_set(0);
-    if ((conf.alt_prevent_shutdown != ALT_PREVENT_SHUTDOWN_NO) && (gui_get_mode()==GUI_MODE_ALT)) {
-        disable_shutdown();
-    }
     kbd_key_release_all();
     state_kbd_script_run = 0;
+
+    conf_update_prevent_shutdown();
+
     vid_bitmap_refresh();
 }

trunk/include/conf.h

@@ -288 +288 @@
 #define ALT_PREVENT_SHUTDOWN_ALT        1
 #define ALT_PREVENT_SHUTDOWN_ALT_SCRIPT 2
+#define ALT_PREVENT_SHUTDOWN_ALWAYS     3
 
 #define SHOOTING_PROGRESS_NONE          0
@@ -312 +313 @@
 extern int shutter_int;
 extern void conf_change_dng(void);
+extern void conf_update_prevent_shutdown(void);
 
 // reyalp: putting these in conf, since the conf values are lookups for them