Changeset 1035 for trunk

Timestamp:

01/09/11 03:15:50 (2 years ago)

Author:

reyalP

Message:

scriptless badpixel.bin creation, from ultimA in ​http://chdk.setepontos.com/index.php?topic=5793.msg59376#msg59376

Location:

trunk

Files:

• CHDK/LANG/english.lng (modified) (2 diffs)
• CHDK/LANG/german.lng (modified) (1 diff)
• CHDK/LANG/hungarian.lng (modified) (1 diff)
• core/gui.c (modified) (3 diffs)
• core/gui_lang.c (modified) (1 diff)
• core/gui_lang.h (modified) (1 diff)
• core/raw.c (modified) (4 diffs)
• core/raw.h (modified) (2 diffs)

trunk/CHDK/LANG/english.lng

@@ -564 +564 @@
 424 "DNG format"
 425 "RAW buffer cached"
-426 "Cannot load CHDK/badpixel.bin\nPlease run \nCHDK/SCRIPTS/TEST/badpixel.lua"
+426 "Cannot load CHDK/badpixel.bin\nUse Create badpixel.bin in raw menu"
 427 "Show raw saving time"
 428 "Connect 4"
@@ -595 +595 @@
 457 "Always show"
 458 "   Pano overlap (%)"
+459 "Create badpixel.bin"
+460 "You need to be in REC-mode\nfor this operation."

trunk/CHDK/LANG/german.lng

@@ -577 +577 @@
 457 "Kontinuierlich anz."
 458 "   Pano-Überlappung (%)"
+459 "badpixel.bin erstellen"
+460 "REC-Modus erforderlich."

trunk/CHDK/LANG/hungarian.lng

@@ -583 +583 @@
 457 "Folyamatos megjel."
 458 "   Átfedés (%)"
+459 "badpixel.bin mentése"
+460 "Elöbb lépj REC-modba."

trunk/core/gui.c

@@ -282 +282 @@
 #if DNG_SUPPORT
 static void cb_change_dng(); 
+void gui_menuproc_badpixel_create(int arg);
 #endif
 #if defined (DNG_EXT_FROM)
@@ -822 +823 @@
     {0x5c,LANG_MENU_DNG_FORMAT,              MENUITEM_BOOL | MENUITEM_ARG_CALLBACK, &conf.dng_raw , (int)cb_change_dng },
     {0x5c,LANG_MENU_RAW_DNG_EXT,             MENUITEM_BOOL,      &conf.raw_dng_ext},
+    {0x2a,LANG_MENU_BADPIXEL_CREATE,         MENUITEM_PROC,      (int*)gui_menuproc_badpixel_create },
 #endif
     {0x5c,LANG_MENU_RAW_CACHED,              MENUITEM_BOOL,      &conf.raw_cache },
@@ -1008 +1010 @@
  conf_change_dng();
  if ((old==1) && (conf.dng_raw==0)) gui_mbox_init(LANG_ERROR, LANG_CANNOT_OPEN_BADPIXEL_FILE, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
+}
+
+void gui_menuproc_badpixel_create(int arg) {
+    create_badpixel_bin();
 }
 #endif

trunk/core/gui_lang.c

@@ -580 +580 @@
 "457 \"Always show\"\n"
 "458 \"   Pano overlap (%)\"\n"
+"459 \"Create badpixel.bin\"\n"
+"460 \"You need to be in REC-mode\\nfor this operation.\"\n"
 ;
 

trunk/core/gui_lang.h

@@ -569 +569 @@
 #define LANG_MENU_EDGE_SHOW        457
 #define LANG_MENU_EDGE_PANO_OVERLAP  458
+#define LANG_MENU_BADPIXEL_CREATE  459
+#define LANG_MSG_RECMODE_REQUIRED  460
 //-------------------------------------------------------------------
 
-#define GUI_LANG_ITEMS                  458
+#define GUI_LANG_ITEMS                  460
 
 //-------------------------------------------------------------------

trunk/core/raw.c

@@ -7 +7 @@
         #include "dng.h"
         #include "math.h"
+        #include "keyboard.h"
+    #include "action_stack.h"
+    #include "gui_draw.h"
+    #include "gui_mbox.h"
+    #include "gui_lang.h"
 #endif
 #ifdef OPT_CURVES
@@ -50 +55 @@
 //-------------------------------------------------------------------
 
-unsigned int get_bad_count_and_write_file(char *fn){
+unsigned int get_bad_count_and_write_file(const char *fn){
  int count=0;
  unsigned short c[2];
@@ -123 +128 @@
 
     // ! ! ! exclusively for special script which creates badpixel.bin ! ! !
+    // NOTE: get_bad_count_and_write_file() must be called from here and cannot be called
+    // outside of this function.
     if (conf.save_raw==255) conf.save_raw=get_bad_count_and_write_file("A/CHDK/bad_tmp.bin");
     //
@@ -442 +449 @@
  return binary_count;
 }
-#endif
+
+// -----------------------------------------------
+
+enum BadpixelFSM
+{
+    BADPIX_START,
+    BADPIX_S1,
+    BADPIX_S2
+};
+
+int badpixel_task_stack(long p)
+{
+    static unsigned int badpix_cnt1, badpix_cnt2;
+    static int raw_conf_bck;
+
+    switch(p)
+    {
+
+    case BADPIX_START:
+        action_pop();
+
+        console_clear();
+        console_add_line("Wait please... ");
+        console_add_line("This takes a few seconds,");
+        console_add_line("don't panic!");
+        
+        raw_conf_bck = conf.save_raw;
+        conf.save_raw = 255;
+        
+        shooting_set_tv96_direct(96, SET_LATER);
+        action_push(BADPIX_S1);
+        action_push(AS_SHOOT);
+        action_push_delay(3000);
+        break;
+    case BADPIX_S1:
+        action_pop();        
+
+        badpix_cnt1 = conf.save_raw;
+        shooting_set_tv96_direct(96, SET_LATER);
+
+        action_push(BADPIX_S2);
+        action_push(AS_SHOOT);
+        break;
+    case BADPIX_S2:
+        action_pop();
+
+        badpix_cnt2 = conf.save_raw;
+        conf.save_raw = raw_conf_bck;
+
+        console_clear();
+        if (badpix_cnt1 == badpix_cnt2)
+        {
+            char msg[32];
+            console_add_line("badpixel.bin created.");
+            sprintf(msg, "Bad pixel count: %d", badpix_cnt1);
+            console_add_line(msg);
+        }
+        else
+        {
+            console_add_line("badpixel.bin failed.");
+            console_add_line("Please try again.");
+        }
+        
+        action_push_delay(3000);
+        break;
+    default:
+        action_stack_standard(p);
+        break;
+    }
+   
+    return 1;
+}
+
+
+void create_badpixel_bin()
+{
+    if (!(mode_get() & MODE_REC))
+    {
+        gui_mbox_init(LANG_ERROR, LANG_MSG_RECMODE_REQUIRED, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
+        return;
+    }
+        
+    gui_set_mode(GUI_MODE_ALT);
+    action_stack_create(&badpixel_task_stack, BADPIX_START);
+}
+
+#endif

trunk/core/raw.h

@@ -25 +25 @@
 extern void load_bad_pixels_list(const char* filename);
 unsigned short get_raw_pixel(unsigned int x,unsigned  int y);
+
+#if DNG_SUPPORT
 void load_bad_pixels_list_b(char* filename);
 void unload_bad_pixels_list_b(void);
@@ -31 +33 @@
 int badpixel_list_loaded_b(void);
 char* get_raw_image_addr(void);
+void create_badpixel_bin();
+#endif
 
 //-------------------------------------------------------------------