Changeset 479

Timestamp:

08/12/08 12:52:17 (2 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)

Files:

• branches/juciphox/CHDK/LANG/english.lng (modified) (3 diffs)
• branches/juciphox/CHDK/LANG/german.lng (modified) (1 diff)
• branches/juciphox/Makefile (modified) (1 diff)
• branches/juciphox/core/conf.c (modified) (5 diffs)
• branches/juciphox/core/gui.c (modified) (22 diffs)
• branches/juciphox/core/gui_fselect.c (modified) (6 diffs)
• branches/juciphox/core/gui_lang.c (modified) (3 diffs)
• branches/juciphox/core/gui_lang.h (modified) (3 diffs)
• branches/juciphox/core/gui_logo.h (added)
• branches/juciphox/core/gui_mpopup.c (modified) (1 diff)
• branches/juciphox/core/gui_mpopup.h (modified) (2 diffs)
• branches/juciphox/core/gui_osd.c (modified) (3 diffs)
• branches/juciphox/core/kbd.c (modified) (3 diffs)
• branches/juciphox/core/luascript.c (modified) (1 diff)
• branches/juciphox/core/raw.c (modified) (2 diffs)
• branches/juciphox/core/raw_merge.c (modified) (2 diffs)
• branches/juciphox/core/raw_merge.h (modified) (1 diff)
• branches/juciphox/doc/1_intro.txt (added)
• branches/juciphox/doc/2_dryos.txt (added)
• branches/juciphox/doc/2_vxworks.txt (added)
• branches/juciphox/doc/3_faq.txt (added)
• branches/juciphox/doc/4_urls.txt (added)
• branches/juciphox/doc/5_gpl.txt (added)
• branches/juciphox/doc/dryos (deleted)
• branches/juciphox/doc/readme.txt (added)
• branches/juciphox/doc/version.txt (modified) (1 diff)
• branches/juciphox/doc/vxworks (deleted)
• branches/juciphox/include/camera.h (modified) (4 diffs)
• branches/juciphox/include/conf.h (modified) (5 diffs)
• branches/juciphox/include/lolevel.h (modified) (1 diff)
• branches/juciphox/include/platform.h (modified) (3 diffs)
• branches/juciphox/include/stdlib.h (modified) (1 diff)
• branches/juciphox/lib/font/rbf_font.c (modified) (2 diffs)
• branches/juciphox/lib/ubasic/ubasic.c (modified) (2 diffs)
• branches/juciphox/makefile.inc (modified) (2 diffs)
• branches/juciphox/platform/a450/notes.txt (added)
• branches/juciphox/platform/a460/notes.txt (added)
• branches/juciphox/platform/a530/notes.txt (added)
• branches/juciphox/platform/a540/notes.txt (added)
• branches/juciphox/platform/a550/notes.txt (added)
• branches/juciphox/platform/a560/notes.txt (added)
• branches/juciphox/platform/a570/notes.txt (added)
• branches/juciphox/platform/a610/notes.txt (added)
• branches/juciphox/platform/a620/notes.txt (added)
• branches/juciphox/platform/a630/notes.txt (added)
• branches/juciphox/platform/a640/notes.txt (added)
• branches/juciphox/platform/a650/notes.txt (added)
• branches/juciphox/platform/a700/notes.txt (added)
• branches/juciphox/platform/a710/notes.txt (added)
• branches/juciphox/platform/a720/notes.txt (added)
• branches/juciphox/platform/g7/notes.txt (added)
• branches/juciphox/platform/generic/wrappers.c (modified) (2 diffs)
• branches/juciphox/platform/ixus40_sd300/notes.txt (added)
• branches/juciphox/platform/ixus50_sd400/notes.txt (added)
• branches/juciphox/platform/ixus55_sd450/notes.txt (added)
• branches/juciphox/platform/ixus60_sd600/notes.txt (added)
• branches/juciphox/platform/ixus65_sd630/notes.txt (added)
• branches/juciphox/platform/ixus700_sd500/notes.txt (added)
• branches/juciphox/platform/ixus70_sd1000/notes.txt (added)
• branches/juciphox/platform/ixus750_sd550/notes.txt (added)
• branches/juciphox/platform/ixus800_sd700/notes.txt (added)
• branches/juciphox/platform/ixus850_sd800/notes.txt (added)
• branches/juciphox/platform/ixus860_sd870/lib.c (modified) (2 diffs)
• branches/juciphox/platform/ixus860_sd870/notes.txt (added)
• branches/juciphox/platform/ixus950_sd850/notes.txt (added)
• branches/juciphox/platform/ixus960_sd950/notes.txt (added)
• branches/juciphox/platform/ixusW_sd430/notes.txt (added)
• branches/juciphox/platform/s2is/notes.txt (added)
• branches/juciphox/platform/s3is/notes.txt (added)
• branches/juciphox/platform/s5is/notes.txt (added)
• branches/juciphox/platform/s80/notes.txt (added)
• branches/juciphox/platform/sx100is/notes.txt (added)
• branches/juciphox/platform/tx1/notes.txt (added)
• branches/juciphox/version.inc (modified) (1 diff)

branches/juciphox/CHDK/LANG/english.lng

@@ -121 +121 @@
- 79 "Debug"
-
-
+
+
- 81 "PropCase Page"
- 82 "Show Misc. Values"
- 83 "Memory Browser"
-
+
+
- 85 "Make Card Bootable..."
-
@@ -378 +380 @@
-
-272 "Show OSD in Review Mode"
-
+
+
-
-274 "Subject distance from lens"
@@ -538 +541 @@
-400 "Zoom Time-out 0.1s"
-401 "Startup sound"
+402 "Raw subtract prefix"
+403 "Raw subtract extension"
+404 "Subtract input dark value"
+405 "Subtract output dark value"
+406 "from"
+407 "...%d more files"
+408 "Subtract"
+409 "Sub from marked"
+410 "Save params"

branches/juciphox/CHDK/LANG/german.lng

@@ -545 +545 @@
-400 "Zoom Time-out 0.1s"
-401 "Startup sound"
+402 "Raw subtract prefix"
+403 "Raw subtract extension"
+404 "Subtract input dark value"
+405 "Subtract output dark value"
+406 "from"
+407 "...%d more files"
+408 "Subtract"
+409 "Sub from marked"
+410 "Save params"

branches/juciphox/Makefile

@@ -96 +96 @@
-        cp $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB).FIR $(topdir)bin/PS.FIR
-        zip -9j $(topdir)bin/$(VER)-$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)_complete.zip $(topdir)bin/PS.FIR > $(DEVNULL)
-
+
+
-        rm -f $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB).FIR
-        rm -f $(topdir)bin/PS.FIR
-  endif
-  ifeq ($(PLATFORMOS),dryos)
-
+
+
-        #cp $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB).FI2 $(topdir)bin/PS.FI2
-        #zip -9jc $(topdir)bin/$(VER)-$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)_complete.zip $(topdir)bin/PS.FI2 > $(DEVNULL)

branches/juciphox/core/conf.c

@@ -51 +51 @@
-int debug_vals_show;
-int debug_pardata_show;
+
+// 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)
+const char* img_prefixes[NUM_IMG_PREFIXES]={ "IMG_", "CRW_", "SND_" /*, "AUT_", "ETC_","SDR_", "MVI_", "MRK_"*/};
+const char* img_exts[NUM_IMG_EXTS]={ ".JPG", ".CRW", ".CR2", ".THM", ".WAV"/*, ".AVI", ".MRK"*/};
+// ugh
+const char *video_bitrate_strings[VIDEO_BITRATE_STEPS]={ "0.25x", "0.5x","0.75x", "1x", "1.25x", "1.5x", "1.75x", "2x", "2.5x", "3x"};
-
-//-------------------------------------------------------------------
@@ -117 +124 @@
-     if (conf.clear_video)
-        {
-
-conf.video_quality = 84
-        conf.video_bitrate = 3
-    
+ 
+ conf.video_quality = VIDEO_DEFAULT_QUALITY
+        conf.video_bitrate = VIDEO_DEFAULT_BITRATE
+       
-        }
-}
@@ -159 +166 @@
-    CONF_INFO( 32, conf.ricoh_ca1_mode,         CONF_DEF_VALUE, i:0, NULL),
-    CONF_INFO( 33, conf.flashlight,             CONF_DEF_VALUE, i:0, NULL),
-
+
+
-    CONF_INFO( 35, conf.raw_in_dir,             CONF_DEF_VALUE, i:0, NULL),
-    CONF_INFO( 36, conf.raw_prefix,             CONF_DEF_VALUE, i:RAW_PREFIX_CRW, NULL),
@@ -221 +229 @@
-
-    CONF_INFO( 99, conf.video_mode,             CONF_DEF_VALUE, i:0, NULL),
-84
-3
+VIDEO_DEFAULT_QUALITY
+VIDEO_DEFAULT_BITRATE
-    
-    CONF_INFO(102, conf.tv_override_value,      CONF_DEF_VALUE, i:0, NULL),     
@@ -346 +354 @@
-    CONF_INFO(207, conf.zoom_timeout,           CONF_DEF_VALUE, i:5, NULL),
-        CONF_INFO(208, conf.start_sound,     CONF_DEF_VALUE, i:0, NULL),
+    CONF_INFO(209, conf.sub_batch_prefix,  CONF_DEF_VALUE, i:2, NULL), // SND_
+    CONF_INFO(210, conf.sub_batch_ext,  CONF_DEF_VALUE, i:1, NULL), // .CRW
+    CONF_INFO(211, conf.sub_in_dark_value,  CONF_DEF_VALUE, i:30, NULL), 
+    CONF_INFO(212, conf.sub_out_dark_value,  CONF_DEF_VALUE, i:0, NULL), 
+        CONF_INFO(213, conf.debug_display,     CONF_DEF_VALUE, i:0, NULL),
+        CONF_INFO(214, conf.script_param_save,     CONF_DEF_VALUE, i:0, NULL),
-                        
-                        

branches/juciphox/core/gui.c

@@ -31 +31 @@
-#include "raw.h"
-#include "curves.h"
-
+
-//-------------------------------------------------------------------
-
@@ -146 +146 @@
-static const char* gui_raw_prefix_enum(int change, int arg);
-static const char* gui_raw_ext_enum(int change, int arg);
+static const char* gui_sub_batch_prefix_enum(int change, int arg);
+static const char* gui_sub_batch_ext_enum(int change, int arg);
+
-static const char* gui_raw_nr_enum(int change, int arg);
-static const char* gui_autoiso_shutter_enum(int change, int arg);
@@ -193 +196 @@
-static const char* gui_override_disable_enum(int change, int arg);
-static const char* gui_conf_curve_enum(int change, int arg);
+static const char* gui_debug_shortcut_enum(int change, int arg);
+static const char* gui_debug_display_enum(int change, int arg);
+static void gui_debug_shortcut(void);
+
-void rinit();
-
@@ -207 +214 @@
-static void cb_zebra_restore_osd();
-
+static int debug_tasklist_start;
+static int debug_display_direction=1;
-// Menu definition
-//-------------------------------------------------------------------
@@ -236 +245 @@
-    {0x5d,LANG_MENU_SCRIPT_DEFAULT_VAL,     MENUITEM_PROC,                      (int*)gui_load_script_default },
-    {0x5e,LANG_MENU_SCRIPT_PARAM_SET,     MENUITEM_ENUM,                         (int*)gui_script_param_set_enum },
+    {0x5c,LANG_MENU_SCRIPT_PARAM_SAVE,             MENUITEM_BOOL,                    &conf.script_param_save              },    
-    {0x0,(int)script_title,                 MENUITEM_SEPARATOR },
-//    {0x0,LANG_MENU_SCRIPT_CURRENT,          MENUITEM_SEPARATOR },
@@ -317 +327 @@
-
-static CMenuItem debug_submenu_items[] = {
-
-
+
-    {0x2a,LANG_MENU_DEBUG_PROPCASE_PAGE,     MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,   &debug_propcase_page, MENU_MINMAX(0, 128) },
+    {0x2a,LANG_MENU_DEBUG_TASKLIST_START,    MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,   &debug_tasklist_start, MENU_MINMAX(0, 63) },
-    {0x5c,LANG_MENU_DEBUG_SHOW_MISC_VALS,    MENUITEM_BOOL,          &debug_vals_show },
-    {0x2a,LANG_MENU_DEBUG_MEMORY_BROWSER,    MENUITEM_PROC,          (int*)gui_draw_debug },
-    {0x2a,LANG_MENU_DEBUG_BENCHMARK,         MENUITEM_PROC,          (int*)gui_draw_bench },
-DUMP_RAM,          MENUITEM_BOOL,          &conf.ns_enable_memdump
+SHORTCUT_ACTION,   MENUITEM_ENUM,          (int*)gui_debug_shortcut_enum
-    {0x33,LANG_MENU_DEBUG_MAKE_BOOTABLE,     MENUITEM_PROC,             (int*)gui_menuproc_mkbootdisk },
-#if CAM_MULTIPART
@@ -661 +671 @@
-    {0x5f,LANG_MENU_RAW_PREFIX,              MENUITEM_ENUM,      (int*)gui_raw_prefix_enum },
-    {0x5f,LANG_MENU_RAW_EXTENSION,           MENUITEM_ENUM,      (int*)gui_raw_ext_enum },
+    {0x5f,LANG_MENU_SUB_PREFIX,              MENUITEM_ENUM,      (int*)gui_sub_batch_prefix_enum },
+    {0x5f,LANG_MENU_SUB_EXTENSION,           MENUITEM_ENUM,      (int*)gui_sub_batch_ext_enum },
+    {0x60,LANG_MENU_SUB_IN_DARK_VALUE,       MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.sub_in_dark_value, MENU_MINMAX(0, 1023)},
+    {0x60,LANG_MENU_SUB_OUT_DARK_VALUE,      MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.sub_out_dark_value, MENU_MINMAX(0, 1023)},
-    {0x2a,LANG_MENU_RAW_DEVELOP,             MENUITEM_PROC,      (int*)gui_raw_develop },
-    {0x5c,LANG_MENU_BAD_PIXEL_REMOVAL,       MENUITEM_ENUM,      (int*)gui_bad_pixel_enum },
@@ -814 +828 @@
-        if (change != 0)
-        {
+                        if (conf.script_param_save)
+                                {
-        save_params_values(0);
-  
+}
-                conf.script_param_set += change;
-                if (conf.script_param_set < 0) conf.script_param_set = (sizeof(modes)/sizeof(modes[0]))-1; else
@@ -911 +927 @@
-//-------------------------------------------------------------------
-const char* gui_raw_prefix_enum(int change, int arg) {
-    static const char* prefixes[]={ "IMG_", "CRW_", "SND_"};
-
-    conf.raw_prefix+=change;
-    if (conf.raw_prefix<0)
-(sizeof(prefixes)/sizeof(prefixes[0]))
-(sizeof(prefixes)/sizeof(prefixes[0]))
+NUM_IMG_PREFIXES
+NUM_IMG_PREFIXES
-        conf.raw_prefix=0;
-
-
+img_
-}
-
-//-------------------------------------------------------------------
-const char* gui_raw_ext_enum(int change, int arg) {
-    static const char* exts[]={ ".JPG", ".CRW", ".CR2", ".THM", ".WAV"};
-
-    conf.raw_ext+=change;
-    if (conf.raw_ext<0)
-(sizeof(exts)/sizeof(exts[0]))
-(sizeof(exts)/sizeof(exts[0]))
+NUM_IMG_EXTS
+NUM_IMG_EXTS
-        conf.raw_ext=0;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1257 +1291 @@
-//-------------------------------------------------------------------
-const char* gui_video_bitrate_enum(int change, int arg) {
-    static const char* modes[]={ "0.25x", "0.5x","0.75x", "1x", "1.25x", "1.5x", "1.75x", "2x", "2.5x", "3x"};
-
-    conf.video_bitrate+=change;
-    if (conf.video_bitrate<0)
-sizeof(modes)/sizeof(modes[0])
-(sizeof(modes)/sizeof(modes[0]))
+VIDEO_BITRATE_STEPS
+VIDEO_BITRATE_STEPS
-        conf.video_bitrate=0;
-
-    shooting_video_bitrate_change(conf.video_bitrate);
-
-mode
+video_bitrate_string
-}
-
@@ -1589 +1621 @@
- int m=mode_get();
- gui_fselect_init(LANG_RAW_DEVELOP_SELECT_FILE, "A/DCIM", raw_fselect_cb);
+}
+
+//-------------------------------------------------------------------
+#define TASKLIST_MAX_LINES 12 // probably as much as will fit on screen
+#define TASKLIST_NUM_TASKS 64 // should be enough ?
+static void gui_debug_draw_tasklist(void) {
+#ifndef CAM_DRYOS
+    int tasklist[TASKLIST_NUM_TASKS]; // max number of tasks we will look at
+    char buf[40]; // a single line of the list
+    int n_tasks,n_show_tasks,show_start;
+    const char *name;
+    int i;
+    n_tasks = task_id_list_get(tasklist,sizeof(tasklist)/sizeof(tasklist[0]));
+    show_start = debug_tasklist_start;
+    n_show_tasks = n_tasks - show_start;
+    // auto adjust to show the last N tasks
+    if(n_show_tasks < TASKLIST_MAX_LINES) {
+        show_start = n_tasks - TASKLIST_MAX_LINES;
+        if(show_start<0)
+            show_start = 0;
+         n_show_tasks = n_tasks - show_start;
+    }
+    else if( n_show_tasks > TASKLIST_MAX_LINES ) {
+        n_show_tasks = TASKLIST_MAX_LINES;
+    }
+    sprintf(buf,"%d-%d of %d tasks %c",show_start,show_start+n_show_tasks,n_tasks,debug_display_direction > 0?'+':'-');
+    draw_string(64,0,buf, conf.osd_color);
+    for( i = 0;  i < n_show_tasks; i++ ) {
+        // TODO get full task info
+        name = task_name(tasklist[show_start+i]);
+        if ( !name || !*name ) {
+            name = "(unknown)";
+        }
+        sprintf(buf,"%10s %8X",name,tasklist[show_start+i]);
+        draw_string(64,16+16*i,buf, conf.osd_color);
+    }
+#endif //CAM_DRYOS
+}
+
+#define DEBUG_DISPLAY_NONE 0
+#define DEBUG_DISPLAY_PROPS 1
+#define DEBUG_DISPLAY_PARAMS 2
+#define DEBUG_DISPLAY_TASKS 3
+static const char * gui_debug_shortcut_enum(int change, int arg) {
+    static const char* modes[]={ "None", "Dmp RAM", "Page"};
+
+    conf.debug_shortcut_action += change;
+    if (conf.debug_shortcut_action < 0) 
+        conf.debug_shortcut_action = sizeof(modes)/sizeof(modes[0])-1;
+    else if (conf.debug_shortcut_action >= (sizeof(modes)/sizeof(modes[0])))
+        conf.debug_shortcut_action = 0;
+    
+    return modes[conf.debug_shortcut_action]; 
+}
+
+static const char * gui_debug_display_enum(int change, int arg) {
+    static const char* modes[]={ "None", "Props", "Params", "Tasks"};
+
+    conf.debug_display += change;
+    if (conf.debug_display < 0) 
+        conf.debug_display=sizeof(modes)/sizeof(modes[0])-1;
+    else if (conf.debug_display >= (sizeof(modes)/sizeof(modes[0])))
+        conf.debug_display = 0;
+    
+    return modes[conf.debug_display]; 
+}
+
+static void gui_debug_shortcut(void) {
+    static int lastcall = -1;
+    int t=get_tick_count();
+    if ( lastcall != -1) {
+        if (t-lastcall <= 400)
+            debug_display_direction = -debug_display_direction;
+    }
+    lastcall=t;
+    switch(conf.debug_shortcut_action) {
+        case 1:
+            dump_memory();
+        break;
+        case 2:
+            if(conf.debug_display == DEBUG_DISPLAY_TASKS) {
+                debug_tasklist_start += debug_display_direction*(TASKLIST_MAX_LINES-2); // a little intentional overlap
+                if(debug_tasklist_start >= TASKLIST_NUM_TASKS || debug_tasklist_start < 0)
+                    debug_tasklist_start = 0;
+            }
+            else if (conf.debug_display == DEBUG_DISPLAY_PROPS || conf.debug_display == DEBUG_DISPLAY_PARAMS) {
+                debug_propcase_page += debug_display_direction*1;
+                if(debug_propcase_page > 128 || debug_propcase_page < 0) 
+                    debug_propcase_page = 0;
+            }
+        break;
+    }
-}
-
@@ -1847 +1971 @@
-        case GUI_MODE_ALT:
-            if (kbd_is_key_clicked(SHORTCUT_TOGGLE_RAW)) {
-ns_enable_memdump) dump_memory
+debug_shortcut_action > 0) gui_debug_shortcut
-#if !CAM_HAS_ERASE_BUTTON && CAM_CAN_SD_OVERRIDE
-                else if (!shooting_get_common_focus_mode())
@@ -2125 +2249 @@
-    }
-    
-
-
-
-
-
-
-
-
+
+
+
-    mode_photo = (m&MODE_MASK) == MODE_PLAY || 
-                 !( mode_video ||
@@ -2183 +2302 @@
-            gui_grid_draw_osd(1);
-        }
-mode_video
+(mode_video || movie_status > 1)
-                 
-           if (conf.show_dof!=DOF_DONT_SHOW) gui_osd_calc_dof();
@@ -2191 +2310 @@
-           if (conf.values_show_real_iso || conf.values_show_market_iso || conf.values_show_ev_seted || conf.values_show_ev_measured || conf.values_show_bv_measured || conf.values_show_bv_seted || conf.values_show_overexposure || conf.values_show_canon_overexposure) gui_osd_calc_expo_param();                              
-        }
- && !mode_video
+
-        if (conf.save_raw && conf.show_raw_state && !mode_video && (!kbd_is_key_pressed(KEY_SHOOT_HALF))) gui_osd_draw_raw_info();
-        
-mode_video 
+(mode_video || movie_status > 1)
-                   gui_osd_draw_values(1);
-        else if  (shooting_get_common_focus_mode() && mode_photo && conf.show_values && !(conf.show_dof==DOF_SHOW_IN_DOF) )   
@@ -2219 +2338 @@
-        gui_osd_draw_temp();
-      }
-
+ && (mode_video || movie_status > 1)
- {
- gui_osd_draw_movie_time_left();
- 
- if ((movie_status > 1) && (conf.fast_movie_quality_control==1)){
-    if (conf.video_mode == 0 )
-        {
-    gui_print_osd_state_string_chr("Bitrate: ",gui_video_bitrate_enum(0,0));
-        }
-        else
-                {
-        gui_print_osd_state_string_int("Quality: ",conf.video_quality);
-    }
- }
-}
- 
@@ -2270 +2378 @@
-        static char sbuf[100];
-    int r,i, p, len;
-debug_propcase_show
+conf.debug_display == DEBUG_DISPLAY_PROPS
-
-        for (i=0;i<10;i++){
@@ -2281 +2389 @@
-    }
-
-if (debug_pardata_show
+    if (conf.debug_display == DEBUG_DISPLAY_PARAMS
-        extern long* FlashParamsTable[]; 
-        char s[30];
@@ -2308 +2416 @@
-   }
-
+    if(conf.debug_display == DEBUG_DISPLAY_TASKS) {
+        gui_debug_draw_tasklist();
+    }
-
-    if (ubasic_error){
@@ -2443 +2554 @@
-    int i, l;
-   // color cl = MAKE_COLOR((gui_splash_mode==MODE_REC)?0xDA:0xD9, COLOR_WHITE);
-
+   
-
-
@@ -2456 +2567 @@
-    w=w*FONT_WIDTH+10;
-
-screen_height-h)>>1
-cl
+(screen_height-h)>>1) + 20
+MAKE_COLOR(COLOR_RED, COLOR_RED)
-    for (i=0; i<sizeof(text)/sizeof(text[0]); ++i) {
-        draw_string(x+((w-strlen(text[i])*FONT_WIDTH)>>1), y+i*FONT_HEIGHT+4, text[i], cl);
+    }
+    int mx,my;
+    int offset_x = (screen_width-150)>>1;
+    int offset_y = ((screen_height-84)>>1) - 42;
+    
+    for(mx=0; mx<150; mx++){
+        for(my=0; my<84; my++){
+            color c = header_data[my*150+mx];
+            if (c != 0x00)
+                draw_pixel(offset_x+mx,offset_y+my,c);
+        }
-    }
-}
@@ -2490 +2612 @@
-void gui_load_script_default(int arg) {
-        script_load(conf.script_file, 0);
-
-
+
+
+
+
-
-

branches/juciphox/core/gui_fselect.c

@@ -11 +11 @@
-#include "gui_fselect.h"
-#include "raw_merge.h"
+#include "conf.h"
-
-//-------------------------------------------------------------------
@@ -712 +713 @@
-
-//-------------------------------------------------------------------
-unsigned int fselect
+inline unsigned int fselect_real
-    struct fitem  *ptr;
-    register unsigned int cnt=0;
@@ -720 +721 @@
-            ++cnt;
-    }
+    return cnt;
+}
+//-------------------------------------------------------------------
+static unsigned int fselect_marked_count() {
+    struct fitem  *ptr;
+    register unsigned int cnt=fselect_real_marked_count();
-
-    if (!cnt) {
@@ -783 +790 @@
-  gui_fselect_read_dir(current_dir);
- }
+}
+
+static void fselect_subtract_cb(unsigned int btn) {
+    struct fitem *ptr;
+    char *raw_subtract_from;
+    char *raw_subtract_sub;
+    char *raw_subtract_dest;
+    if (btn != MBOX_BTN_YES) return;
+
+    if(!(raw_subtract_from = malloc(300))) //3x full path
+        return;
+    raw_subtract_sub = raw_subtract_from + 100;
+    raw_subtract_dest = raw_subtract_sub + 100;
+    sprintf(raw_subtract_sub,"%s/%s",current_dir,selected->name);
+    for (ptr=head; ptr; ptr=ptr->next) {
+        if (ptr->marked && ptr->attr != 0xFF && 
+            !(ptr->attr & DOS_ATTR_DIRECTORY) &&
+            ptr->size == hook_raw_size() &&
+            (strcmp(ptr->name,selected->name)) != 0) {
+            sprintf(raw_subtract_from,"%s/%s",current_dir,ptr->name);
+            sprintf(raw_subtract_dest,"%s/%s%s",current_dir,img_prefixes[conf.sub_batch_prefix],ptr->name+4);
+            strcpy(raw_subtract_dest + strlen(raw_subtract_dest) - 4,img_exts[conf.sub_batch_ext]);
+                        // don't let users attempt to write one of the files being read
+                        if( strcmp(raw_subtract_dest,raw_subtract_from) != 0 && strcmp(raw_subtract_dest,raw_subtract_sub) != 0) {
+                raw_subtract(raw_subtract_from,raw_subtract_sub,raw_subtract_dest);
+                        }
+        }
+    }
+    free(raw_subtract_from);
+    gui_fselect_read_dir(current_dir);
+    gui_fselect_redraw = 2;
+}
+
+
+#define MAX_SUB_NAMES 6
+static void setup_batch_subtract(void) {
+    struct fitem *ptr;
+    int i;
+    char *p = buf + sprintf(buf,"%s %s\n",selected->name,lang_str(LANG_FSELECT_SUB_FROM));
+    for (ptr=head, i=0; ptr; ptr=ptr->next) {
+        if (ptr->marked && ptr->attr != 0xFF && !(ptr->attr & DOS_ATTR_DIRECTORY) && ptr->size == hook_raw_size()) {
+            if ( i < MAX_SUB_NAMES ) {
+                sprintf(p, "%s\n",ptr->name);
+                // keep a pointer to the one before the end, so we can stick ...and more on
+                if (i < MAX_SUB_NAMES - 1) {
+                    p += strlen(p);
+                }
+            }
+            i++;
+        }
+    }
+    if (i > MAX_SUB_NAMES) {
+//      "...%d more files"
+        sprintf(p,lang_str(LANG_FSELECT_SUB_AND_MORE),i - (MAX_SUB_NAMES - 1));
+    }
+    gui_mbox_init(LANG_FSELECT_SUBTRACT, (int)buf,
+                  MBOX_TEXT_CENTER|MBOX_BTN_YES_NO|MBOX_DEF_BTN2, fselect_subtract_cb);
-}
-
@@ -848 +912 @@
-            process_raw_files();
-            break;
+        case MPOPUP_SUBTRACT:
+        {
+            setup_batch_subtract();
+            break;
+        }
-    }
-    gui_fselect_redraw = 2;
@@ -893 +962 @@
-            if (selected && selected->attr != 0xFF) {
-                i=MPOPUP_CUT|MPOPUP_COPY|MPOPUP_SELINV|MPOPUP_RAW_ADD|MPOPUP_RAW_AVERAGE;
-
+ {
-                    i |= MPOPUP_DELETE;
+                    // doesn't make sense to subtract from itself!
+                    if( selected->marked == 0 && fselect_real_marked_count() > 0)
+                        i |= MPOPUP_SUBTRACT;
+                }
-                if (marked_operation == MARKED_OP_CUT || marked_operation == MARKED_OP_COPY)
-                    i |= MPOPUP_PASTE;

branches/juciphox/core/gui_lang.c

@@ -121 +121 @@
-" 79 \"Debug\"\n"
-
-Show PropCases
+Debug data display
-" 81 \"PropCase/ParamsData page\"\n"
-" 82 \"Show misc. values\"\n"
-" 83 \"Memory browser\"\n"
-Dump RAM on ALT +/- press
+ALT +/- debug action
-" 85 \"Make card bootable...\"\n"
-
@@ -365 +365 @@
-
-"272 \"Show OSD in Review Mode\"\n"
-Show Parameter Data
+Task list start
-
-"274 \"Subject distance from lens\"\n"
@@ -521 +521 @@
-"400 \"Zoom Time-out 0.1s\"\n"
-"401 \"Startup sound\"\n"
+"402 \"Raw subtract prefix\"\n"
+"403 \"Raw subtract extension\"\n"
+"404 \"Subtract input dark value\"\n"
+"405 \"Subtract output dark value\"\n"
+"406 \"from\"\n"
+"407 \"...%d more files\"\n"
+"408 \"Subtract\"\n"
+"409 \"Sub from marked\"\n"
+"410 \"Save params\"\n"
-;
-

branches/juciphox/core/gui_lang.h

@@ -108 +108 @@
-#define LANG_MENU_DEBUG_TITLE           79
-
-SHOW_PROPCASES
+DISPLAY       
-#define LANG_MENU_DEBUG_PROPCASE_PAGE   81
-#define LANG_MENU_DEBUG_SHOW_MISC_VALS  82
-#define LANG_MENU_DEBUG_MEMORY_BROWSER  83
-DUMP_RAM       
+SHORTCUT_ACTION
-#define LANG_MENU_DEBUG_MAKE_BOOTABLE   85
-
@@ -356 +356 @@
-
-#define LANG_MENU_OSD_SHOW_IN_REVIEW     272
-SHOW_PARAMETER_DATA
+TASKLIST_START
-
-#define LANG_MENU_DOF_DIST_FROM_LENS 274
@@ -509 +509 @@
-#define LANG_MENU_REMOTE_ZOOM_ENABLE  399
-#define LANG_MENU_REMOTE_ZOOM_TIMEOUT 400
-
-#define LANG_MENU_MISC_START_SOUND 401
-
+
+
+
+
+
+
+
+
+
-//-------------------------------------------------------------------
-
-01
+10
-
-//-------------------------------------------------------------------

branches/juciphox/core/gui_mpopup.c

@@ -26 +26 @@
-        { MPOPUP_RAW_AVERAGE,   LANG_POPUP_RAW_AVERAGE },
-        { MPOPUP_PURGE,         LANG_POPUP_PURGE  },
+        { MPOPUP_SUBTRACT,      LANG_POPUP_SUB_FROM_MARKED  },
-};
-
-#define ACTIONSNUM              (sizeof(actions)/sizeof(actions[0]))
-8
+9
-static int                      mpopup_actions[MAX_ACTIONS], mpopup_actions_num, mpopup_actions_active;
-static coord                    mpopup_actions_x, mpopup_actions_y;

branches/juciphox/core/gui_mpopup.h

@@ -3 +3 @@
-
-//-------------------------------------------------------------------
-0
+1
-#define MPOPUP_CUT              0x0001
-#define MPOPUP_COPY             0x0002
@@ -11 +11 @@
-#define MPOPUP_RAW_ADD          0x0020
-#define MPOPUP_RAW_AVERAGE      0x0040
-1
+2
-#define MPOPUP_PURGE            0x0080
+#define MPOPUP_SUBTRACT         0x0100
-
-//-------------------------------------------------------------------

branches/juciphox/core/gui_osd.c

@@ -703 +703 @@
-void gui_osd_draw_state() {
-    int a,  gui_mode=gui_get_mode(), m=(mode_get()&MODE_SHOOTING_MASK); 
+    int mode_video = MODE_IS_VIDEO(m);
-    long t; 
-    
@@ -710 +711 @@
-   //draw_string(conf.mode_state_pos.x, conf.mode_state_pos.y+6*FONT_HEIGHT, osd_buf, conf.osd_color);
-   ////////////////////////////  
+    if (mode_video || movie_status > 1) {
+        // if manual adjust, show the field item to be adjusted
+        // if any value overriden, show the override value
+        if ((conf.video_mode == 0 && conf.fast_movie_quality_control==1) || conf.video_bitrate != VIDEO_DEFAULT_BITRATE) {
+            gui_print_osd_state_string_chr("Bitrate: ",video_bitrate_strings[conf.video_bitrate]);
+        }
+        if ((conf.video_mode == 1 && conf.fast_movie_quality_control==1) || conf.video_quality != VIDEO_DEFAULT_QUALITY) {
+            gui_print_osd_state_string_int("Quality: ",conf.video_quality);
+        }
+        // everything else is for stills
+                if(mode_video)
+                        return;
+    }
-      
-    if ((((conf.tv_enum_type) || (conf.tv_override_value)) && (conf.tv_override_koef)  && !(conf.override_disable==1)) || gui_mode==GUI_MODE_OSD){
@@ -992 +1006 @@
-
-void gui_osd_draw_temp() {
-==1||0
+ == 1
-                        {
-                                if (conf.clock_format == 0)

branches/juciphox/core/kbd.c

@@ -261 +261 @@
-    script_print_screen_init();
-
-
-
+
+
+
+
-    if( autostart )
-      script_console_add_line("***Autostart***");
@@ -568 +570 @@
-        mmode = mode_get();
-        mplay = (mmode&MODE_MASK)==MODE_PLAY;
-
+
+
-  }
-       // deals with alt-mode switch and delay emulation
@@ -1353 +1356 @@
-
-long kbd_use_up_down_left_right_as_fast_switch() {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        if (conf.fast_ev && key_pressed == 0) {
-
-
-
-
-
-
-
+
+
-            EnterToCompensationEVF();
-            key_pressed = KEY_UP;
-   
+    
-            return 1;
-        }
-
-    } 
-
-
+
-        if (conf.fast_movie_quality_control && key_pressed == 0) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            key_pressed = KEY_UP;
-            return 1;
-        }
-
-    } 
-
-
-
+
-        if (conf.fast_ev && key_pressed == 0) {
-            kbd_key_release_all();
-
-
-
-
-
-
-
+
+
-            key_pressed = KEY_DOWN;
-            EnterToCompensationEVF();
-            return 1;
-        }
-
-    } 
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            key_pressed = KEY_DOWN;
-            return 1;
-        }
-
-    } 
-    
-
-
-
-
-
-
-
-
+
+
+
-            key_pressed = KEY_LEFT;
-            return 1;
-        }
-
-    } 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            key_pressed = KEY_RIGHT;
-            return 1;
-        }
-
-    } 
-
+
-    return 0;
-}

branches/juciphox/core/luascript.c

@@ -214 +214 @@
-    int to = luaL_checknumber( L, 1 );
-    int m=mode_get()&MODE_SHOOTING_MASK;
-
-
-
-
-
+
+
-#if CAM_HAS_MANUAL_FOCUS
-    if (shooting_get_focus_mode() || (mode_video)) shooting_set_focus(to, SET_NOW);

branches/juciphox/core/raw.c

@@ -9 +9 @@
-#define RAW_TARGET_DIRECTORY    "A/DCIM/%03dCANON"
-//#define RAW_TMP_FILENAME        "HDK_RAW.TMP"
-_%04d.
+%04d
-
-//-------------------------------------------------------------------
-static char fn[64];
-static char dir[32];
-static char prefixes[][4] = { "IMG", "CRW", "SND" };
-static char exts[][4] = { "JPG", "CRW", "CR2", "THM", "WAV" };
-static int develop_raw=0;
-//-------------------------------------------------------------------
@@ -68 +66 @@
-
-        sprintf(fn, "%s/", dir);
-prefixes[conf.raw_prefix], get_target_file_num(), 
+img_prefixes[conf.raw_prefix], get_target_file_num(), img_
-
-        fd = open(fn, O_WRONLY|O_CREAT, 0777);

branches/juciphox/core/raw_merge.c

@@ -7 +7 @@
-#include "gui_lang.h"
-#include "lang.h"
-
+
-#define TEMP_FILE        "raw16.tmp"
-#define TEMP_FILE_NAME   "A/raw16.tmp"
@@ -18 +18 @@
-static char namebuf[100];
-
+// note: if processing with dcraw etc, zeros may get replaced with interpolated values
+// this may or may not be what you want
+static int raw_subtract_values(int from, int sub) {
+    if ( sub > conf.sub_in_dark_value ) {
+        int result = from - sub;
+        if ( result < conf.sub_out_dark_value ) {
+            return conf.sub_out_dark_value;
+        }
+        else {
+            return result;
+        }
+    }
+    else {
+        return from;
+    }
+}
+/* subtract "sub" from "from" and store the result in "dest"*/
+/* TODO allow replacing if dest == from or sub*/
+int raw_subtract(const char *from, const char *sub, const char *dest) {
+     unsigned req=(hook_raw_size()>>10) + 1;
+    unsigned avail=GetFreeCardSpaceKb();
+    int ffrom = 0, fsub = 0, fdest = 0;
+    char *baccum = 0,*bsub = 0;
+    int status = 0;
+    unsigned short s,d;
+    int i,j;
+
+    static struct utimbuf t;
+
+    struct stat st;
+
+    if (stat((char *)from,&st) != 0 || st.st_size!=hook_raw_size()) 
+        return 0;
+
+    if (stat((char *)sub,&st) != 0 || st.st_size!=hook_raw_size()) 
+        return 0;
+
+     if( (baccum=malloc(RAW_ROWLEN)) &&
+        (bsub=malloc(RAW_ROWLEN)) &&
+        (ffrom=fopen(from, "rb")) &&
+        (fsub=fopen(sub, "rb")) &&
+        (fdest=fopen(dest, "wb")) &&
+        avail > req)
+    {
+        started();
+        for (j = 0; j < CAM_RAW_ROWS; j++) {
+            fread(baccum,1, RAW_ROWLEN,ffrom);
+            fread(bsub,1, RAW_ROWLEN,fsub);
+            for(i = 0;i<RAW_ROWLEN; i+=10) {
+                s =((0x3fc&(((unsigned short)bsub[i+1])<<2)) | (bsub[i+0] >> 6));
+                d =((0x3fc&(((unsigned short)baccum[i+1])<<2)) | (baccum[i+0] >> 6));
+                d = raw_subtract_values(d,s);
+                baccum[i]=(baccum[i]&0x3F)|(d<<6); 
+                baccum[i+1]=d>>2;
+
+                s =((0x3f0&(((unsigned short)bsub[i+0])<<4)) | (bsub[i+3] >> 4));
+                d =((0x3f0&(((unsigned short)baccum[i+0])<<4)) | (baccum[i+3] >> 4));
+                d = raw_subtract_values(d,s);
+                baccum[i]=(baccum[i]&0xC0)|(d>>4);
+                baccum[i+3]=(baccum[i+3]&0x0F)|(d<<4);
+
+                s =((0x3c0&(((unsigned short)bsub[i+3])<<6)) | (bsub[i+2] >> 2));
+                d =((0x3c0&(((unsigned short)baccum[i+3])<<6)) | (baccum[i+2] >> 2));
+                d = raw_subtract_values(d,s);
+                baccum[i+2]=(baccum[i+2]&0x03)|(d<<2);
+                baccum[i+3]=(baccum[i+3]&0xF0)|(d>>6);
+
+                s =((0x300&(((unsigned short)bsub[i+2])<<8)) | (bsub[i+5])); 
+                d =((0x300&(((unsigned short)baccum[i+2])<<8)) | (baccum[i+5])); 
+                d = raw_subtract_values(d,s);
+                baccum[i+2]=(baccum[i+2]&0xFC)|(d>>8); 
+                baccum[i+5]=d;
+
+
+                s =((0x3fc&(((unsigned short)bsub[i+4])<<2)) | (bsub[i+7] >> 6)); 
+                d =((0x3fc&(((unsigned short)baccum[i+4])<<2)) | (baccum[i+7] >> 6)); 
+                d = raw_subtract_values(d,s);
+                baccum[i+4]=d>>2;
+                baccum[i+7]=(baccum[i+7]&0x3F)|(d<<6);
+
+
+                s =((0x3f0&(((unsigned short)bsub[i+7])<<4)) | (bsub[i+6] >> 4)); 
+                d =((0x3f0&(((unsigned short)baccum[i+7])<<4)) | (baccum[i+6] >> 4)); 
+                d = raw_subtract_values(d,s);
+                baccum[i+6]=(baccum[i+6]&0x0F)|(d<<4);
+                baccum[i+7]=(baccum[i+7]&0xC0)|(d>>4);
+
+                s =((0x3c0&(((unsigned short)bsub[i+6])<<6)) | (bsub[i+9] >> 2)); 
+                d =((0x3c0&(((unsigned short)baccum[i+6])<<6)) | (baccum[i+9] >> 2)); 
+                d = raw_subtract_values(d,s);
+                baccum[i+6]=(baccum[i+6]&0xF0)|(d>>6);
+                baccum[i+9]=(baccum[i+9]&0x03)|(d<<2);
+
+
+                s =((0x300&(((unsigned short)bsub[i+9])<<8)) | (bsub[i+8])); 
+                d =((0x300&(((unsigned short)baccum[i+9])<<8)) | (baccum[i+8])); 
+                d = raw_subtract_values(d,s);
+                baccum[i+8]=d;
+                baccum[i+9]=(baccum[i+9]&0xFC)|(d>>8);
+            }
+            fwrite(baccum,1,RAW_ROWLEN,fdest);
+            if ( (j & 0x1F) == 0 ) {
+                gui_browser_progress_show((char *)dest, j*100/CAM_RAW_ROWS);
+            }
+        }
+        gui_browser_progress_show((char *)dest, 100);
+        finished();
+        status = 1;
+    }
+    free(baccum);
+    free(bsub);
+    if(ffrom) fclose(ffrom);
+    if(fsub) fclose(fsub);
+    if(fdest) {
+        fclose(fdest);
+         t.actime = t.modtime = time(NULL);
+         utime((char *)dest, &t);
+    }
+    return status;
+}
-
-int raw_merge_start(int action){

branches/juciphox/core/raw_merge.h

@@ -8 +8 @@
-void raw_merge_add_file(char * filename);
-void raw_merge_end(void);
-
+
-#endif

branches/juciphox/doc/version.txt

@@ -5 +5 @@
-
-log
+
+479 / 0.3.0
+PhyrePhoX (PP)
+
++ 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)
+
-
-474 / 0.2.7

branches/juciphox/include/camera.h

@@ -43 +43 @@
-
-    #undef  CAM_AF_SCAN_DURING_VIDEO_RECORD // CHDK can make single AF scan during video record 
+    #undef  CAM_HAS_VIDEO_BUTTON            // Camera can take stills in video mode, and vice versa
-
-//----------------------------------------------------------
@@ -533 +534 @@
-    #define CAM_ADJUSTABLE_ALT_BUTTON   1
-    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
+    #define  CAM_HAS_VIDEO_BUTTON       1
-
-
@@ -548 +550 @@
-    #undef  CAM_CAN_SD_OVER_NOT_IN_MF
-    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
+    #define  CAM_HAS_VIDEO_BUTTON       1
-
-
@@ -563 +566 @@
-    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
-    #undef  CAM_CHDK_HAS_EXT_VIDEO_MENU
+    #define  CAM_HAS_VIDEO_BUTTON       1
-
-

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 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

branches/juciphox/include/lolevel.h

@@ -43 +43 @@
-extern void __attribute__((noreturn)) _ExitTask();
-extern int _taskNameToId(char* taskName); // VxWorks only, task's name first letter must be 't', maximum 10 chars total 
+extern const char *_taskName(int taskID); // VxWorks only for now
+extern int _taskIdListGet(int *idlist,int max); // VxWorks only for now
-extern void _taskSuspend(int taskId); 
-extern void _taskResume(int taskId); extern long _GetPropertyCase(long opt_id, void *buf, long bufsize);

branches/juciphox/include/platform.h

@@ -66 +66 @@
-MODE_VIDEO_STITCH       ,
-MODE_VIDEO_MANUAL       ,
-                               
+    
-};
-
+// this is nasty, but not as nasty as checking each of the flags all over the place
+#define MODE_IS_VIDEO(m)   (((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_STD || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_SPEED ||  \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_COMPACT || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_MY_COLORS || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_COLOR_ACCENT || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_COLOR_SWAP || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_TIME_LAPSE || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_PORTRAIT || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_NIGHT || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_INDOOR || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_FOLIAGE || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_SNOW  || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_BEACH || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_AQUARIUM || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_SUPER_MACRO || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_STITCH || \
+                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_MANUAL)
-#if CAM_PROPSET == 2     // most digic3 cameras
- #define PROPCASE_DRIVE_MODE                                    102
@@ -144 +162 @@
-#define MODE_SCREEN_OPENED      0x0400
-#define MODE_SCREEN_ROTATED     0x0800
-
-#define AS_SIZE (sizeof(aperture_sizes_table)/sizeof(aperture_sizes_table[0]))
-#define ASID_MIN (aperture_sizes_table[0].id)
@@ -456 +473 @@
-long get_vbatt_min();
-long get_vbatt_max();
-short
+unsigned
-void ubasic_camera_set_raw(int mode);
-void ubasic_camera_set_nr(int mode);

branches/juciphox/include/stdlib.h

@@ -153 +153 @@
-extern long task_lock();
-extern long task_unlock();
+extern const char *task_name(int id);
+int task_id_list_get(int *idlist,int size);
-
-#define DOS_ATTR_RDONLY         0x01            /* read-only file */

branches/juciphox/lib/font/rbf_font.c

@@ -112 +112 @@
-
-        close(fd);
+        conf.menu_symbol_enable=(rbf_font.height>=rbf_symbol_font.height);
-        return 1;
-    }
@@ -168 +169 @@
-
-        close(fd);
+        conf.menu_symbol_enable=(rbf_font.height>=rbf_symbol_font.height);
-        return 1;
-    }

branches/juciphox/lib/ubasic/ubasic.c

@@ -433 +433 @@
-                r = get_battery_temp();
-                break;
+                default: // do something sane if given a bad index
+                        r = 0;
-  }
-    break;
@@ -1695 +1697 @@
-    to = expr();
-    int m=mode_get()&MODE_SHOOTING_MASK;
-
-
-
-
-
+
-#if CAM_HAS_MANUAL_FOCUS
-    if (shooting_get_focus_mode() || (mode_video)) shooting_set_focus(to, SET_NOW);

branches/juciphox/makefile.inc

@@ -4 +4 @@
-PLATFORMSUB=100a
-
+#PLATFORM=a620
+#PLATFORMSUB=100f
+
+#PLATFORM=ixus40_sd300
+#PLATFORMSUB=100k
+
-#PLATFORM=sx100is
-#PLATFORMSUB=100c
@@ -18 +24 @@
-#PLATFORM=ixus750_sd550
-#PLATFORMSUB=100g
-
-#PLATFORM=a620
-#PLATFORMSUB=100f
-
-#PLATFORM=a640

branches/juciphox/platform/generic/wrappers.c

@@ -55 +55 @@
-}
-
+#ifndef CAM_DRYOS
+const char *task_name(int id)
+{
+    return _taskName(id);
+}
+
+int task_id_list_get(int *idlist,int size)
+{
+    return _taskIdListGet(idlist,size);
+}
+#endif
+
-long get_property_case(long id, void *buf, long bufsize)
-{
@@ -138 +150 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

branches/juciphox/platform/ixus860_sd870/lib.c

@@ -17 +17 @@
-}
-
-
-
+
+
+
+
+
+
-
-void debug_led(int state)
@@ -29 +33 @@
-}
-
-
-
+
-void ubasic_set_led(int led, int state, int bright)
-{
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
-
-int get_flash_params_count(void){

branches/juciphox/version.inc

@@ -1 @@
-2.7
+3.0