diff -r 24d5513016f5 Makefile --- a/Makefile Sun Apr 08 18:54:31 2012 +0300 +++ b/Makefile Mon Apr 09 09:46:06 2012 +0300 @@ -19,19 +19,19 @@ $(MAKE) -C $(PLATFORM_PATH)/550D.109 600D: - $(MAKE) -C $(PLATFORM_PATH)/600D.102 + $(MAKE) -C $(PLATFORM_PATH)/600D.101 1100D: - $(MAKE) -C $(PLATFORM_PATH)/1100D.105 + $(MAKE) -C $(PLATFORM_PATH)/1100D.104 50D: - $(MAKE) -C $(PLATFORM_PATH)/50D.109 + $(MAKE) -C $(PLATFORM_PATH)/50D.108 500D: $(MAKE) -C $(PLATFORM_PATH)/500D.111 5D2: - $(MAKE) -C $(PLATFORM_PATH)/5D2.212 + $(MAKE) -C $(PLATFORM_PATH)/5D2.211 plugins: FORCE $(MAKE) -C $(PLUGINS_DIR) @@ -45,24 +45,24 @@ fir: cd installer/550D.109/; $(MAKE) clean cd installer/60D.110/; $(MAKE) clean - cd installer/600D.102/; $(MAKE) clean - cd installer/50D.109/; $(MAKE) clean + cd installer/600D.101/; $(MAKE) clean + cd installer/50D.108/; $(MAKE) clean cd installer/500D.111/; $(MAKE) clean - cd installer/5D2.212/; $(MAKE) clean + cd installer/5D2.211/; $(MAKE) clean $(MAKE) -C installer/550D.109/ $(MAKE) -C installer/60D.110/ - $(MAKE) -C installer/600D.102/ - $(MAKE) -C installer/50D.109/ + $(MAKE) -C installer/600D.101/ + $(MAKE) -C installer/50D.108/ $(MAKE) -C installer/500D.111/ - $(MAKE) -C installer/5D2.212/ + $(MAKE) -C installer/5D2.211/ install_fir: fir cp installer/550D.109/ml-550d-109.fir /media/EOS_DIGITAL/ cp installer/60D.110/ml-60d-110.fir /media/EOS_DIGITAL/ - cp installer/600D.102/ml-600d-102.fir /media/EOS_DIGITAL/ - cp installer/50D.109/ml-50d-102.fir /media/EOS_DIGITAL/ + cp installer/600D.101/ml-600d-101.fir /media/EOS_DIGITAL/ + cp installer/50D.108/ml-50d-108.fir /media/EOS_DIGITAL/ cp installer/500D.111/ml-500d-111.fir /media/EOS_DIGITAL/ - cp installer/5D2.212/ml-5D2-212.fir /media/EOS_DIGITAL/ + cp installer/5D2.211/ml-5D2-211.fir /media/EOS_DIGITAL/ clean: $(call build,CLEAN,$(RM) -f \ @@ -79,10 +79,10 @@ $(LUA_PATH)/liblua.a cd $(PLATFORM_PATH)/550D.109/; $(MAKE) clean cd $(PLATFORM_PATH)/60D.110/; $(MAKE) clean - cd $(PLATFORM_PATH)/600D.102/; $(MAKE) clean - cd $(PLATFORM_PATH)/50D.109/; $(MAKE) clean + cd $(PLATFORM_PATH)/600D.101/; $(MAKE) clean + cd $(PLATFORM_PATH)/50D.108/; $(MAKE) clean cd $(PLATFORM_PATH)/500D.111/; $(MAKE) clean - cd $(PLATFORM_PATH)/5D2.212/; $(MAKE) clean + cd $(PLATFORM_PATH)/5D2.211/; $(MAKE) clean $(MAKE) -C $(PLUGINS_DIR) clean $(RM) -rf $(BINARIES_PATH) diff -r 24d5513016f5 doc/wikidoc.py --- a/doc/wikidoc.py Sun Apr 08 18:54:31 2012 +0300 +++ b/doc/wikidoc.py Mon Apr 09 09:46:06 2012 +0300 @@ -47,7 +47,7 @@ __NOWYSIWYG__ -'''[[Unified/UserGuide|English]] | [[Unified/UserGuide/CZ|Česky]] | [[Unified/UserGuide/DE|Deutsch]] | [[Unified/UserGuide/NL|Dutch]] | [[Unified/UserGuide/ES|Español]] | [[Unified/UserGuide/FR|Français]] | [[Unified/UserGuide/IT|Italiano]] | [[Unified/UserGuide/RO|Română]] | [[Unified/UserGuide/RU|Russian]] | [[Unified/UserGuide/CHS|简体中文]] | [[Unified/UserGuide/JA|日本語]]''' +'''[[Unified/UserGuide|English]] | [[Unified/UserGuide/CZ|Česky]] | [[Unified/UserGuide/DE|Deutsch]] | [[Unified/UserGuide/NL|Dutch]] | [[Unified/UserGuide/ES|Español]] | [[Unified/UserGuide/FR|Français]] | [[Unified/UserGuide/IT|Italiano]] | [[Unified/UserGuide/RO|Română]] | [[Unified/UserGuide/RU|Русский]] | [[Unified/UserGuide/CHS|简体中文]] | [[Unified/UserGuide/JA|日本語]]''' """) diff -r 24d5513016f5 src/422-jpg.py --- a/src/422-jpg.py Sun Apr 08 18:54:31 2012 +0300 +++ b/src/422-jpg.py Mon Apr 09 09:46:06 2012 +0300 @@ -79,7 +79,7 @@ im = im.crop((cx,cy,w-cx,h-cy)) IM.paste(im, (j*im.size[0], i*im.size[1])) print - IM.save(output, quality=95) + IM.save(output, quality=100) def convert_422_bmp(input, output): @@ -117,8 +117,8 @@ w, h = 1576, 1048 elif len(data) == 1120*746*2: w, h = 1120, 746 # zoom mode (5x, 10x) on 5D2 - elif len(data) == 1872*1079*2: - w, h = 1872, 1079 # REC on 5D2 + elif len(data) == 1872*1080*2: + w, h = 1872, 1080 # REC on 5D2 elif len(data) % 1024*680*2 == 0: return convert_422_hires(input,output) else: diff -r 24d5513016f5 src/boot-hack.c --- a/src/boot-hack.c Sun Apr 08 18:54:31 2012 +0300 +++ b/src/boot-hack.c Mon Apr 09 09:46:06 2012 +0300 @@ -289,9 +289,7 @@ return; */ - #ifndef CONFIG_1100D - config_parse_file( CARD_DRIVE "magic.cfg" ); - #endif + config_init(); debug_init_stuff(); _hold_your_horses = 0; // config read, other overriden tasks may start doing their job diff -r 24d5513016f5 src/config.c --- a/src/config.c Sun Apr 08 18:54:31 2012 +0300 +++ b/src/config.c Mon Apr 09 09:46:06 2012 +0300 @@ -25,6 +25,8 @@ #include "config.h" #include "version.h" #include "bmp.h" +#include "property.h" +#include "menu.h" // Don't use isspace since we don't have it static inline int @@ -314,7 +316,7 @@ } void -config_autosave_toggle(void* priv) +config_autosave_toggle(void* priv, int delta) { config_flag_file_setting_save(CONFIG_AUTOSAVE_FLAG_FILE, !!config_autosave); msleep(50); @@ -332,7 +334,7 @@ if (!config_file_buf) { // if config file is not present, force Config Autosave: On - if (!config_autosave) config_autosave_toggle(0); + if (!config_autosave) config_autosave_toggle(0, 0); return 0; } config_file_pos = 0; @@ -370,3 +372,224 @@ struct config_var* get_config_vars_end() { return _config_vars_end; } + +const char * modenames[] = { + "P", // 0 + "Tv", // 1 + "Av", // 2 + "M", // 3 + "BULB", // 4 + "A-DEP", // 5 + "UNK-6", // 6 + "C1", // 7 + "UNK-8", // 8 + "Auto", // 9 + "Night", // A + "Sports", // B + "Portr.", // C + "Lands.", // D + "Macro", // E + "NoFlash", // F + "C2" , // 10 + "C3" , // 11 + "UNK-11" , // 12 + "CA" , // 13 + "MOVIE" , // 14 +}; + +int mode_specific_config; +#define MODE_SPECIFIC_CONFIG_FLAG_FILE CARD_DRIVE "MODE.CFG" + +static const char* get_config_file_name(int mode) +{ + static char fn[50]; + if (!mode_specific_config) + snprintf(fn, sizeof(fn), CARD_DRIVE "MAGIC.CFG"); + else if (mode >= 0 && mode <= 0x14) + snprintf(fn, sizeof(fn), CARD_DRIVE "%s.CFG", modenames[mode]); + else + snprintf(fn, sizeof(fn), CARD_DRIVE "UNK-%x.CFG", mode); + return fn; +} + +static int config_shootmode = -1; // mode for which the current config is loaded +static int config_init_done = 0; + +CONFIG_INT("remap.src.mode", remap_src_mode, 0); +CONFIG_INT("remap.dst.mode", remap_dst_mode, 0); +int mode_remap_dirty = 1; + +void propmode_reload_config(int mode) +{ + if (mode_specific_config && config_init_done) + { + info_led_on(); + + // save old config + if (config_autosave) save_config(); + + // update shooting mode + config_shootmode = mode; + + // read new config + load_config(); + redraw(); + + info_led_off(); + } +} + + +PROP_HANDLER(PROP_SHOOTING_MODE) +{ + msleep(100); + int remap_new_mode = remap_dst_mode-1; + if (remap_dst_mode) // mode remap enabled + { + if (remap_new_mode != buf[0] && remap_src_mode == buf[0] && is_valid_shooting_mode(remap_dst_mode-1)) // we just arrived in source mode, let's remap it + { + propmode_reload_config(remap_src_mode); + prop_request_change(PROP_SHOOTING_MODE, &remap_new_mode, 4); + } + else if (remap_new_mode == buf[0]) + { + // remapped mode, don't reload config, nothing to do + } + else + { + propmode_reload_config(buf[0]); + } + } + else // mode remap disabled + { + propmode_reload_config(buf[0]); + } +} + +void +mode_specific_config_toggle(void* priv, int delta) +{ + config_flag_file_setting_save(MODE_SPECIFIC_CONFIG_FLAG_FILE, !mode_specific_config); + msleep(50); + mode_specific_config = config_flag_file_setting_load(MODE_SPECIFIC_CONFIG_FLAG_FILE); + + if (mode_specific_config) // init default configs for each mode (copy current one) + { + for (int m = 0; m <= 0x14; m++) + { + char* f = get_config_file_name(m); + if (GetFileSize(f) <= 0) + config_save_file(f); + } + } + + load_config(); +} + +void save_config() +{ + config_save_file(get_config_file_name(config_shootmode)); +} + +void load_config() +{ + config_parse_file(get_config_file_name(config_shootmode)); +} + +void +delete_config( void * priv, int delta ) +{ + FIO_RemoveFile( get_config_file_name(config_shootmode) ); + if (config_autosave) config_autosave_toggle(0, 0); +} + +void delete_config_print( + void * priv, + int x, + int y, + int selected +) +{ + bmp_printf( + selected ? MENU_FONT_SEL : MENU_FONT, + x, y, + "Delete config file (%s)", + get_config_file_name(config_shootmode)+3 + ); + menu_draw_icon(x, y, MNI_ACTION, 0); +} + +void mode_remap_print( + void * priv, + int x, + int y, + int selected +) +{ + extern const char * modenames[]; + if (remap_dst_mode) + bmp_printf( + selected ? MENU_FONT_SEL : MENU_FONT, + x, y, + "Mode remapping : %s -> %s", + modenames[remap_src_mode], + modenames[remap_dst_mode-1] + ); + else + bmp_printf( + selected ? MENU_FONT_SEL : MENU_FONT, + x, y, + "Mode remapping : Disabled" + ); + + menu_draw_icon(x, y, MNI_BOOL(remap_dst_mode), 0); +} + +int is_valid_shooting_mode(int mode) +{ + switch(mode) + { + case SHOOTMODE_P: + case SHOOTMODE_TV: + case SHOOTMODE_AV: + case SHOOTMODE_M: + case SHOOTMODE_AUTO: + return 1; + + #if !defined(CONFIG_50D) && !defined(CONFIG_5D2) + case SHOOTMODE_MOVIE: + return 1; + #endif + + #if defined(CONFIG_60D) || defined(CONFIG_5D2) + case SHOOTMODE_BULB: + return 1; + #endif + } + return 0; +} + +void mode_remap_toggle(void* priv, int delta) +{ + if (remap_dst_mode && remap_src_mode != shooting_mode) + { + remap_dst_mode = 0; // we are in some other mode, disable and start from scratch + return; + } + + do + { + remap_dst_mode = mod(remap_dst_mode + delta, 0x16); // 0 = disable, others = other modes + } + while (remap_dst_mode && (!is_valid_shooting_mode(remap_dst_mode-1) || remap_dst_mode-1 == remap_src_mode)); + + remap_src_mode = shooting_mode; +} + +void config_init() +{ + mode_specific_config = config_flag_file_setting_load(MODE_SPECIFIC_CONFIG_FLAG_FILE); + config_shootmode = shooting_mode; + load_config(); + config_init_done = 1; +} diff -r 24d5513016f5 src/consts.h --- a/src/consts.h Sun Apr 08 18:54:31 2012 +0300 +++ b/src/consts.h Mon Apr 09 09:46:06 2012 +0300 @@ -7,11 +7,11 @@ #endif #ifdef CONFIG_600D -#include "../platform/600D.102/consts.h" +#include "../platform/600D.101/consts.h" #endif #ifdef CONFIG_50D -#include "../platform/50D.109/consts.h" +#include "../platform/50D.108/consts.h" #endif #ifdef CONFIG_500D @@ -19,10 +19,10 @@ #endif #ifdef CONFIG_1100D -#include "../platform/1100D.105/consts.h" +#include "../platform/1100D.104/consts.h" #endif #ifdef CONFIG_5D2 -#include "../platform/5D2.212/consts.h" +#include "../platform/5D2.211/consts.h" #endif diff -r 24d5513016f5 src/debug.c --- a/src/debug.c Sun Apr 08 18:54:31 2012 +0300 +++ b/src/debug.c Mon Apr 09 09:46:06 2012 +0300 @@ -102,36 +102,11 @@ } +extern void save_config(); +extern void delete_config(); + int config_ok = 0; -void - save_config( void * priv, int delta ) -{ - config_save_file( CARD_DRIVE "magic.cfg" ); -} -static void -delete_config( void * priv, int delta ) -{ - FIO_RemoveFile( CARD_DRIVE "magic.cfg" ); - if (config_autosave) config_autosave_toggle(0, 0); -} - -static void -config_autosave_display( - void * priv, - int x, - int y, - int selected -) -{ - bmp_printf( - selected ? MENU_FONT_SEL : MENU_FONT, - x, y, - "Config AutoSave : %s", - config_autosave ? "ON" : "OFF" - ); -} - #if CONFIG_DEBUGMSG static int vmax(int* x, int n) @@ -1668,7 +1643,7 @@ //~ extern int disp_pressed; //~ DEBUG("MovRecState: %d", MOV_REC_CURRENT_STATE); - //~ bmp_printf(FONT_LARGE, 50, 300, "%x ", MEM(0xa7170)); + //~ bmp_printf(FONT_LARGE, 50, 300, "%x ", shooting_mode); //~ maru(50, 50, liveview_display_idle() ? COLOR_RED : COLOR_GREEN1); //~ maru(100, 50, LV_BOTTOM_BAR_DISPLAYED ? COLOR_RED : COLOR_GREEN1); @@ -1760,6 +1735,8 @@ crash_log_requested = 0; } + //~ do_mode_remap(); + msleep(200); } } @@ -2298,15 +2275,14 @@ #endif }; +extern int mode_specific_config; +extern void mode_specific_config_toggle(void* priv, int delta); +extern void delete_config_print(void * priv, int x, int y, int selected); +extern void mode_remap_toggle(void* priv, int delta); +extern void mode_remap_print(void * priv, int x, int y, int selected); + static struct menu_entry cfg_menus[] = { { - .name = "Config AutoSave", - .priv = &config_autosave, - .display = config_autosave_display, - .select = config_autosave_toggle, - .help = "If enabled, ML settings are saved automatically at shutdown." - }, - { .name = "Save config now", .select = save_config, .help = "Save ML settings to MAGIC.CFG" @@ -2314,9 +2290,30 @@ { .name = "Delete config file", .select = delete_config, + .display = delete_config_print, .help = "Use this to restore ML default settings. Restart needed." }, - + { + .name = "Config AutoSave ", + .priv = &config_autosave, + .max = 1, + .select = config_autosave_toggle, + .help = "If enabled, ML settings are saved automatically." + }, + { + .name = "Mode-specific CFG ", + .priv = &mode_specific_config, + .max = 1, + .select = mode_specific_config_toggle, + .help = "If enabled, ML will use a separate CFG for each shoot mode." + }, + { + .name = "Mode remapping", + .display = mode_remap_print, + .select = mode_remap_toggle, + .icon_type = IT_BOOL, + .help = "Remap shooting modes (from the mode dial).", + } }; diff -r 24d5513016f5 src/fps-engio.c --- a/src/fps-engio.c Sun Apr 08 18:54:31 2012 +0300 +++ b/src/fps-engio.c Mon Apr 09 09:46:06 2012 +0300 @@ -53,7 +53,7 @@ static int fps_values_x1000[] = {150, 200, 250, 333, 400, 500, 750, 1000, 1500, 2000, 2500, 3000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 12000, 12500, 15000, 17000, 20000, 24000, 25000, 26000, 27000, 28000, 29000, 30000, 35000, 40000, 48000, 50000, 60000, 65000}; -static int fps_override = 0; +static CONFIG_INT("fps.override", fps_override, 0); static CONFIG_INT("fps.override.idx", fps_override_index, 10); // 1000 = zero, more is positive, less is negative diff -r 24d5513016f5 src/gui.h --- a/src/gui.h Sun Apr 08 18:54:31 2012 +0300 +++ b/src/gui.h Mon Apr 09 09:46:06 2012 +0300 @@ -10,11 +10,11 @@ #endif #ifdef CONFIG_600D -#include "../platform/600D.102/gui.h" +#include "../platform/600D.101/gui.h" #endif #ifdef CONFIG_50D -#include "../platform/50D.109/gui.h" +#include "../platform/50D.108/gui.h" #endif #ifdef CONFIG_500D @@ -22,11 +22,11 @@ #endif #ifdef CONFIG_1100D -#include "../platform/1100D.105/gui.h" +#include "../platform/1100D.104/gui.h" #endif #ifdef CONFIG_5D2 -#include "../platform/5D2.212/gui.h" +#include "../platform/5D2.211/gui.h" #endif @@ -48,7 +48,7 @@ #define MLEV_MENU_OPEN -13 #define MLEV_MENU_CLOSE -14 #define MLEV_MENU_REDRAW -15 - + /** \file * DryOS GUI structures and functions. diff -r 24d5513016f5 src/lv-img-engio.c --- a/src/lv-img-engio.c Sun Apr 08 18:54:31 2012 +0300 +++ b/src/lv-img-engio.c Mon Apr 09 09:46:06 2012 +0300 @@ -35,7 +35,7 @@ #define SHADOW_LIFT_REGISTER_7 0xc0f0f178 #define SHADOW_LIFT_REGISTER_8 0xc0f0ecf8 // more like ISO control (clips whites) -CONFIG_INT("digic.iso.gain", digic_iso_gain, 790); // units: like with the old display gain +CONFIG_INT("digic.iso.gain", digic_iso_gain, 1024); // units: like with the old display gain //~ CONFIG_INT("digic.shadow.lift", digic_shadow_lift, 0); // that is: 1024 = 0 EV = disabled // 2048 = 1 EV etc @@ -288,6 +288,8 @@ if (!lv) return; if (is_movie_mode() && lens_info.iso == 0) return; // no auto ISO, please + if (digic_iso_gain == 0) digic_iso_gain = 1024; + if (digic_iso_gain < 1024) { if (!is_movie_mode()) return; // has side effects in photo mode - interferes with auto exposure diff -r 24d5513016f5 src/movtweaks.c --- a/src/movtweaks.c Sun Apr 08 18:54:31 2012 +0300 +++ b/src/movtweaks.c Mon Apr 09 09:46:06 2012 +0300 @@ -80,14 +80,14 @@ void set_shooting_mode(int m) { if (shooting_mode == m) return; - ml_changing_shooting_mode = 1; + ml_changing_shooting_mode = m+1; prop_request_change(PROP_SHOOTING_MODE, &m, 4); msleep(200); ml_changing_shooting_mode = 0; } CONFIG_INT("movie.restart", movie_restart,0); -CONFIG_INT("movie.mode-remap", movie_mode_remap, 0); +//~ CONFIG_INT("movie.mode-remap", movie_mode_remap, 0); CONFIG_INT("movie.rec-key", movie_rec_key, 0); static void @@ -149,7 +149,7 @@ ); } -void do_movie_mode_remap() +/*void do_movie_mode_remap() { if (gui_state == GUISTATE_PLAYMENU) return; if (gui_menu_shown()) return; @@ -159,7 +159,7 @@ { ensure_movie_mode(); } -} +}*/ /* CONFIG_INT("dof.adjust", dof_adjust, 1); int get_dof_adjust() { return dof_adjust; } @@ -213,7 +213,7 @@ lens_set_rawiso(aperiso_rawiso); }*/ -static void +/*static void mode_remap_print( void * priv, int x, @@ -227,7 +227,7 @@ "MovieModeRemap: %s", movie_mode_remap == 1 ? MOVIE_MODE_REMAP_X_STR : movie_mode_remap == 2 ? MOVIE_MODE_REMAP_Y_STR : "OFF" ); -} +}*/ // start with LV //********************************************************************** @@ -389,7 +389,7 @@ if (!recording) movie_was_stopped_by_set = 0; - do_movie_mode_remap(); + //~ do_movie_mode_remap(); if (is_movie_mode()) { @@ -974,7 +974,7 @@ .select_reverse = movie_af_noisefilter_bump, .select_auto = movie_af_aggressiveness_bump, },*/ - #if !defined(CONFIG_50D) && !defined(CONFIG_5D2) +/* #if !defined(CONFIG_50D) && !defined(CONFIG_5D2) { .name = "MovieModeRemap", .priv = &movie_mode_remap, @@ -983,7 +983,7 @@ .help = "Remap movie mode to A-DEP, CA or C.", .essential = FOR_MOVIE, }, - #endif + #endif */ /*{ .priv = &as_swap_enable, .display = as_swap_print, diff -r 24d5513016f5 src/mvr.h --- a/src/mvr.h Sun Apr 08 18:54:31 2012 +0300 +++ b/src/mvr.h Mon Apr 09 09:46:06 2012 +0300 @@ -7,11 +7,11 @@ #endif #ifdef CONFIG_600D -#include "../platform/600D.102/mvr.h" +#include "../platform/600D.101/mvr.h" #endif #ifdef CONFIG_50D -#include "../platform/50D.109/mvr.h" +#include "../platform/50D.108/mvr.h" #endif #ifdef CONFIG_500D @@ -19,9 +19,9 @@ #endif #ifdef CONFIG_1100D -#include "../platform/1100D.105/mvr.h" +#include "../platform/1100D.104/mvr.h" #endif #ifdef CONFIG_5D2 -#include "../platform/5D2.212/mvr.h" +#include "../platform/5D2.211/mvr.h" #endif diff -r 24d5513016f5 src/reboot-all.c --- a/src/reboot-all.c Sun Apr 08 18:54:31 2012 +0300 +++ b/src/reboot-all.c Mon Apr 09 09:46:06 2012 +0300 @@ -38,11 +38,11 @@ #define SIG_60D_110 0xac958a1e // from FF010000 #define SIG_550D_109 0x851320e6 // from FF010000 -#define SIG_600D_102 0x27fc03de // from FF010000 +#define SIG_600D_101 0x290106d8 // from FF010000 #define SIG_500D_110 0x4c0e5a7e // from FF010000 -#define SIG_50D_109 0x4673ef59 // from FF010000 +#define SIG_50D_108 0xb2311152 // from FF010000 #define SIG_500D_111 0x44f49aef // from FF010000 -#define SIG_5D2_212 0xae78b938 // from FF010000 +#define SIG_5D2_211 0xaf79902b // from FF010000 asm( ".text\n" @@ -132,12 +132,12 @@ blob_end = &blob_end_60; RESTARTSTART = (void*)RESTARTSTART_60; return 1; - case SIG_600D_102: + case SIG_600D_101: blob_start = &blob_start_600; blob_end = &blob_end_600; RESTARTSTART = (void*)RESTARTSTART_600; return 1; - case SIG_50D_109: + case SIG_50D_108: blob_start = &blob_start_50; blob_end = &blob_end_50; RESTARTSTART = (void*)RESTARTSTART_50; @@ -148,7 +148,7 @@ blob_end = &blob_end_500; RESTARTSTART = (void*)RESTARTSTART_500; return 1; - case SIG_5D2_212: + case SIG_5D2_211: blob_start = &blob_start_5d2; blob_end = &blob_end_5d2; RESTARTSTART = (void*)RESTARTSTART_5D2; @@ -180,14 +180,14 @@ ".globl blob_start_600\n" "blob_start_600:\n" - ".incbin \"../600D.102/magiclantern.bin\"\n" // + ".incbin \"../600D.101/magiclantern.bin\"\n" // ".align 12\n" "blob_end_600:" ".globl blob_end_600\n" ".globl blob_start_50\n" "blob_start_50:\n" - ".incbin \"../50D.109/magiclantern.bin\"\n" // + ".incbin \"../50D.108/magiclantern.bin\"\n" // ".align 12\n" "blob_end_50:" ".globl blob_end_50\n" @@ -201,7 +201,7 @@ ".globl blob_start_5d2\n" "blob_start_5d2:\n" - ".incbin \"../5D2.212/magiclantern.bin\"\n" // + ".incbin \"../5D2.211/magiclantern.bin\"\n" // ".align 12\n" "blob_end_5d2:" ".globl blob_end_5d2\n" diff -r 24d5513016f5 src/shoot.c --- a/src/shoot.c Sun Apr 08 18:54:31 2012 +0300 +++ b/src/shoot.c Mon Apr 09 09:46:06 2012 +0300 @@ -80,7 +80,7 @@ lens_info.WBGain_R == 1024 && lens_info.WBGain_G == 1024 && lens_info.WBGain_B == 1024; } -CONFIG_INT("iso_selection", iso_selection, 1); +CONFIG_INT("iso_selection", iso_selection, 0); CONFIG_INT("hdr.enabled", hdr_enabled, 0); CONFIG_INT("hdr.frames", hdr_steps, 3); diff -r 24d5513016f5 src/tweaks.c --- a/src/tweaks.c Sun Apr 08 18:54:31 2012 +0300 +++ b/src/tweaks.c Mon Apr 09 09:46:06 2012 +0300 @@ -806,7 +806,7 @@ static void tweak_task( void* unused) { - do_movie_mode_remap(); + //~ do_movie_mode_remap(); int k; for (k = 0; ; k++) diff -r 24d5513016f5 src/zebra.c --- a/src/zebra.c Sun Apr 08 18:54:31 2012 +0300 +++ b/src/zebra.c Mon Apr 09 09:46:06 2012 +0300 @@ -2397,7 +2397,7 @@ bmp_printf( selected ? MENU_FONT_SEL : MENU_FONT, x, y, - "Display presets : %d", + "Display presets : %d", disp_profiles_0 + 1 ); } diff -r 24d5513016f5 toolchain/summon-arm --- a/toolchain/summon-arm Sun Apr 08 18:54:31 2012 +0300 +++ b/toolchain/summon-arm Mon Apr 09 09:46:06 2012 +0300 @@ -20,7 +20,7 @@ # You can also pass them as parameters to the script ############################################################################## TARGET=arm-elf # Or: TARGET=arm-elf -PREFIX=${HOME}/arm-toolchain462 # Install location of your final toolchain +PREFIX=${HOME}/arm-toolchain # Install location of your final toolchain DARWIN_OPT_PATH=/opt/local # Path in which MacPorts or Fink is installed # Set to 'sudo' if you need superuser privileges while installing SUDO=