Changeset 479 for branches/juciphox/include/conf.h

Timestamp:

08/12/08 12:52:17 (5 years ago)

Author:

phyrephox

Message:

+ added taskviewer by reyalp ​http://chdk.setepontos.com/index.php/topic,2110.msg19622.html#msg19622
+ added Fishpeppers Boot Logo from here: ​http://chdk.setepontos.com/index.php/topic,2122.0.html
+ raw subtract for filebrowser by reyalp - ​http://chdk.setepontos.com/index.php/topic,2099.msg19362.html#msg19362

• makefile changes:

added several docs in the /docs dir, these are "catted" together during compilation -> one big readme file's gonna be put into the zip. Also includes camera specific notes, if existing (placeholders for now) (thx for helping with this, Hacki).

• Ixus 860is / SD870 - fixed ubasic_set_led (diff provided by FE50)
• patched symboldmod and changed splashscreen a little (diff sent in by CHDKLover)
• added toggle in scripts menu: now the saving of script params can be turned on/off (default: off)

File:

• branches/juciphox/include/conf.h (modified) (5 diffs)

branches/juciphox/include/conf.h

@@ -24 +24 @@
     int raw_save_first_only; //for series shooting
     int raw_nr;
+    int sub_batch_prefix; // output of batch subtracts
+    int sub_batch_ext;
+    int sub_in_dark_value; // values <= to this are not subtracted, i.e. the dark value of your darkframe
+    int sub_out_dark_value; // minimum value to output from subtract, i.e. dark value of your final image
 
     int show_osd;
@@ -216 +220 @@
     int values_show_luminance;
 
-    int ns_enable_memdump;
+    int debug_shortcut_action;  // 0=none, 1=dump, 2=page display
+    int debug_display;          // 0=none, 1=props, 2=flash param, 3=tasks
+
     int script_startup;                 // remote autostart
     int remote_enable;                  // remote enable
@@ -244 +250 @@
 
     int script_param_set;
+    int script_param_save;
     
     long mem_view_addr_init;
@@ -258 +265 @@
 #define SHOOTING_PROGRESS_PROCESSING    2
 #define SHOOTING_PROGRESS_DONE          3
+
+// video quality defaults. Ideally, these should match the camera default settings
+#define VIDEO_DEFAULT_QUALITY   84  // ? where does 84 come from
+#define VIDEO_MAX_QUALITY       99
+#define VIDEO_DEFAULT_BITRATE   3 // should be 1 for all cams
 
 extern int state_kbd_script_run;
@@ -277 +289 @@
 extern int shutter_int;
 
+// reyalp: putting these in conf, since the conf values are lookups for them
+// prefixes and extentions available for raw images (index with conf.raw_prefix etc)
+#define NUM_IMG_PREFIXES 3 // IMG_ CRW_ SND_ (could add ETC_ SDR_ AUT_ MVI_ MRK_)
+#define NUM_IMG_EXTS 5 // .JPG .CRW .CR2 .THM .WAV (could add .AVI .MRK)
+extern const char* img_prefixes[NUM_IMG_PREFIXES];
+extern const char* img_exts[NUM_IMG_EXTS];
+// ugh, but various things need it
+#define VIDEO_BITRATE_STEPS 10
+extern const char *video_bitrate_strings[VIDEO_BITRATE_STEPS];
 #endif