Changeset 1039 for trunk

Timestamp:

01/10/11 02:06:43 (2 years ago)

Author:

reyalP

Message:

quick fix for scriptless badpixel.bin creation.
1) count badpixels for both shots
2) rename bad_tmp.bin on success

File:

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

trunk/core/raw.c

@@ -23 +23 @@
 #define RAW_TARGET_FILENAME     "%s%04d%s"
 #define RAW_BRACKETING_FILENAME "%s%04d_%02d%s" 
+
+#define PATH_BADPIXEL_BIN "A/CHDK/badpixel.bin"
+#define PATH_BAD_TMP_BIN "A/CHDK/bad_tmp.bin"
 
 //-------------------------------------------------------------------
@@ -127 +130 @@
         char* altrawadr = get_alt_raw_image_addr();
 
-    // ! ! ! exclusively for special script which creates badpixel.bin ! ! !
+    // ! ! ! exclusively for badpixel creation ! ! !
     // 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");
+    // TODO now that we make badpixel in code, special use of save_raw is not needed
+    // also don't need to actually save a raw when making bad pixel
+    if (conf.save_raw==255) conf.save_raw=get_bad_count_and_write_file(PATH_BAD_TMP_BIN);
     //
 
@@ -487 +492 @@
 
         badpix_cnt1 = conf.save_raw;
+        conf.save_raw = 255;
         shooting_set_tv96_direct(96, SET_LATER);
 
@@ -501 +507 @@
         if (badpix_cnt1 == badpix_cnt2)
         {
+            // TODO script asked confirmation first
+            // should sanity check bad pixel count at least,
+            /// wrong buffer address could make badpixel bigger than available mem
             char msg[32];
             console_add_line("badpixel.bin created.");
             sprintf(msg, "Bad pixel count: %d", badpix_cnt1);
             console_add_line(msg);
+            DeleteFile_Fut(PATH_BADPIXEL_BIN);
+            RenameFile_Fut(PATH_BAD_TMP_BIN,PATH_BADPIXEL_BIN);
         }
         else
@@ -511 +522 @@
             console_add_line("Please try again.");
         }
-        
+        DeleteFile_Fut(PATH_BAD_TMP_BIN);
+
         action_push_delay(3000);
         break;