Author Topic: Magic Lantern USB Installation Tools  (Read 2463 times)

petabyte

  • New to the forum
  • *
  • Posts: 35
Magic Lantern USB Installation Tools
« on: July 18, 2021, 01:14:50 AM »
I've been working on a utility that should help with installing Magic Lantern.
Source code: https://github.com/petabyt/mlinstall

It currently can:

- Run Canon event procedures:
Based on some research in https://github.com/petabyt/sequoia-ptpy, I've
gotten Canon's `0x9052` PTP command to work properly. This allows for
commands like "EnableBootDisk" and "DisableBootDisk" to be run via PTP.
I think this command is standard on almost all Canon cameras, so it
could possibly replace custom firmware files. (?)

- Card Tools:
I've also added a card flag enabler (bootdisk, canon basic), and an
option to disable them without reformatting card.
(just writes an underscore on the first character of each)

Beware, little testing has been done and there is no guarantee this won't
break something or blow up your camera.


Releases: https://github.com/petabyt/mlinstall/releases

Windows Users:
You will most likely need to run Zadig and install libusb0.
https://petabyt.github.io/mlinstall/MANUAL#no-ptpusb-device-found

Walter Schulz

  • Contributor
  • Hero Member
  • *****
  • Posts: 8046
Re: Magic Lantern USB Installation Tools
« Reply #1 on: July 18, 2021, 04:14:32 AM »
Thanks!
Avoiding messing with custom firmware files and thus avoiding legal issues (without the need to access via UART) will have a big impact IMO!

Any plans to make it work on macOS?

petabyte

  • New to the forum
  • *
  • Posts: 35
Re: Magic Lantern USB Installation Tools
« Reply #2 on: July 18, 2021, 04:20:32 AM »
I think it should be pretty easy to get it to work. But the only Mac I have is an old iMac G4, which is probably too old.

The old python version (https://github.com/petabyt/mlinstall/tree/python-stable) should work on it.

Walter Schulz

  • Contributor
  • Hero Member
  • *****
  • Posts: 8046
Re: Magic Lantern USB Installation Tools
« Reply #3 on: July 18, 2021, 02:18:35 PM »
No hurry!

Another one: EOS M is not supported by gphoto2, Tornado EOS, EOS Webcam Utility. Has anyone tested your tools with EOS M?

petabyte

  • New to the forum
  • *
  • Posts: 35
Re: Magic Lantern USB Installation Tools
« Reply #4 on: July 18, 2021, 06:38:30 PM »
Not that I know of. I guess the safe way to check would be looking for the string "ExecuteEventProc" in a ram dump.

Ant123

  • Contributor
  • Member
  • *****
  • Posts: 175
Re: Magic Lantern USB Installation Tools
« Reply #5 on: July 19, 2021, 01:29:58 PM »
Does this mean that ptp command 0x9052 (36946) is not supported?
Quote
python3 ./print_device_info.py
Container:
    StandardVersion = 100
    VendorExtensionID = Microsoft
    VendorExtensionVersion = 100
    VendorExtensionDesc =
    FunctionalMode = 0
    OperationsSupported = ['GetDevicePropDesc', 'GetDevicePropValue', 'SetDevicePropValue', 'ResetDevicePropValue', 'GetDeviceInfo', 'OpenSession', 'CloseSession', 'CheckEvent', 36956, 36957, 'ChangeUSBProtocol', 'GetStorageIDs', 'GetStorageInfo', 'GetNumObjects', 'GetObjectHandles', 'GetObjectInfo', 'GetObject', 'GetThumb', 'GetPartialObject', 'SendObjectInfo', 'SendObject', 'DeleteObject', 'FormatStore', 'SetObjectProtection', 'GetObjectSize', 'GetObjectInfoEx', 'GetPartialObjectEx', 'GetObjectAttributes', 'SendPartialObject', 'GetObjectHandleByName', 'SetObjectTime', 'SetObjectArchive', 36940, 'SendObjectInfoByPath', 'SendObjectByPath', 36920, 36921, 36922, 36923, 36939, 36960, 36962, 38913, 38914, 38915, 38916, 38917, 'EOSGetEvent', 'EOSGetStorageIDs', 'EOSGetStorageInfo', 'EOSGetObjectInfo', 'EOSDeleteObject', 'EOSFormatStore', 'EOSGetPartialObject', 'EOSGetObjectInfoEx', 'EOSGetThumbEx', 'EOSSetObjectAttributes', 'EOSTransferComplete', 'EOSCancelTransfer', 37164, 37170, 37173, 37184, 37185, 37187, 'EOSPCHDDCapacity', 37183, 'EOSSetEventMode', 'EOSSetUILock', 'EOSResetUILock', 'EOSKeepDeviceOn', 37181, 37174, 37175, 'EOSSetRemoteMode', 'EOSGetViewFinderImage', 'EOSRemoteReleaseOn', 'EOSRemoteReleaseOff', 'EOSZoom', 'EOSZoomPosition', 'EOSDoAf', 'EOSAfCancel', 'EOSDriveLens', 37211, 36911, 'EOSSetDevicePropValueEx', 'EOSRequestDevicePropValue', 37250, 37251, 37252, 37253, 36944, 36945]
    EventsSupported = ['CancelTransaction', 'ObjectAdded', 'ObjectRemoved', 'StoreAdded', 'StoreRemoved', 'DevicePropChanged', 'ObjectInfoChanged', 'DeviceInfoChanged', 'RequestObjectTransfer', 'StoreFull', 'DeviceReset', 'StorageInfoChanged', 'UnreportedStatus', 49153, 49157, 49162, 49409]
    DevicePropertiesSupported = [53317, 53322, 53294, 53295, 'BatteryLevel', 53250, 'ViewfinderMode', 'UnixTime', 53319, 53318, 53296, 53321, 'CameraModel', 'CameraOwner', 'FlashMemory', 53328, 53329, 53330, 53331, 53332, 53335, 54274, 54278, 54279, 54019]
    CaptureFormats = ['EXIF_JPEG']
    ImageFormats = ['Association', 'Script', 'DPOF', 'WAV', 'EXIF_JPEG', 'UndefinedImage', 'CRW3', 47490, 45317, 48897]
    Manufacturer = Canon Inc.
    Model = Canon EOS M3
    DeviceVersion = 3-14.0.1.0
    SerialNumber = *

petabyte

  • New to the forum
  • *
  • Posts: 35
Re: Magic Lantern USB Installation Tools
« Reply #6 on: July 19, 2021, 07:21:42 PM »
I guess not, assuming Canon didin't change the command ID or anything.

Ant123

  • Contributor
  • Member
  • *****
  • Posts: 175
Re: Magic Lantern USB Installation Tools
« Reply #7 on: July 19, 2021, 07:58:08 PM »
I already found that the command 0x9052 becomes available after calling the command 0x9050 three times.

petabyte

  • New to the forum
  • *
  • Posts: 35
Re: Magic Lantern USB Installation Tools
« Reply #8 on: July 19, 2021, 07:59:45 PM »
Interesting, do you know why?

Ant123

  • Contributor
  • Member
  • *****
  • Posts: 175
Re: Magic Lantern USB Installation Tools
« Reply #9 on: July 19, 2021, 08:15:18 PM »
Just because of Canon's firmware:
Code: [Select]
uint handle_PTP_OC_0x9050
               (undefined4 param_1,undefined4 *param_2,undefined4 param_3,undefined4 param_4,
               undefined4 param_5)

{
  uint uVar1;
  uint uVar2;
  uint uVar3;
  uint uVar4;
  uint uVar5;
  uint uVar6;
  uint uVar7;
  undefined2 local_38 [2];
  undefined4 local_34;
  undefined4 uStack48;
  undefined4 local_2c;
 
  uVar7 = 0;
  j_bzero(local_38,0x24);
  uStack48 = param_5;
  local_2c = 0;
  DAT_0000ef68 += 1;
  local_34 = param_4;
  if (DAT_0000ef68 == 3) {
    uVar1 = add_ptp_handler(&DAT_00009052,handle_PTP_OC_0x9052 + 1,0);
    uVar2 = add_ptp_handler(&DAT_00009053,handle_PTP_OC_0x9053 + 1,0);
    uVar3 = add_ptp_handler(&DAT_00009057,handle_PTP_OC_0x9057 + 1,0);
    uVar4 = add_ptp_handler(&DAT_00009058,handle_PTP_OC_0x9058 + 1,0);
    uVar5 = add_ptp_handler(&DAT_00009059,handle_PTP_OC_0x9059 + 1,0);
    uVar6 = add_ptp_handler(&DAT_0000905a,handle_PTP_OC_0x905a + 1,0);
    uVar7 = add_ptp_handler(&DAT_0000905b,handle_PTP_OC_0x905b + 1,0);
    uVar7 |= uVar6 | uVar5 | uVar4 | uVar3 | uVar2 | uVar1;
    DAT_0000ef64 = 1;
  }
  if ((uVar7 & 1) == 0) {
    local_38[0] = 0x2001;
    (*(code *)param_2[3])(*param_2,local_38);
  }
  else {
    local_38[0] = 0x201f;
    (*(code *)param_2[3])(*param_2,local_38);
    uVar7 = 1;
  }
  return uVar7;
}


petabyte

  • New to the forum
  • *
  • Posts: 35
Re: Magic Lantern USB Installation Tools
« Reply #10 on: July 19, 2021, 08:24:19 PM »
I already found that the command 0x9052 becomes available after calling the command 0x9050 three times.

Have you tried calling 0x9052 after doing that?

Ant123

  • Contributor
  • Member
  • *****
  • Posts: 175
Re: Magic Lantern USB Installation Tools
« Reply #11 on: July 19, 2021, 08:28:09 PM »
Yes. It works.

Ant123

  • Contributor
  • Member
  • *****
  • Posts: 175
Re: Magic Lantern USB Installation Tools
« Reply #12 on: July 19, 2021, 09:21:11 PM »
Is there the way to run event procedures with arguments?

petabyte

  • New to the forum
  • *
  • Posts: 35
Re: Magic Lantern USB Installation Tools
« Reply #13 on: July 19, 2021, 09:36:06 PM »
Yes, I think you can send integer arguments simply via the standard PTP arguments.

I've set up https://github.com/petabyt/sequoia-ptpy to work like this:
`camera.eos_run_command("EnableBootDisk", [1, 2, 3])`

petabyte

  • New to the forum
  • *
  • Posts: 35
Re: Magic Lantern USB Installation Tools
« Reply #14 on: August 04, 2021, 07:30:25 PM »
I've added a few more features to the app:
- Redo UI with a GTK "notebook"
- Add "Make card scriptable"
- Add "Make card un-scriptable"
- Add credits and license
- Add button hints
- Better error messages

https://github.com/petabyt/mlinstall/releases/tag/0.1.3

shadowlab

  • New to the forum
  • *
  • Posts: 3
Re: Magic Lantern USB Installation Tools
« Reply #15 on: August 08, 2021, 02:25:10 AM »
Big thanks for your help. It saves the lazy hardware guys (me) from having to crack open their cameras to get the full features of their devices.

Windows 10 wouldn't work correctly, as it doesn't install a standard PTP driver for my 1600D, so I booted up into a LiveUSB version of Ubuntu 21 and ran your linux version succesfully.

petabyte

  • New to the forum
  • *
  • Posts: 35
Re: Magic Lantern USB Installation Tools
« Reply #16 on: August 08, 2021, 09:45:16 PM »
I was able to reproduce it on Windows 10. Looking for a solution...

petabyte

  • New to the forum
  • *
  • Posts: 35
Re: Magic Lantern USB Installation Tools
« Reply #17 on: August 09, 2021, 03:44:41 AM »
Apparently I forgot that I had installed libusb in my Windows 7 testing VM, so
I wasn't aware of this issue.

A quick solution is to download Zadig (https://zadig.akeo.ie/) and replace WinUSB with
libusb-win32. Here's a GIF animation showing exactly what to do:
https://petabyt.github.io/mlinstall/MANUAL#no-ptpusb-device-found

If this doesn't work, please let me know.

petabyte

  • New to the forum
  • *
  • Posts: 35
Re: Magic Lantern USB Installation Tools
« Reply #18 on: August 26, 2021, 04:41:56 PM »
Experiment for a "one click install": https://diode.zone/w/5BDpMTeBhgZ4mEVXu6QRQj
Plug in camera + SD card, and click a button to fully install Magic Lantern.

PTP is used to detect model/firmware version, and the correct Magic Lantern build
is unzipped into the SD card. The bootdisk flag and the card flags are written as well.

Also see the Github issue: https://github.com/petabyt/mlinstall/issues/2

This is just a proof-of-concept to see if it would work. It won't be released any time soon, if
it is released at all. Feedback/ideas for this are welcome.

theBilalFakhouri

  • Developer
  • Hero Member
  • *****
  • Posts: 703
Re: Magic Lantern USB Installation Tools
« Reply #19 on: September 15, 2021, 06:05:14 AM »
Thanks petabyte, Enabling/Disabling Boot Disk works fine on 700D/5D3, also tested custom event procedure and it works fine on both cameras
 
I had "No PTP/USB device found" issue on Windows 10, and doing the following fixes the problem:

A quick solution is to download Zadig (https://zadig.akeo.ie/) and replace WinUSB with
libusb-win32. Here's a GIF animation showing exactly what to do:
https://petabyt.github.io/mlinstall/MANUAL#no-ptpusb-device-found

Please add this as note for Windows users in OP :D

Great work!
700D 1.1.5 | no more ISOless LV err 8 / SDR104 @ 240 MHz - Constant! | Fixed Scrambled LiveView in Higher resolution | Real-Time correct framing in the Way

petabyte

  • New to the forum
  • *
  • Posts: 35
Re: Magic Lantern USB Installation Tools
« Reply #20 on: September 15, 2021, 04:34:27 PM »
Sure. Although I would think that the MANUAL.txt in the zip file and the note in the release description would be enough...

Thanks for testing!

petabyte

  • New to the forum
  • *
  • Posts: 35
Re: Magic Lantern USB Installation Tools
« Reply #21 on: September 23, 2021, 04:33:18 PM »
Version 0.7 released.

https://github.com/petabyt/mlinstall/releases/tag/0.7

- Added an untested activator for 0x9052 as per Ant123's findings (https://www.magiclantern.fm/forum/index.php?topic=26162.msg236146#msg236146)
Still not sure what models require it, so it's just a button for now.

- Added a "module store"
I thought this would be a cool idea. You can plug the SD card into your computer and install modules, just like an app store on a smartphone. Here's a demonstration: https://diode.zone/w/4u1GYt88LP5h9t53C1fWNE


As I add more stuff, I'm starting to think that "ML Install" might not be the best name for this project.
I had thought about "Magic Lantern Desktop App", but I wanted to get an OK from the ML team before
I made any changes. That being said, it would go nicely alongside the Wifi Android app proof-of-concept
I shared recently: https://diode.zone/w/cGnnBDjSmjFiYFVVn7rzR2