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 flexinfo_600D https://bitbucket.org/600dplus/magiclantern_eyefi_trick_cleanup# Note: This will create a new head!hg merge flexinfo_600Dhg commit -m 'Merged in 600dplus/magiclantern_eyefi_trick_cleanup/flexinfo_600D (pull request #957)'
Nitpick: I’m going to get rid of Canon fonts, as new models no longer have them.
Will try it after merging lua_fix; need to check if memory is still an issue then.
These info tricks should be unified for all Rebel models; @walter_schulz mentioned it somewhere; will look it up later.
Agree for Rebels unifications; but I can only work on 600D so need help from who has the other Rebels model like for the GUIMODES for Rebelgui module, but so far nobody seems interessed.
Just for info, I’m using a working branch (scrax) on my cloned repo, that has all my last edits for 600D (rename module, rebelgui and cmodes module, auto audio override for audio remote shoot, flexinfo and more shortcut) and lua_fix merged and works ok with flexinfo enabled (like on unified).
About Canon fonts, what you suggest to use instead?
I used them where they are extending canon GUI like for Kelvin or TRAPFOCUS to have consistency. Also using them in rebelgui module for same reason.
Tried with FONT_LARGE but it’s not so nice. Maybe can we have something like #ifndef CANON_FONTS instead of removing them from the models that has them?