Changeset 1035 for trunk/core/raw.c

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

File:

• trunk/core/raw.c (modified) (4 diffs)

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