Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
hg update 7a3b5fa3f4c6hg pull -r 8253876a38df https://bitbucket.org/nikfreak/magic-lantern# Note: This will create a new head!hg merge 8253876a38dfhg commit -m 'Merged in nikfreak/magic-lantern/70D_merge_fw112 (pull request #760)'
Finally Canon released the first firmware update for the 70D. This PR:
is adding ML support for FW 1.1.2
is getting rid of the two firmware revisions 1.1.1 (handling pain, see forum thread)
is deleting unmaintained references
Tested myself for the last few days:
Installer works w/o problems
All enabled features seem to work w/o problems
Formatting card and keeping ML works etc.
Stubtest from selftest.mo passes with zero fails
Kept the amount of commits as small as possible for this PR
Let me know what I can further do to get this merged. Some things don't work well like
dual iso in video mode
raw zebras in QR mode
Fixing them unfortuantely seems out of my scope. This state seems to be best I could do on my own and I vote for a merge (even with some of the features not working) and getting rid of older branches and references to the 70D (nanomad's repo, even my own working repos etc.)
This build seems to be solid so far for the 70D.112 however I will double check everything just to be sure since @nikfreak updated this build (Beta-4a / 26th Oct) again just a few days ago.
Does issue #1816 apply to 70D as well? Looks like 6D and EOS M are affected, not sure about 650D/700D yet.
Must have been sleeping while starting from scratch for 1.1.2 cause on 1.1.1 it was implemented.