Changeset 1432 for trunk

Timestamp:

11/26/11 21:56:33 (18 months ago)

Author:

philmoz

Message:

Add ability to save ROM crash dump to SD card from CHDK menu. Allows log to be captured on cameras without native calls enabled which can't run the romlog.lua script.
​http://chdk.setepontos.com/index.php?topic=7133.0

Location:

trunk

Files:

• CHDK/LANG/english.lng (modified) (1 diff)
• core/gui.c (modified) (9 diffs)
• core/gui_lang.h (modified) (1 diff)

trunk/CHDK/LANG/english.lng

@@ -577 +577 @@
 465 "USB Remote"
 466 "Show USB Remote Status"
+
+467 "Save ROM crash log"
+468 "ERROR: SystemEventInit and System.Create failed"
+469 "ROM crash log could not be saved"
+470 "ROM crash log saved to ROMLOG.LOG"

trunk/core/gui.c

@@ -29 +29 @@
 #ifdef OPT_DEBUGGING
 #include "gui_debug.h"
+#include "gui_bench.h"
 #endif
 #include "gui_fselect.h"
@@ -40 +41 @@
 #ifdef OPT_CALENDAR
         #include "gui_calendar.h"
-#endif
-#ifdef OPT_DEBUGGING
-#include "gui_bench.h"
 #endif
 #include "gui_grid.h"
@@ -169 +167 @@
         static void gui_draw_debug(int arg);
         static void gui_draw_bench(int arg);
+    void gui_compare_props(int arg);
+    static void gui_menuproc_break_card(int arg);
+        static void gui_debug_shortcut(void);
+        static void save_romlog(int arg);
 #endif
 static void gui_draw_fselect(int arg);
@@ -186 +188 @@
 static void gui_draw_load_lang(int arg);
 static void gui_menuproc_mkbootdisk(int arg);
-#ifdef OPT_DEBUGGING
-void gui_compare_props(int arg);
-#endif
 #ifndef OPTIONS_AUTOSAVE
 static void gui_menuproc_save(int arg);
@@ -195 +194 @@
 static void gui_grid_lines_load(int arg);
 static void gui_raw_develop(int arg);
-#ifdef OPT_DEBUGGING
-static void gui_menuproc_break_card(int arg);
-#endif
 static void gui_menuproc_swap_partitions(int arg);
 static void gui_menuproc_reset_files(int arg);
@@ -233 +229 @@
         static const char* gui_conf_curve_enum(int change, int arg);
 #endif
-#ifdef OPT_DEBUGGING
-        static void gui_debug_shortcut(void);
-#endif
 
 #ifdef OPT_EDGEOVERLAY
@@ -391 +384 @@
 #endif
 #if CAM_MULTIPART
-    MENU_ITEM(0x33,LANG_MENU_DEBUG_CREATE_MULTIPART , MENUITEM_PROC,            gui_menuproc_break_card, 0 ),
-#endif
+    MENU_ITEM(0x33,LANG_MENU_DEBUG_CREATE_MULTIPART , MENUITEM_PROC,          gui_menuproc_break_card, 0 ),
+#endif
+    MENU_ITEM(0x2a,LANG_SAVE_ROMLOG,                  MENUITEM_PROC,          save_romlog, 0 ),
     MENU_ITEM(0x51,LANG_MENU_BACK,                    MENUITEM_UP, 0, 0 ),
     {0}
@@ -2650 +2644 @@
     gui_debug_init((void*)conf.mem_view_addr_init);
 }
-#endif
-//-------------------------------------------------------------------
-#ifdef OPT_DEBUGGING
+
+//-------------------------------------------------------------------
 void gui_draw_bench(int arg) {
     gui_set_mode(GUI_MODE_BENCH);
@@ -2932 +2925 @@
 }
 
-#endif
+// Save camera romlog to A/ROMLOG.LOG file
+void save_romlog(int arg)
+{
+    extern unsigned _ExecuteEventProcedure(const char *name,...);
+
+    struct stat st;
+    if (stat("A/ROMLOG.LOG",&st)    == 0) remove("A/ROMLOG.LOG");
+    if (stat("A/RomLogErr.txt",&st) == 0) remove("A/RomLogErr.txt");
+
+    unsigned args[3];
+    args[0] = (unsigned)"SystemEventInit";
+    if (call_func_ptr(_ExecuteEventProcedure,args,1) == -1)
+    {
+        args[0] = (unsigned)"System.Create";
+        if (call_func_ptr(_ExecuteEventProcedure,args,1) == -1)
+        {
+            gui_mbox_init(LANG_ERROR, LANG_SAVE_ROMLOG_INIT_ERROR, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
+            return;
+        }
+    }
+
+    args[0] = (unsigned)"GetLogToFile";
+    args[1] = (unsigned)"A/ROMLOG.LOG";
+    args[2] = 1;
+    if (call_func_ptr(_ExecuteEventProcedure,args,3) == -1)
+    {
+        gui_mbox_init(LANG_ERROR, LANG_SAVE_ROMLOG_FAIL, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
+    }
+    else
+    {
+        gui_mbox_init(LANG_INFORMATION, LANG_SAVE_ROMLOG_OK, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
+    }
+}
+
+#endif

trunk/core/gui_lang.h

@@ -581 +581 @@
 #define LANG_OSD_LAYOUT_EDITOR_USB_INFO         465
 #define LANG_MENU_USB_SHOW_INFO                 466
+
+// Save ROM crash log messages
+#define LANG_SAVE_ROMLOG            467
+#define LANG_SAVE_ROMLOG_INIT_ERROR 468
+#define LANG_SAVE_ROMLOG_FAIL       469
+#define LANG_SAVE_ROMLOG_OK         470
+
 //-------------------------------------------------------------------
 
-#define GUI_LANG_ITEMS                  466
+#define GUI_LANG_ITEMS                  470
 
 //-------------------------------------------------------------------