Changeset 852

Timestamp:

12/03/09 06:32:28 (3 years ago)

Author:

reyalp

Message:

• save propcase/param page. From barberofcivil in ​http://chdk.setepontos.com/index.php/topic,650.msg43544.html#msg43544
• save misc debug vals
• misc cleanup: comment and some unused vars

Location:

trunk

Files:

• core/conf.c (modified) (2 diffs)
• core/gui.c (modified) (5 diffs)
• core/main.c (modified) (1 diff)
• include/conf.h (modified) (2 diffs)

trunk/core/conf.c

@@ -44 +44 @@
 int state_expos_over;
 int auto_started;
-
-int state_debug1;
-int debug_propcase_show;
-int debug_propcase_page;
-int debug_vals_show;
-int debug_pardata_show;
 
 // reyalp: putting these in conf, since the conf values are lookups for them
@@ -401 +395 @@
     CONF_INFO(237, conf.fast_image_quality,     CONF_DEF_VALUE, i:3, NULL),
         CONF_INFO(238, conf.debug_lua_restart_on_error,     CONF_DEF_VALUE, i:0, NULL),
+        CONF_INFO(239, conf.debug_propcase_page,     CONF_DEF_VALUE, i:0, NULL),
+        CONF_INFO(240, conf.debug_misc_vals_show,     CONF_DEF_VALUE, i:0, NULL),
     };
 #define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0]))

trunk/core/gui.c

@@ -378 +378 @@
 static CMenuItem debug_submenu_items[] = {
     {0x5c,LANG_MENU_DEBUG_DISPLAY,           MENUITEM_ENUM,          (int*)gui_debug_display_enum },
-    {0x2a,LANG_MENU_DEBUG_PROPCASE_PAGE,     MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,   &debug_propcase_page, MENU_MINMAX(0, 128) },
+    {0x2a,LANG_MENU_DEBUG_PROPCASE_PAGE,     MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,   &conf.debug_propcase_page, MENU_MINMAX(0, 128) },
     {0x2a,LANG_MENU_DEBUG_TASKLIST_START,    MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,   &debug_tasklist_start, MENU_MINMAX(0, 63) },
-    {0x5c,LANG_MENU_DEBUG_SHOW_MISC_VALS,    MENUITEM_BOOL,          &debug_vals_show },
+    {0x5c,LANG_MENU_DEBUG_SHOW_MISC_VALS,    MENUITEM_BOOL,          &conf.debug_misc_vals_show },
     {0x2a,LANG_MENU_DEBUG_MEMORY_BROWSER,    MENUITEM_PROC,          (int*)gui_draw_debug },
     {0x2a,LANG_MENU_DEBUG_BENCHMARK,         MENUITEM_PROC,          (int*)gui_draw_bench },
@@ -1962 +1962 @@
             }
             else if (conf.debug_display == DEBUG_DISPLAY_PROPS || conf.debug_display == DEBUG_DISPLAY_PARAMS) {
-                debug_propcase_page += debug_display_direction*1;
-                if(debug_propcase_page > 128 || debug_propcase_page < 0) 
-                    debug_propcase_page = 0;
+                conf.debug_propcase_page += debug_display_direction*1;
+                if(conf.debug_propcase_page > 128 || conf.debug_propcase_page < 0) 
+                    conf.debug_propcase_page = 0;
             }
         break;
@@ -2579 +2579 @@
 void gui_draw_debug_vals_osd() {
 #ifdef OPT_DEBUGGING
-    if (debug_vals_show) {
+    if (conf.debug_misc_vals_show) {
         //        long v=get_file_counter();
         //      sprintf(osd_buf, "1:%03d-%04d  ", (v>>18)&0x3FF, (v>>4)&0x3FFF);
@@ -2624 +2624 @@
             for (i=0;i<10;i++){
                 r = 0;
-                p = debug_propcase_page*10+i;
+                p = conf.debug_propcase_page*10+i;
                 get_property_case(p, &r, 4);
                 sprintf(sbuf, "%3d: %d              ", p, r);
@@ -2639 +2639 @@
             for (i=0;i<10;i++){
                 r = 0;
-                p = debug_propcase_page*10+i;
+                p = conf.debug_propcase_page*10+i;
                 if (p>=get_flash_params_count()) {
                     sprintf(sbuf, "%3d: This parameter does not exists", p);

trunk/core/main.c

@@ -50 +50 @@
             write(fd, (void*)0, 0x1900);
 #endif
+// TODO actual memory size is larger than 32 MB on many cameras!
             write(fd, (void*)0x1900, 32*1024*1024-0x1900);
             close(fd);

trunk/include/conf.h

@@ -237 +237 @@
     int debug_shortcut_action;  // 0=none, 1=dump, 2=page display
     int debug_display;          // 0=none, 1=props, 2=flash param, 3=tasks
+    int debug_propcase_page;     // save propcase page
         int debug_lua_restart_on_error; // 0=no, 1=yes
+        int debug_misc_vals_show; // 0=no, 1=yes
 
     int script_startup;                 // remote autostart
@@ -301 +303 @@
 extern int state_expos_over;
 
-extern int state_debug1;
-extern int debug_propcase_show;
-extern int debug_propcase_page;
-extern int debug_vals_show;
-extern int debug_pardata_show;
 extern void script_autostart();                         // remote autostart
 extern void conf_save();