Messages

This chapter should be visible when loading (add 'in' class) but is ok to collapse it

Code Select Expand

<div id="collapse-install" class="accordion-body collapse in">
      <div class="accordion-inner">


Maybe adding a button to expand all in one time ?

Code Select Expand

<script type="text/javascript">$(".collapse").collapse("show")</script>
or 'toggle' if you prefer

For QEMU captures, you could add a gallery like on the main page of ML http://www.magiclantern.fm/#carousel with specific image of each cam



5D3 pages (both firmware) has the firmware version repeated twice in the breadcrumb list :  » 5D Mark III 1.1.3 1.1.3



Features page: bad links for both 5D3 firmware, should be: 5D3 113, 5D3 123

Better like this?

Looks good! To be sure user clicks on accordion, add a chevron in the right of the button, like that
Minor update with the border under the button, add a little margin (8px like padding in alert) in your css:

Code Select Expand


.accordion-inner {
    padding: 9px 15px;
    margin-top: 8px;
    border-top: 1px solid #e5e5e5;
}


- Change order of item 1 and 2 in "Installation".

+1

Suggestions:
- Seperate sections "Test status", "Changes", "Useful links", "Statistics", "Logs"

-"Test status": Make "Test results" to stick out a bit and put single test results somewhere below.

Good Idea ! Maybe with tabs or accordion

I think, it's good to keep links to forum in cam main page (not hidden in tabs/accordion)

Design looks good and comprehensive (with tooltip info)
Maybe you could warn users when the build failed tests if it's "dangerous" to play with it (if a test is crucial for install it for exemple, maybe with a ponderation if needed)

About print screen, what do you think to add a gallery inside the build page ? like that or that

edit: got it working atexit to the rescue...

You're the best! 
If anymore ever complains about it, make a psychedelic flash of the warning 

Maybe this needs reworded in a different way?

It's perfect, but, is it possible to keep the warning on the screen when you run it with QEMU ?
In my case, I didn't see the warning (too stuff in parallels )

Guys, you're awesome!! 
Canon 5D3 113 on MacOS High Sierra! Happy!



@a1ex no module menu, need to enable Debug -> Modules debug -> Load modules after crash; reboot and module menu appear

[hg update qemu -C]

Oh I forgot, my workarround with sed grep to ggrep was solved with latest update from a1ex.

I guess if we´re updating to hg update qemu -C which seems needed there´s no need for these?:

Code Select Expand

sed -i '' 's/grep/ggrep/g' install.sh
sed -i '' 's/grep/ggrep/g' scripts/run_canon_fw.sh
?

Yes, say good by to my workarround

Now we use $GREP and set it to grep for linux and ggrep for macOS

In the script you could try to do that before running install.sh:

Code Select Expand


echo 'export PATH=~/gcc-arm-none-eabi-5_4-2016q3/bin:$PATH' >> ~/.bash_profile
. ~/.bash_profile


As a matter of fact after running sed replace brew complains when running the install.sh scrip.

Code Select Expand

Error: No available formula with the name "ggrep"

Code Select Expand

brew list grep
which ggrep
grep -V

@Danne 50D works well and 5D3 only show SD card test (32 bit bug)

Don't forget to update your repo to qemu branch

Code Select Expand

hg update qemu -C

And the install.sh look like that

[echo " make -j $(sysctl -n hw.physicalcpu)"]

echo "   make -j $(sysctl -n hw.physicalcpu)"

Code Select Expand

echo "   make -j`$GREP -c processor /proc/cpuinfo 2> /dev/null || sysctl -n hw.ncpu 2> /dev/null || echo 1`"
Works well on my MBP (Sierra and High Sierra), I don't have it with me to paste output

ohhh... update your local repo!!

Code Select Expand

sed -i '' 's/grep/ggrep/g' install.sh

That's the workarround, and don't forget:

Code Select Expand

sed -i '' 's/grep/ggrep/g' scripts/run_canon_fw.sh

Everywhere grep run with -P argument, we need to replace it with ggrep (not implemented in macOS grep)

Does the Mac run 32-bit binaries? If yes, can you try compiling a 32-bit GDB from source and place that one in PATH?

Until the next (2018? 2019?) release of MacOS it can run 32 bit without "compromise" https://developer.apple.com/news/?id=06282017a

@DeafEyeJedi could you copy past the commands and output from terminal, hard to read and could you edit manually contrib/qemu/install.sh and look at the end the grep -Po and if you don't have 'ggrep' the quick script failed to edit it. On my MacOS High Sierra VM freshly installed no problem with all commands ( try to copy past manually)

For those who have updated from macOS Sierra to macOS High Sierra, you need to reinstall gcc-5

Code Select Expand

brew reinstall gcc@5

take some beers and wait! 

Hopefully fixed, but unable to test right now.

You're the king!

@a1ex I would try to play with it, but I've an error with adtg module:

Code Select Expand

ML ASSERT:
new_entry->name
at ../../src/menu.c:1241 (menu_add_internal), task module_task
lv:0 mode:3

module_task stack: 1db7b8 [1dba50-1d7a50]
0xUNKNOWN  @ b68c8:1db878
0x00072678 @ a0f318:1db860
0x0006EA48 @ 726a4:1db848
0x0006EA48 @ 6ee30:1db818
0x00069FF0 @ 6ec90:1db7e8
0x00069868 @ 6a05c:1db7b8

Magic Lantern version : crop_rec_4k.2017Sep26.5D3113
Mercurial changeset   : 382dafb8a0bd (crop_rec_4k) tip
Built on 2017-09-25 23:32:14 UTC by jenkins@nightly.
Free Memory  : 134K + 3143K


It seems that there are a lot of changes in menu.c between crop_rec_4k and iso-research, I'll try to find how to solve it
https://bitbucket.org/hudson/magic-lantern/branches/compare/crop_rec_4k%0Diso-research#chg-src/menu.c

could probably be deleted...

On macOS Sierra and High Sierra for me yes

I forgot to add change for run_canon_fw.sh
edited my last post with changes

@Danne I didn't change permissions on /usr/local and didn't copy *.py


@a1ex what do you think about this change ? (for install.sh and run_canon_fw.sh)

Code Select Expand

tof-mbp:qemu tof$ diff run_canon_fw_tof.sh run_canon_fw.sh
3d2
< GREP=${GREP:=grep}
11c10
<     SD_DEV=`losetup -j $1 | $GREP -Po "(?<=/dev/)[^ ]*(?=:)"`
---
>     SD_DEV=`losetup -j $1 | grep -Po "(?<=/dev/)[^ ]*(?=:)"`
13c12
<         if cat /proc/mounts | $GREP /dev/mapper/$SD_DEV; then
---
>         if cat /proc/mounts | grep /dev/mapper/$SD_DEV; then
21c20
<     if [[ -n $(ls /Volumes | $GREP EOS_DIGITAL*) ]]; then
---
>     if [[ -n $(ls /Volumes | grep EOS_DIGITAL*) ]]; then
26,34d24
<     
<     if [[ -n $(which ggrep) ]]; then
<         GREP=ggrep
<     else
<         echo
<         echo "Error: you need GNU grep to run this script"
<         echo "brew install grep"
<         exit 1
<     fi
60c50
<     QEMU_EOS_DEBUGMSG=`cat $CAM/debugmsg.gdb | $GREP DebugMsg_log -B 1 | $GREP -Pom1 "(?<=b \*)0x.*"`
---
>     QEMU_EOS_DEBUGMSG=`cat $CAM/debugmsg.gdb | grep DebugMsg_log -B 1 | grep -Pom1 "(?<=b \*)0x.*"`

[Compiling Magic Lantern on macOS High Sierra]

Need to find a virgin Mac to try it out.

Virtualization 
I did it for you!



Compiling Magic Lantern on macOS High Sierra _{BETA (10.13 17A362a)}


It's an adaptation of @dfort commands, thanks to you !

Compiling ML + Modules + tools (like cr2hdr, mlv_dump, ..)

macos-high-sierra:~ tof$ xcode-select --install
macos-high-sierra:~ tof$ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
macos-high-sierra:~ tof$ brew install python wget mercurial
macos-high-sierra:~ tof$ pip2 install docutils
macos-high-sierra:~ tof$ brew tap homebrew/dupes; brew install homebrew/versions/gcc5
macos-high-sierra:~ tof$ cd ~ && wget https://launchpad.net/gcc-arm-embedded/4.8/4.8-2013-q4-major/+download/gcc-arm-none-eabi-4_8-2013q4-20131218-mac.tar.bz2 && tar -jxf gcc-arm-none-eabi-4_8-2013q4-20131218-mac.tar.bz2 && rm gcc-arm-none-eabi-4_8-2013q4-20131218-mac.tar.bz2
macos-high-sierra:~ tof$ hg clone https://bitbucket.org/hudson/magic-lantern
macos-high-sierra:~ tof$ cd magic-lantern
macos-high-sierra:magic-lantern tof$ hg update unified
macos-high-sierra:magic-lantern tof$ cat <<'EOT' > Makefile.user
#
# Host compiler settings
#
HOST_CC=gcc-5
HOST_LD=gcc-5
HOST_AR=$(shell which ar)
EOT
# OPTIONAL cross-compile
macos-high-sierra:~ tof$ brew install mingw-w64

Compiling QEMU

macos-high-sierra:magic-lantern tof$ brew install xz grep pkg-config glib automake libtool pixman mtools
macos-high-sierra:magic-lantern tof$ hg update qemu
macos-high-sierra:magic-lantern tof$ cd contrib/qemu/
# "Fix" for QEMU on macOS (need custom install.sh : change grep -P to ggrep -P)
# need to PR a great solution not a workarround, like PYTHON=python2, GREP=ggrep
# I don't want to replace macOS grep with GNU grep (prevent eventual bug), if you want: @dfort solution and ignore last command
macos-high-sierra:qemu tof$ sed -i '' 's/grep/ggrep/g' install.sh
macos-high-sierra:qemu tof$ sed -i '' 's/grep/ggrep/g' scripts/run_canon_fw.sh
macos-high-sierra:qemu tof$ ./install
# Follow next steps from output

We're ready for tomorrow 

You did it! Automated QC for our DSLR! All my Congrats!

I prefer storing all model-specific files under the $CAM/ directory (where the ROMs are), but otherwise, your change looks fine. Maybe even enabling only one card in the emulation.

It will be more beautiful to store under $CAM directory and name it cf.img and sd.img. I'll adapt my script to check in $CAM dir.
To use only one card, we need to know which cam use only SD, SD+CF and only CF to send the right card. Or maybe we can simulate one or the other.

I don't expect this to work, as it requires MPU communication. If it's a simple protocol, such as sending something about ISO and replying back the same code, it can be solved with custom MPU spells; if it requires some state, it's more difficult, as the current mpu.c is suitable mostly for replaying known messages.

The first step would be to log Canon messages during these actions (using the startup-log build or dm-spy-experiments branch) and understand what messages are for ISO, shutter and aperture, and how these should look like when changing them. Note the change may be initiated from the MPU (when pressing the buttons) or from the main CPU (when changing these parameters from ML menu).

These messages can be cross-checked with Leegong's notes.

Thanks for all these informations! I'll learn how to get and interpret these messages. Lot of stuff to read and learn 

[ggrep]

Ideally, those dependencies should be handled in the install script; will look into it.

To fix bug with MacOS, we need to install GNU grep with brew install grep. Personally I don't want to replace MacOS version, so we need to use ggrep instead of grep when -P argument is required.


What do you think about specific cards by model? (to avoid some bugs with wrong build)

I customized run_canon_fw.sh like that:

Code Select Expand


SD="sd.img"
CF="cf.img"

if [ "$CAM" ] && [ -f sd-$CAM.img ]; then
    SD="sd-$CAM.img"
fi

if [ "$CAM" ] && [ -f cf-$CAM.img ]; then
    CF="cf-$CAM.img"
fi

# run the emulation
env QEMU_EOS_DEBUGMSG="$QEMU_EOS_DEBUGMSG" \
  $QEMU_PATH/arm-softmmu/qemu-system-arm \
    -drive if=sd,format=raw,file=$SD \
    -drive if=ide,format=raw,file=$CF \
    -chardev socket,server,nowait,path=qemu.monitor,id=monsock \
    -mon chardev=monsock,mode=readline \
    -M $*



Some custom on mpu.c (QWERTZ keyboard, simulate numpad with TZU/GHJ/VBN)

Code Select Expand


    { 0x0014,   BGMT_PRESS_UP_LEFT,     "T",            "Joystick Up Left",             },
    { 0x0094,   BGMT_UNPRESS_UDLR,                                                      },
    { 0x002C,   BGMT_PRESS_UP,          "Z",            "Joystick Up",                  },
    { 0x00AC,   BGMT_UNPRESS_UDLR,                                                      },
    { 0x0016,   BGMT_PRESS_UP_RIGHT,    "U" ,           "Joystick Up Right",            },
    { 0x0096,   BGMT_UNPRESS_UDLR,                                                      },
    { 0x0022,   BGMT_PRESS_LEFT,        "G",            "Joystick Left",                },
    { 0x00A2,   BGMT_UNPRESS_UDLR,                                                      },
    { 0x0023,   BGMT_JOY_CENTER,        "H",            "Joystick center",              },
    { 0x00A3,   BGMT_UNPRESS_UDLR,                                                      },
    { 0x0024,   BGMT_PRESS_RIGHT,       "J",            "Joystick Right",               },
    { 0x00A4,   BGMT_UNPRESS_UDLR,                                                      },
    { 0x002F,   BGMT_PRESS_DOWN_LEFT,   "V",            "Joystick Down Left",           },
    { 0x00AF,   BGMT_UNPRESS_UDLR,                                                      },
    { 0x0030,   BGMT_PRESS_DOWN,        "B",            "Joystick Down",                },
    { 0x00B0,   BGMT_UNPRESS_UDLR,                                                      },
    { 0x0031,   BGMT_PRESS_DOWN_RIGHT,  "N",            "Joystick Down Right",          },
    { 0x00B1,   BGMT_UNPRESS_UDLR,                                                      },


Nothing happen (50D) when I press Joystick center (I try to play with settings (aperture, speed, ISO,..), for testing

Code Select Expand

Key event: 23 -> 0b01
[MPU] Sending : 06 05 06 0b 01 00
[MPU] Received: 06 05 04 00 09 00  (NotifyGUIEvent - spell #44)
[MPU] Sending : 06 05 04 00 09 01
[MPU] Received: 08 06 00 00 04 00 00 00  (unknown spell)
  1212:  2740.224 [MC] PROP_GUI_STATE 9
  1231:  2740.224 [MC] cam event guimode comp. 9
  1278:  2745.600 [DISP] TurnOnDisplay (PUB) Type=0 fDisplayTurnOn=1
[MPU] Received: 06 05 03 19 00 00  (spell #37)
Key event: a3 -> 0b00
[MPU] Sending : 06 05 06 0b 00 00

[50D 1.0.9]

Hi guys, I'm happy too !

After trying for a long time to get QEMU working on my Mac, it works now! 
I finally find how to solve the pixman compilation error.. it was really simple 

Code Select Expand

pixman-mmx.c:100:20: error: constraint 'K' expects an integer constant expression
        : "y" (__A), "K" (__N)

Solved with: brew install pixman

50D 1.0.9





5D3 1.1.3

Unable to play with Canon or ML menus, on startup I've "SD card test (0 --> 100)" and after test

Key has no effect. Try some branches and same bug, black screen (with 2 dots above "was not shut")
Output from terminal (I'll find why grep give an error; line 50 from run_canon_fw.sh; same bug as @dfort found, grep on MacOS)

I've found why, you explain it here, I'll try with debugmsg.gdb



Could you try another keys for keyboards without a numpad ? On my MacBook Pro I don't have one and I can't found keys for Joystick (8 directions & center).

QEMU Readme give a great help to start with emulation! Thanks

Many thanks a1ex to make our DSLR and now our computer to be so cool 

[everything]

Maybe a new one, with everything inside!! Who can do more can do less 

Thanks @Danne for the ideas !

Actually I'm a little bit perplex to add it in cr2hdr. I think a new plugin, Magic Lantern, could be a good idea to add every feature about it.
I'll ask @a1ex and @g3gg0

@NoCp_Albert the only way to determine if a file is a Dual ISO --> cr2hdr, so you need to import MLV and after that run cr2hdr.

When cr2hdr will be ready to chain it, I'll add an option in MLV import to run cr2hdr and try only the first picture if it's a Dual ISO.

@Danne wow thanks a lot !! 
Now I need to explode all your pipes for windows... 

What do you think about an Export plugin for these settings ?
Export to ProRes4444, ProRes proxy, HDR

And... it's always cr2hdr plugin ? or Magic Lantern plugin ?

@DeafEyeJedi yeah great news! There are 2 bugs that I fixed yesterday
You could create a new folder in LR and simply copy paste your MLV files inside (without Lightroom importation context). The only mandatory thing is that the folder is in the LR database (it's why you need to use an existing or a new one created by LR)

@Danne & @NoCp_Albert it could be a good idea!
Could you list me all features that you would like in the plugin ? Now I'm little bit confused with new features requested.

And need to be cross platform compatible.



Before to add new features, I'll merge MLV to final version and DEV status will be finished.
Could you confirm me that everything works well with DNG and MLV for you ?

After that, I'll move cr2hdr conversion to Library Plug-in Extras to be able to chain it with MLV and I'll add new features I think it's the good way!