View source
70D-merge
  • Contributors
    1. Loading...
Author Commit Message Date Builds
250+ commits behind unified.
nikfreak
Merged in 70D-cleanup (pull request #23) 70d cleanup
nikfreak
Close branch 70D-cleanup
nikfreak
Rename button codes and consts
nikfreak
Merged unified into 70D-cleanup
nikfreak
Created new branch 70D-cleanup
nikfreak
fix H.264 movie indicators
nikfreak
Merge unified
nikfreak
fix LiveViewApp_handler_BL_JudgeBottomInfoDispTimerState
nikfreak
add rice seasoning stubs
nikfreak
Merge unified and cleanup
nikfreak
cleanup
nikfreak
Merge unified
nikfreak
Created new branch 70D-merge052016
nikfreak
fix compile error
nikfreak
gui.h: adjust touch codes
nikfreak
re-enable CONFIG_TOUCHSCREEN
nikfreak
Merge unified
nikfreak
Merged in 70D-merge-latest (pull request #14) 70d merge latest
nikfreak
Close branch 70D-merge-latest
nikfreak
Disable TSKMON
nikfreak
Merge unified
nikfreak
Created new branch 70D-merge-latest
nikfreak
Merged in 70D-merge-update2 (pull request #11) 70d merge update2
nikfreak
Close branch 70D-merge-update2
nikfreak
Merge unified
nikfreak
Created new branch 70D-merge-update2
nikfreak
Merged in 70D-merge-update1 (pull request #9) 70d merge update1
nikfreak
Close branch 70D-merge-update1
nikfreak
define CONFIG_MENU_TIMEOUT_FIX
nikfreak
Merge unified
nikfreak
Created new branch 70D-merge-update1
nikfreak
Merge unified
nikfreak
Merge unified into 70D-merge
nikfreak
revert use of new task_dispatch_stub. It is not allowed to be used in "unified-only" and needs the full PR
nikfreak
Merge 70D-merge-other1
nikfreak
Merge unified
nikfreak
70D: update task_dispatch_hook stub
nikfreak
revert sl1 preps: opening up ML menu with fixed task_dispatch_hook possible
nikfreak
Merged in 70D-merge-other (pull request #6) 70d merge other
nikfreak
Close branch 70D-merge-other
nikfreak
70D: correct dependence checks for movie mode when trying to use arrow shortcuts
nikfreak
fix compilation error
nikfreak
help: adjust naming for arrow shortcuts
nikfreak
place menu warning regarding arrow shortcuts support (restricted for movie mode use only)
nikfreak
keep rec indicators active but disable bitrate features
nikfreak
70D: correct dependence checks for movie mode when trying to use arrow shortcuts
nikfreak
fix compilation error
nikfreak
help: adjust naming for arrow shortcuts
nikfreak
place menu warning regarding arrow shortcuts support (restricted for movie mode use only)
nikfreak
keep rec indicators active but disable bitrate features
nikfreak
Merge histogram tweaks
nikfreak
Merged hudson/magic-lantern/histogram-tweaks into histogram-tweaks
nikfreak
Created new branch histogram-tweaks
nikfreak
Created new branch 70D-merge-other1
nikfreak
70D: revert experiments and add flexinfo comment
nikfreak
70D: re-enable arrow shortcuts naming
nikfreak
disable touchscreen support (we got enough buttons to handle menu funcs)
nikfreak
re-enable arrow shortcuts as per forum request http://goo.gl/Yk2wLB
nikfreak
70D: adjust play mode features (zoom related) and unify PlayMain_handler
nikfreak
Created new branch 70D-merge-other
nikfreak
Added tag 70D_Beta2 for changeset c8d29fa5dcb4
nikfreak
Merge unified into 70D-merge
nikfreak
Merged in 70D-merge-cleanup-new (pull request #5) 70d merge cleanup new
nikfreak
Close branch 70D-merge-cleanup-new
nikfreak
70D: uncomment iso adjustment in consts as seen on 6D / 100D
nikfreak
70D: prepare bottom bar cleanups
nikfreak
Merge cleaner-lvapp-hack
nikfreak
70D: picstyle adjustments replicated as seen on unified branch
nikfreak
Merge unified
nikfreak
Created new branch 70D-merge-cleanup-new
nikfreak
Merged hudson/magic-lantern/unified into 70D-merge
nikfreak
70D: update stubs which had been marked for recheck earlier
nikfreak
backout cropmode hack for 70D (we got it in Canon menu and want to avoid confusions)
nikfreak
simplify arrow key toggling code as suggested
nikfreak
fix fw signature
nikfreak
prepare firmware signatures
nikfreak
don't override gui task as seen on 6D / 70D
nikfreak
boot-hack: we know that 100D needs to hijack gui task for sure -> adopt naming
nikfreak
Merge unified
nikfreak
boot-hack-cleanup: unify 6D / 70D macro and remove some 100D related porting notes
nikfreak
Merge unified into 70D-merge
nikfreak
nikfreak
Merged in 70D-merge-finalize4 (pull request #4) 70d merge finalize4
nikfreak
Close branch 70D-merge-finalize4
nikfreak
bring back HDR video, gradual exposure, fallback to APEX
nikfreak
re-order mismatched mvr values (tired or wtd?)
nikfreak
stabilize and cleanup before 1st beta release
nikfreak
Backout fps related commits 9e40b0c and 21ac2ea
nikfreak
70D: disable fps override (fallback to apex units)
nikfreak
Created new branch 70D-merge-finalize4
nikfreak
Merged in 70D-merge-finalize3 (pull request #3) 70d merge finalize3
nikfreak
Close branch 70D-merge-finalize3
nikfreak
70D: No one commented on HDR video. Looks like anyone is in need. My tests show it doesn't work
nikfreak
70D: avoid confusions regarding earlier disabled arrow shortcuts
nikfreak
disable dualiso in movie mode and leave a note: we can use cmos[0]+[3] for photo mode
nikfreak
70D: adjust crop info
nikfreak
70D: enable movie crop mode
nikfreak
70D:disable arrow shortcuts as implementation is quite inconvenient
nikfreak
Created new branch 70D-merge-finalize3
nikfreak
Merged in 70D-merge-finalize2 (pull request #2) 70d merge finalize2
nikfreak
Close branch 70D-merge-finalize2
nikfreak
70D: fix audio features: remote shot, meters and mlv sound
nikfreak
70D.111A: fix some audio stubs
nikfreak
70D: leave porting messages regarding focus features
nikfreak
70D: these focus features are buggy and don't work well
nikfreak
Merge 70D-merge into 70D-merge-finalize2
nikfreak
Backout testing leftover
nikfreak
enable movie rec key assignment (untested) as requested http://www.magiclantern.fm/forum/index.php?topic=14309.msg152553#msg152553
nikfreak
70D: re-enable audio features - will it crash again?
nikfreak
70D: trying to fix audio related problems
nikfreak
70D: add missing PowerMicAmp stub
nikfreak
Created new branch 70D-merge-finalize2
nikfreak
Merged unified into 70D-merge
nikfreak
70D: we now can slightly increase and unlimitedly decrease fps in all modes (timer_A only)
nikfreak
Merged in 70D-merge-finalize (pull request #1) 70d merge finalize
nikfreak
Close branch 70D-merge-finalize
nikfreak
70D: re-enable camera internals and focus features
nikfreak
leave a porting note for showing frame related values
nikfreak
nikfreak
nikfreak
70D: fix quickzoom to af point and place a note for new ports
nikfreak
70D: AF pattern related additions (prop_spy). quickzoom on AF works better but zoom position needs to be revisited
nikfreak
70D: disable camera internals (mainly frame_iso related)
nikfreak
70D: fix & finetune imgplay_zoom adresses / values
nikfreak
70D: disable electronic level / level indicator (freezes after ~1minute of use)
nikfreak
70D: disable EDMAC_RAW_SLURP (causes hot pixels)
nikfreak
Created new branch 70D-merge-finalize
nikfreak
nikfreak
nikfreak
Host logs on the web and place a download note (lesson learned)
nikfreak
logs: renaming / cleanup
nikfreak
Added tag 70D_Alpha6b for changeset 51cbd698f5d4
nikfreak
70D: rename log files (not to be merged in unified)
nikfreak
70D: added some logs (not to be merged in unified) based on Alpha6b release. @a1ex: sane?
nikfreak
cosmetical cleanup: remove blanks / space charcters
nikfreak
70D: disable frame shutter related constants
nikfreak
fine tune CONFIG_FPS_TIMER_A_ONLY
nikfreak
re-introduce CONFIG_FPS_TIMER_A_ONLY initially removed by 535d5528df21
nikfreak
allow compiling ettr module if FEATURE_RAW_ZEBRAS is undefined
nikfreak
add / replace firmware installers for 70D
nikfreak
nikfreak
70D: disable RAW zebras as they cause problems in quickreview and liveview
nikfreak
Merged unified into 70D-merge
nikfreak
70D: installer related adjustments
nikfreak
Merge unified into 70D-merge
nikfreak
Merge unified into 70D-merge and cleanup consts.h + gui.h for 70D according to unified branch
nikfreak
re-enable FPS features (needed to show shutter speed in MV and get EXPSim working again)
nikfreak
nikfreak
fix typo (missing O)
nikfreak
nikfreak
fix moving foxus box in MF for magic zoom (see http://www.magiclantern.fm/forum/index.php?topic=14309.msg148714#msg148714)
nikfreak
disable FPS features
nikfreak
70D only: LV_FOCUS_DATA is missing. disable focus_misc task
nikfreak
undefine focus related features (see link in comments for details)
nikfreak
update comments
nikfreak
revert bottom bar related experiments and add comments for future experiments
nikfreak
nikfreak
70D: force YUV zebras due to broken zebras in QR
nikfreak
undefine CONFIG_LV_FOCUS_INF as focus confirmation in MZ won't work for now
nikfreak
nikfreak
update camera internals
nikfreak
avoid unnecessary temperature discussions
nikfreak
Merge unified into 70D-merge
nikfreak
70D_111B: try new DLG_SIGNATURE
nikfreak
70D_111B: fix errCardForLVApp_hander
nikfreak
add fw_signature for 70D_111B
nikfreak
Merge unified into 70D-merge
nikfreak
move 70D_111B to "maintained"
nikfreak
fix ADTG registers for frame shutter blanking
nikfreak
70D consts.h: add JUDGE_BOTTOM_INFO_DISP_TIMER_STATE
nikfreak
Merge unified into 70D-merge
nikfreak
70D: update already known addresses in adtg module from dmspy branch
nikfreak
cleanup features.h (no code changes)
nikfreak
is_pure_play_photo_mode requires a different handler (fixes broken SET+MAINDIAL and others like ISo / Kelvin while recording)
nikfreak
replace hardcoded address like introcuded by dfe9ec9
nikfreak
Merge unified into 70D-merge
nikfreak
cosmetical cleanup (no code changes)
nikfreak
cleanup and fix adtg as well as dualiso modules (thx Jarno)
nikfreak
nikfreak
nikfreak
add subversion support to differ unique firmware versions
nikfreak
import both known 70D firmware revisions (hopefully there aren't more)
nikfreak
Created new branch 70D-merge