SuccessChanges

Summary

  1. Merged in installer (pull request #631) New installers
  2. Close branch installer
  3. New FIR binaries
  4. Installer: updated for 700D.114 and 6D.116
  5. Merge
  6. Consts cleanup
  7. Dropped 700D.113
  8. Merged in mk11174/700d114 (pull request #628) Update 700D.113 to 700D.114 FW
  9. Merged hudson/magic-lantern into unified
  10. 700D.114 Stubs task_max reg fix
  11. Port ML to 700D FW 114
  12. Copied 700D.113 to 700D.114 to prepare for 1.1.4 FW
  13. Dropped 6D.113
  14. Merged in Maqs/magic-lantern/6D.116 (pull request #634) Support for 6D firmware version 1.1.6
  15. gui.h: moved 3 half-shutter button codes to gui-common.c (for 6D.116)
  16. consts.h: removed some unused entries (6D.116)
  17. Merged unified into 6D.116
  18. Merged in unified
  19. StateObject addresses - should hopefully fix raw recording
  20. Updated io_crypt.mo for 6D.116
  21. Updated adtg_gui.mo for 6D.116
  22. Updated dual_iso.mo for 6D.116
  23. As bitrate-6d.o is disabled anyway, we can at least go for bitrate-5d3.o until it has been fixed.
  24. Merged in unified
  25. firmware signature for 6D.116 (thanks JL!)
  26. get 6D.116 new-sound-system ready - CONFIG_BEEP still needs to be uncommented after merging in new-sound-system.
  27. installer support for 6D.116 (hopefully)
  28. Renamed JUDGEBOTTOMINFODISPTIMERSTATE to JUDGE_BOTTOM_INFO_DISP_TIMER_STATE.
  29. Merged in unified
  30. comment out stub SetAudioVolumeIn intentionally, as it is only used in bitrate-6d.c (not ported, considered harmful).
  31. JUDGEBOTTOMINFODISPTIMERSTATE for 6D.116
  32. merge from unified
  33. mlv_rev: add 6D.116 support
  34. raw_rev: add 6D.116 support
  35. Initial 6D.116 port
  36. Installer: forgot to clear the screen before uninstallation
  37. Installer: fine-tuned 70D error message
  38. Installer: also check for ML and ML/FONTS directories
  39. Installer: better alignment for bootflags display
  40. Installer: allow arbitrary font sizes
  41. Installer for 5D3 1.1.3: fix loading the FIR on 1.3.3
  42. Installer: reset the powersave timer while waiting for uninstallation
  43. Installer: fix bogus message right before uninstallation
  44. Installer: fix make clean
  45. Installer: enabled 7D in main installer makefile
  46. Installer: fine-tuned messages about ROM dumping, fixed alignment
  47. Installer: updated 7D
  48. Merged unified into installer
  49. Installer: customized error message for 70D
  50. Reboot: removed 0x120 FIR offset (already handled by FIR_BASE); no more dependency on 'truncate' :)
  51. Autoexec checksum: fix building as FIR
  52. Installer: use a 60-seconds timer for uninstallation
  53. Installer: backup ROM before doing anything, and tell the user to store these files in a safe place
  54. Merged portable-error-messages into installer
  55. Installer: tweaked countdown message to reduce confusion for new users
  56. Installer: use a single FIR name for all cameras (ML-SETUP.FIR)
  57. Installer: fix building all installers at once
  58. Installer: support for 600D (not tested, copied from bc1b8f5)
  59. Installer: cleaned up old platforms
  60. Merged unified into installer
  61. Installer: display a nice error message if Canon firmware is not the one ML expects
Changeset 11138:db3ebdf8fd05 by a1ex <broscutamaker@gmail.com>:
Merged in installer (pull request #631)<br><br>New installers
Changeset 11137:171dbb535ca5 by a1ex <broscutamaker@gmail.com>:
Close branch installer
Changeset 11136:545e081bf949 by Alex:
New FIR binaries
The file was addedplatform/1100D.105/ML-SETUP.FIR
The file was addedplatform/500D.111/ML-SETUP.FIR
The file was addedplatform/50D.109/ML-SETUP.FIR
The file was addedplatform/550D.109/ML-SETUP.FIR
The file was addedplatform/5D2.212/ML-SETUP.FIR
The file was addedplatform/5D3.113/ML-SETUP.FIR
The file was addedplatform/600D.102/ML-SETUP.FIR
The file was addedplatform/60D.111/ML-SETUP.FIR
The file was addedplatform/650D.104/ML-SETUP.FIR
The file was addedplatform/6D.116/ML-SETUP.FIR
The file was addedplatform/700D.114/ML-SETUP.FIR
The file was addedplatform/7D.203/ML-SETUP.FIR
The file was addedplatform/EOSM.202/ML-SETUP.FIR
The file was removedplatform/1100D.105/1100D105.fir
The file was removedplatform/500D.111/500D_111.fir
The file was removedplatform/50D.109/50D_109.fir
The file was removedplatform/5D2.212/5D2_212.fir
The file was removedplatform/5D3.113/5D3_113.FIR
The file was removedplatform/60D.111/60D__111.FIR
The file was removedplatform/650D.104/650D_104.fir
The file was removedplatform/7D.203/7D_203.fir
The file was removedplatform/EOSM.202/EOSM_202.fir
Changeset 11135:80514689dae2 by Alex:
Installer: updated for 700D.114 and 6D.116
The file was modifiedinstaller/6D.116/Makefile (diff)
The file was modifiedplatform/6D.116/Makefile.platform.default (diff)
The file was removedinstaller/700D.113/Makefile
Changeset 11134:e784fb221317 by Alex:
Merge
Changeset 11133:7ce6bcf87fc7 by Alex:
Consts cleanup
The file was modifiedplatform/6D.116/gui.h (diff)
The file was modifiedplatform/700D.114/consts.h (diff)
The file was modifiedplatform/700D.114/gui.h (diff)
The file was removedplatform/1100D.105/consts-600d.101.h
Changeset 11132:ab3d4d18f63c by Alex:
Dropped 700D.113
The file was removedplatform/700D.113/700D_113.fir
The file was removedplatform/700D.113/Makefile
The file was removedplatform/700D.113/Makefile.platform.default
The file was removedplatform/700D.113/Makefile.setup.default
The file was removedplatform/700D.113/cfn.c
The file was removedplatform/700D.113/consts.h
The file was removedplatform/700D.113/features.h
The file was removedplatform/700D.113/gui.h
The file was removedplatform/700D.113/include/platform/mvr.h
The file was removedplatform/700D.113/include/platform/state-object.h
The file was removedplatform/700D.113/internals.h
The file was removedplatform/700D.113/stubs.S
Changeset 11131:8ed712572e91 by a1ex <broscutamaker@gmail.com>:
Merged in mk11174/700d114 (pull request #628)<br><br>Update 700D.113 to 700D.114 FW
Changeset 11130:f18d9a609ef1 by Mathew Kelly <dkelly11@tampabay.rr.com>:
Merged hudson/magic-lantern into unified
Changeset 11129:0d7b9babeada by mk11174:
700D.114 Stubs task_max reg fix
The file was modifiedplatform/700D.114/stubs.S (diff)
Changeset 11128:a546ac12b5eb by mk11174:
Port ML to 700D FW 114
The file was modifiedinstaller/Makefile (diff)
The file was modifiedmodules/adtg_gui/adtg_gui.c (diff)
The file was modifiedmodules/dual_iso/dual_iso.c (diff)
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
The file was modifiedmodules/raw_rec/raw_rec.c (diff)
The file was modifiedplatform/700D.114/Makefile.platform.default (diff)
The file was modifiedplatform/700D.114/consts.h (diff)
The file was modifiedplatform/700D.114/internals.h (diff)
The file was modifiedplatform/700D.114/stubs.S (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
The file was modifiedsrc/fw-signature.h (diff)
Changeset 11127:590323501cdb by mk11174:
Copied 700D.113 to 700D.114 to prepare for 1.1.4 FW
The file was addedinstaller/700D.114/Makefile
The file was addedplatform/700D.114/Makefile
The file was addedplatform/700D.114/Makefile.platform.default
The file was addedplatform/700D.114/Makefile.setup.default
The file was addedplatform/700D.114/cfn.c
The file was addedplatform/700D.114/consts.h
The file was addedplatform/700D.114/features.h
The file was addedplatform/700D.114/gui.h
The file was addedplatform/700D.114/include/platform/mvr.h
The file was addedplatform/700D.114/include/platform/state-object.h
The file was addedplatform/700D.114/internals.h
The file was addedplatform/700D.114/stubs.S
Changeset 11126:8f6c53e0480e by Alex:
Dropped 6D.113
The file was modifiedmodules/adtg_gui/adtg_gui.c (diff)
The file was modifiedmodules/dual_iso/dual_iso.c (diff)
The file was modifiedmodules/io_crypt/io_crypt.c (diff)
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
The file was modifiedmodules/raw_rec/raw_rec.c (diff)
The file was removedplatform/6D.113/ML-6D113.FIR
The file was removedplatform/6D.113/Makefile
The file was removedplatform/6D.113/Makefile.platform.default
The file was removedplatform/6D.113/Makefile.setup.default
The file was removedplatform/6D.113/afma.h
The file was removedplatform/6D.113/cfn.c
The file was removedplatform/6D.113/consts.h
The file was removedplatform/6D.113/features.h
The file was removedplatform/6D.113/gui.h
The file was removedplatform/6D.113/include/platform/mvr.h
The file was removedplatform/6D.113/include/platform/state-object.h
The file was removedplatform/6D.113/internals.h
The file was removedplatform/6D.113/stubs.S
Changeset 11125:5ae6da983a38 by a1ex <broscutamaker@gmail.com>:
Merged in Maqs/magic-lantern/6D.116 (pull request #634)<br><br>Support for 6D firmware version 1.1.6
Changeset 11124:2853926a679d by Maqs <marcus@eunomia.de>:
gui.h: moved 3 half-shutter button codes to gui-common.c<br>(for 6D.116)
The file was modifiedplatform/6D.116/gui.h (diff)
Changeset 11123:d0ac7920c36c by Maqs <marcus@eunomia.de>:
consts.h: removed some unused entries<br>(6D.116)
The file was modifiedplatform/6D.116/consts.h (diff)
Changeset 11122:c9d1e9963f7d by Maqs <marcus@eunomia.de>:
Merged unified into 6D.116
Changeset 11121:b10ff68a9fae by Maqs <marcus@eunomia.de>:
Merged in unified
Changeset 11120:c7632517ab55 by Maqs <marcus@eunomia.de>:
StateObject addresses - should hopefully fix raw recording
The file was modifiedplatform/6D.116/include/platform/state-object.h (diff)
Changeset 11119:f9183f055157 by Maqs <marcus@eunomia.de>:
Updated io_crypt.mo for 6D.116
The file was modifiedmodules/io_crypt/io_crypt.c (diff)
Changeset 11118:35e995e5288c by Maqs <marcus@eunomia.de>:
Updated adtg_gui.mo for 6D.116
The file was modifiedmodules/adtg_gui/adtg_gui.c (diff)
Changeset 11117:c614104307c5 by Maqs <marcus@eunomia.de>:
Updated dual_iso.mo for 6D.116
The file was modifiedmodules/dual_iso/dual_iso.c (diff)
Changeset 11116:cb5083ac8093 by Maqs <marcus@eunomia.de>:
As bitrate-6d.o is disabled anyway, we can at least go for bitrate-5d3.o until it has been fixed.
The file was modifiedplatform/6D.116/Makefile.setup.default (diff)
Changeset 11115:819df5377b24 by Maqs <marcus@eunomia.de>:
Merged in unified
Changeset 11114:f24174f65fad by Maqs <marcus@eunomia.de>:
firmware signature for 6D.116 (thanks JL!)
The file was modifiedsrc/fw-signature.h (diff)
Changeset 11113:7dee3c7e7690 by Maqs <marcus@eunomia.de>:
get 6D.116 new-sound-system ready - CONFIG_BEEP still needs to be uncommented after merging in new-sound-system.
The file was modifiedplatform/6D.116/Makefile.setup.default (diff)
The file was modifiedplatform/6D.116/consts.h (diff)
The file was modifiedplatform/6D.116/internals.h (diff)
The file was modifiedplatform/6D.116/stubs.S (diff)
Changeset 11112:15280a82450c by Maqs <marcus@eunomia.de>:
installer support for 6D.116 (hopefully)
The file was addedinstaller/6D.116/Makefile
The file was modifiedinstaller/6D.113/Makefile (diff)
Changeset 11111:d7efcb060912 by Maqs <marcus@eunomia.de>:
Renamed JUDGEBOTTOMINFODISPTIMERSTATE to JUDGE_BOTTOM_INFO_DISP_TIMER_STATE.
The file was modifiedplatform/6D.116/consts.h (diff)
Changeset 11110:7ce03e422905 by Maqs <marcus@eunomia.de>:
Merged in unified
Changeset 11109:3e89fbc46452 by Maqs <marcus@eunomia.de>:
comment out stub SetAudioVolumeIn intentionally, as it is only used in bitrate-6d.c (not ported, considered harmful).
The file was modifiedplatform/6D.113/stubs.S (diff)
Changeset 11108:2099d13f838f by Maqs <marcus@eunomia.de>:
JUDGEBOTTOMINFODISPTIMERSTATE for 6D.116
The file was modifiedplatform/6D.116/consts.h (diff)
Changeset 11107:c3079d008180 by Maqs <marcus@eunomia.de>:
merge from unified
Changeset 11106:57217e3d9d0e by Maqs <marcus@eunomia.de>:
mlv_rev: add 6D.116 support
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
Changeset 11105:f74a55e5a501 by Maqs <marcus@eunomia.de>:
raw_rev: add 6D.116 support
The file was modifiedmodules/raw_rec/raw_rec.c (diff)
Changeset 11104:cad184633a63 by Maqs <marcus@eunomia.de>:
Initial 6D.116 port
The file was addedplatform/6D.116/Makefile
The file was addedplatform/6D.116/Makefile.platform.default
The file was addedplatform/6D.116/Makefile.setup.default
The file was addedplatform/6D.116/afma.h
The file was addedplatform/6D.116/cfn.c
The file was addedplatform/6D.116/consts.h
The file was addedplatform/6D.116/features.h
The file was addedplatform/6D.116/gui.h
The file was addedplatform/6D.116/include/platform/mvr.h
The file was addedplatform/6D.116/include/platform/state-object.h
The file was addedplatform/6D.116/internals.h
The file was addedplatform/6D.116/stubs.S
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 11103:3f795184f908 by Alex:
Installer: forgot to clear the screen before uninstallation
The file was modifiedsrc/installer.c (diff)
Changeset 11102:eeff6b181970 by Alex:
Installer: fine-tuned 70D error message
The file was modifiedsrc/reboot.c (diff)
Changeset 11101:f9a5cfa880b8 by Alex:
Installer: also check for ML and ML/FONTS directories
The file was modifiedsrc/installer.c (diff)
Changeset 11100:fa308f40585c by Alex:
Installer: better alignment for bootflags display
The file was modifiedsrc/installer.c (diff)
Changeset 11099:7c4042067d36 by Alex:
Installer: allow arbitrary font sizes
The file was modifiedsrc/installer.c (diff)
Changeset 11098:93f1cf76fa4f by Alex:
Installer for 5D3 1.1.3: fix loading the FIR on 1.3.3
The file was modifiedplatform/5D3.113/Makefile.platform.default (diff)
Changeset 11097:8040ea817bc9 by Alex:
Installer: reset the powersave timer while waiting for uninstallation
The file was modifiedsrc/installer.c (diff)
Changeset 11096:f115b5a07399 by Alex:
Installer: fix bogus message right before uninstallation
The file was modifiedsrc/installer.c (diff)
Changeset 11095:5e941f0789b5 by Alex:
Installer: fix make clean
The file was modifiedinstaller/Makefile.installer (diff)
Changeset 11094:796d96f4ca8f by Alex:
Installer: enabled 7D in main installer makefile
The file was modifiedinstaller/Makefile (diff)
Changeset 11093:340ace110241 by Alex:
Installer: fine-tuned messages about ROM dumping, fixed alignment
The file was modifiedsrc/installer.c (diff)
Changeset 11092:1ab930b8b550 by Alex:
Installer: updated 7D
The file was modifiedinstaller/7D.203/Makefile (diff)
The file was modifiedinstaller/7D.203/dummy-master.c (diff)
Changeset 11091:a66107ebe56d by Alex:
Merged unified into installer
Changeset 11090:90c901a22e97 by Alex:
Installer: customized error message for 70D
The file was modifiedsrc/reboot.c (diff)
Changeset 11089:f9f14a110b52 by Alex:
Reboot: removed 0x120 FIR offset (already handled by FIR_BASE); no more dependency on &#039;truncate&#039; :)
The file was modifiedsrc/Makefile.src (diff)
The file was modifiedsrc/reboot.c (diff)
Changeset 11088:b495c2d0804b by Alex:
Autoexec checksum: fix building as FIR
The file was modifiedMakefile.filerules (diff)
Changeset 11087:cfca0875fede by Alex:
Installer: use a 60-seconds timer for uninstallation
The file was modifiedsrc/installer.c (diff)
Changeset 11086:6930c46956b0 by Alex:
Installer: backup ROM before doing anything, and tell the user to store these files in a safe place
The file was modifiedsrc/installer.c (diff)
Changeset 11085:57a9865be563 by Alex:
Merged portable-error-messages into installer
Changeset 11084:aedd32f1dc69 by Alex:
Installer: tweaked countdown message to reduce confusion for new users
The file was modifiedsrc/installer.c (diff)
Changeset 11083:a3efe9f47250 by Alex:
Installer: use a single FIR name for all cameras (ML-SETUP.FIR)
The file was modifiedinstaller/60D.111/Makefile (diff)
The file was modifiedinstaller/650D.104/Makefile (diff)
The file was modifiedinstaller/6D.113/Makefile (diff)
The file was modifiedplatform/1100D.105/Makefile.platform.default (diff)
The file was modifiedplatform/5D3.113/Makefile.platform.default (diff)
The file was modifiedplatform/60D.111/Makefile.platform.default (diff)
The file was modifiedplatform/6D.113/Makefile.platform.default (diff)
The file was modifiedplatform/Makefile.platform.base (diff)
Changeset 11082:bea7a772866d by Alex:
Installer: fix building all installers at once
The file was addedinstaller/5D3.113/Makefile
The file was modifiedinstaller/Makefile (diff)
Changeset 11081:780a3a3d593b by Alex:
Installer: support for 600D (not tested, copied from bc1b8f5)
The file was modifiedplatform/600D.102/consts.h (diff)
Changeset 11080:39d8f08977a3 by Alex:
Installer: cleaned up old platforms
The file was removedinstaller/5D3.112/Makefile
Changeset 11079:0d5516c71a0e by Alex:
Merged unified into installer
Changeset 11078:ec82427b913e by Alex:
Installer: display a nice error message if Canon firmware is not the one ML expects
The file was modifiedsrc/reboot.c (diff)