SuccessChanges

Summary

  1. Merged in 5D3-113-and-123 (pull request #611) Support for 5D3 firmwares 1.2.3 and 1.1.3 in the same source tree
  2. Close branch 5D3-113-and-123
  3. 5D3: sync platform files between 1.1.3 and 1.2.3
  4. Merged unified into 5D3-113-and-123
  5. 5D3: stubs format
  6. Stubs format
  7. Merged unified into 5D3-113-and-123
  8. Merged 5D3-123 into 5D3-113-and-123 (to be tested)
  9. Merged unified into 5D3-113-and-123 (not working yet)
  10. 5D3-123: FSUunMountDevice stub
  11. Apply 5D3 113 changes from unified to 123
  12. Merged unified into 5D3-123
  13. Merged unified into 5D3-123
  14. Merged unified into 5D3-123
  15. Merged unified into 5D3-123
  16. 5D3-123: updated installer binary
  17. Installer: updated for 5D3 1.2.3
  18. 5D3-123: consts update
  19. Merged unified into 5D3-123
  20. Don't display the pitch line on cameras that always report zero for the pitch (eg 60D)
  21. Add support for displaying the pitch with electronic level
  22. mlv_rec: fix compilation
  23. Merged unified into 5D3-123
  24. features.html: allow one camera with two or more firmware versions
  25. 5D3: fix top-level Makefile to work on 1.2.3 and 1.1.3
  26. 5D3: fix Makefiles to work on 1.2.3 and 1.1.3
  27. 5D3: fix raw_rec and mlv_rec to work on 1.2.3 and 1.1.3
  28. 5D3: fix VRAM buffer choice for both 1.2.3 and 1.1.3 (workaround, need to finish the new-lv-buffer-detection branch)
  29. 5D3: fix raw backend to work on both 1.2.3 and 1.1.3
  30. 5D3: fix prop_lv_lens to work on both 1.2.3 and 1.1.3
  31. 5D3: fix bottom bar hack to work on both 1.2.3 and 1.1.3
  32. 5D3: re-added firmware signature for 1.1.3
  33. 5D3: fix FPS override to work on both 1.2.3 and 1.1.3
  34. 5D3-123: preparing to support both 1.2.3 and 1.1.3 in the same source tree
  35. 5D3 123: updated format consts
  36. Merged unified into 5D3-123
  37. Minor tweak in bootflags.c
  38. Merged unified into 5D3-123
  39. mlv_play: fix issue 1771 (borders in HDMI mode)
  40. Merged external-monitor into 5D3-123
  41. Fix merge conflict
  42. 5D3-123: changes from cleanup branch
  43. Merged unified into 5D3-123
  44. Revert debug code
  45. External monitors: fix LV buffer display address for 5D3 1.2.3 in HDMI 1080i
  46. External monitors: recognize hdmi_code == 20 as HDMI 1080i (for 5D3 123)
  47. Raw backend: fix raw2lv translation component (tested on 5D2)
  48. Raw backend: fix raw2lv test
  49. vram: after updating display parameters, force a refresh of RAW backend parameters
  50. update_vram_params should be private
  51. Cropmarks: fix redraw on external monitors
  52. Merged unified into 5D3-123
  53. Merged unified into 5D3-123
  54. 5D3-123: stubs reformat
  55. Merged unified into 5D3-123
  56. Merged unified into 5D3-123
  57. 5D3.123: stubs for CreateMemoryChunk/AddMemoryChunk
  58. Merged unified into 5D3-123
  59. 5D3-123: HDMI mirroring is not identified by hdmi_code
  60. 5D3-123: when external monitor is used with mirroring enabled, ML should behave just as with built-in LCD; not tested Based on the observations from Marekk http://www.magiclantern.fm/forum/index.php?topic=11017.msg113142#msg113142 and http://magiclantern.fm/forum/index.php?topic=9827.msg106132#msg106132 , and LRF https://bitbucket.org/hudson/magic-lantern/commits/32f3a5bd81936f986de904b12a542522cb37102f#comment-1036139 Code should be portable (no side effects expected on other cameras)
  61. External monitors: check the size of PROP_HDMI_CHANGE_CODE
  62. Merged unified into 5D3-123
  63. Merged unified into 5D3-123
  64. Merged unified into 5D3-123
  65. Merged unified into 5D3-123
  66. Merged unified into 5D3-123
  67. 5D3-123: updated SENSOR_TIMING_TABLE address
  68. Merged unified into 5D3-123
  69. Merged unified into 5D3-123
  70. 5D3-123: do not apply the palette workaround in LiveView (fixes conflict with display filters)
  71. 5D3-123: GetTaskName stub
  72. 5D3 123: stubs for SetTimerAfter and CancelTimer; deleted SetHPTimerAfterTimeout
  73. Timer and file IO stubs for 5D3.123
  74. 5D3-123: CANON_SHUTTER_RATING constant
  75. 5D3-123: CancelDateTimer stub
  76. Merged unified into 5D3-123
  77. 5D3-123: another workaround for uninitialized LV VRAM (this one makes Arkanoid playable again :P )
  78. 5D3-123: undo 2d0fb63
  79. Merged unified into 5D3-123
  80. Merged unified into 5D3-123
  81. Merged in chris_miller/magic-lantern-1/chris_miller/added-stub-for-stopasifdmaadc-1397488668705 (pull request #471) Added stub for StopASIFDMAADC
  82. Added stub for StopASIFDMAADC
  83. Merged unified into 5D3-123
  84. Un petit poisson d'avril
  85. Zoom on half-shutter: let's try a larger delay (the old one was causing too many missed shots)
  86. Merged in chris_miller/magic-lantern/5D3-123 (pull request #459) Liveview fixes for magic zoom and electronic level
  87. A better fix for the electronic level. Now always offsets the white line in the most appropriate direction.
  88. Merged hudson/magic-lantern into unified
  89. Backed out this change. It's better to have the misalignment as it was since the level collapses to a single line while at 45 degrees rather than when level in portrait mode.
  90. Fix alignment of green bars for magic zoom and make them easier to see.
  91. - Incorrect values were being written to memory. - Fixed out-by-one error when dest was aligned. - Prevent memory being written beyond end of range when dest isn't aligned.
  92. Electronic level lines were slightly misaligned
  93. Merged unified into 5D3-123
  94. Installer: updated 5D3-123 FIR binary
  95. 5D3-123: installer requires 8.3 FIR name in order to work on 64GB EXFAT cards (credits 1% for hint)
  96. 5D3-123: fix installer after clrscr workaround
  97. Merged unified into 5D3-123
  98. Merged unified into 5D3.123
  99. 5D3-123: workaround for uninitialized LV VRAM in photo mode (clrscr will fill with black instead of transparent when there's no YUV data to show)
  100. 5D3-123: switched REC indicator to elapsed time by default (remaining time takes a while to settle)
  101. 5D3-123: cleaned up obsolete zoom tweaks
  102. 5D3-123: looks like "make zip" expects the FIR in the platform directory
  103. 5D3-123: experimental installation FIR binary
  104. Merged unbroken-installer into 5D3-123
  105. 5D3-123: removed obsolete reboot-ins.c (todo: the same on all platforms)
  106. Renamed installer/5D3.112 to installer/5D3.123
  107. Merged unbroken-installer into 5D3-123
  108. raw_rec: fix bad merge
  109. 5D3-123: formatted stubs
  110. 5D3-123: cleaned up card bootflag code
  111. 5D3 123: ML is now restored after formatting the card!
  112. 5D3 123: undo 9315c07 (don't works)
  113. 5D3-123: rename FIO_Open to FIO_OpenFile
  114. Merged unified into 5D3-123
  115. 5D3: preferred card = CF by default (somehow disappeared during merging)
  116. 5D3-123: merge from unified
  117. 5D3 123: updated for new FIO backend
  118. Updated modules to check for firmware 1.2.3 (also kept compatibility with 1.1.3 for some of them)
  119. Merge from unified (reverted io_crypt to 113)
  120. Fixup movie restart
  121. 5D3: preferred card = CF by default
  122. Updated adtg_gui
  123. Updated for 1.2.3
  124. 5D3 123: update raw buffer address
  125. Found some more addresses that needed updating for 1.2.3
  126. 5D3 123: let's try Zoom on Half-Shutter without CONFIG_ZOOM_HALFSHUTTER_UILOCK (did Canon fix this or not?)
  127. Wrong buffer macro was being tested, would have failed to compile on non quad-buffered cameras.
  128. 5D3 123: disabled some features no longer working after upgrade (fast zebras, full-screen magic zoom, brightness/contrast/saturation, crazy colors)
  129. 5D3 123: fixed LVAE_STRUCT, expo override working again
  130. Quad-buffered Magic Zoom (for 5D3 123). Compile warning for busy vsync.
  131. Quad-buffered display filters (for 5D3 123)
  132. 5D3 123: PROP_LV_LENS seems to be like 6D now
  133. 5D3 123: fixed FRAME_ISO & friends; ETTR working
  134. 5D3 123: updated DLG_SIGNATURE. All stub test passed :)
  135. 5D3 123: new YUV422 image buffers (things changed a lot here for dual monitor support, and now LiveView is quad-buffered!)
  136. 5D3 123: enable hexdump (Debug -> Memory browser)
  137. 5D3 123: GetSizeOfMaxRegion
  138. Fixed stateobj_disp[1] offset
  139. Fixed DISPLAY_STATEOBJ
  140. Removed obsolete EDMAC_RegisterCompleteCBR definition
  141. Ported ML over to 5D3 firmware 1.2.3.
  142. Undo some stub changes to help transplanting old changesets
  143. Copied 5D3.113 to 5D3.123 in preparation for supporting firmware 1.2.3
  144. Renamed 5D3.113 to 5D3.123 in preparation for supporting firmware 1.2.3
Changeset 12402:1d8c97a6b11a by Alex <broscutamaker@gmail.com>:
Merged in 5D3-113-and-123 (pull request #611)<br><br>Support for 5D3 firmwares 1.2.3 and 1.1.3 in the same source tree
Changeset 12401:466ed3cc7be8 by Alex <broscutamaker@gmail.com>:
Close branch 5D3-113-and-123
Changeset 12400:951e5433d090 by alex@thinkpad:
5D3: sync platform files between 1.1.3 and 1.2.3
The file was modifiedplatform/5D3.113/consts.h (diff)
The file was modifiedplatform/5D3.113/internals.h (diff)
The file was modifiedplatform/5D3.123/Makefile.setup.default (diff)
The file was modifiedplatform/5D3.123/consts.h (diff)
The file was modifiedplatform/5D3.123/features.h (diff)
The file was modifiedplatform/5D3.123/gui.h (diff)
The file was modifiedplatform/5D3.123/internals.h (diff)
The file was removedplatform/5D3.113/misc.c
The file was removedplatform/5D3.123/misc.c
Changeset 12399:8e4bb252f1eb by alex@thinkpad:
Merged unified into 5D3-113-and-123
Changeset 12398:dc3e1d082330 by alex@thinkpad:
5D3: stubs format
The file was modifiedcontrib/stub-format/stub-cleanup.py (diff)
The file was modifiedplatform/5D3.113/stubs.S (diff)
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12397:654c4f7b2839 by alex@thinkpad:
Stubs format
The file was modifiedplatform/1100D.105/stubs.S (diff)
The file was modifiedplatform/500D.111/stubs.S (diff)
The file was modifiedplatform/50D.109/stubs.S (diff)
The file was modifiedplatform/550D.109/stubs.S (diff)
The file was modifiedplatform/5D2.212/stubs.S (diff)
The file was modifiedplatform/5D3.113/stubs.S (diff)
The file was modifiedplatform/600D.102/stubs.S (diff)
The file was modifiedplatform/60D.111/stubs.S (diff)
The file was modifiedplatform/650D.104/stubs.S (diff)
The file was modifiedplatform/6D.116/stubs.S (diff)
The file was modifiedplatform/700D.114/stubs.S (diff)
The file was modifiedplatform/7D.203/stubs.S (diff)
The file was modifiedplatform/7D_MASTER.203/stubs.S (diff)
The file was modifiedplatform/EOSM.202/stubs.S (diff)
Changeset 12396:68b14fd248ac by alex@thinkpad:
Merged unified into 5D3-113-and-123
Changeset 12395:083982718d31 by alex@thinkpad:
Merged 5D3-123 into 5D3-113-and-123 (to be tested)
Changeset 12394:0e574b246bf3 by alex@thinkpad:
Merged unified into 5D3-113-and-123 (not working yet)
Changeset 12393:ce8e1f7a8b68 by alex@thinkpad:
5D3-123: FSUunMountDevice stub
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12392:020f3adde652 by alex@thinkpad:
Apply 5D3 113 changes from unified to 123
The file was modifiedplatform/5D3.123/cfn.c (diff)
The file was modifiedplatform/5D3.123/consts.h (diff)
The file was modifiedplatform/5D3.123/features.h (diff)
The file was modifiedplatform/5D3.123/gui.h (diff)
Changeset 12391:b414dd286123 by alex@thinkpad:
Merged unified into 5D3-123
Changeset 12390:32abe65a48a5 by a1ex <broscutamaker@gmail.com>:
Merged unified into 5D3-123
Changeset 12389:410832b77052 by a1ex <broscutamaker@gmail.com>:
Merged unified into 5D3-123
Changeset 12388:88228d42cec7 by Alex:
Merged unified into 5D3-123
Changeset 12387:70026a544cc3 by Alex:
5D3-123: updated installer binary
The file was addedplatform/5D3.123/ML-SETUP.FIR
The file was removedplatform/5D3.123/ML5D3123.FIR
Changeset 12386:fb966fd94cb6 by Alex:
Installer: updated for 5D3 1.2.3
The file was modifiedinstaller/5D3.123/Makefile (diff)
The file was modifiedplatform/5D3.123/Makefile.platform.default (diff)
Changeset 12385:fa5a10fed805 by Alex:
5D3-123: consts update
The file was modifiedplatform/5D3.123/consts.h (diff)
The file was modifiedplatform/5D3.123/gui.h (diff)
Changeset 12384:d4301684052f by Alex:
Merged unified into 5D3-123
Changeset 12383:0d12e78ff7c3 by Chris Miller <chris.nz@gmail.com>:
Don&#039;t display the pitch line on cameras that always report zero for the pitch (eg 60D)
The file was modifiedsrc/electronic_level.c (diff)
Changeset 12382:b1f5bd979b10 by Chris Miller <chris.nz@gmail.com>:
Add support for displaying the pitch with electronic level
The file was modifiedsrc/electronic_level.c (diff)
Changeset 12381:a7e075350450 by Alex:
mlv_rec: fix compilation
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
Changeset 12380:3eead01aca73 by Alex:
Merged unified into 5D3-123
Changeset 12379:db81e10f1dbb by Alex:
features.html: allow one camera with two or more firmware versions
The file was modifiedfeatures/features-html.py (diff)
Changeset 12378:295ee9cb8530 by Alex:
5D3: fix top-level Makefile to work on 1.2.3 and 1.1.3
The file was modifiedMakefile (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 12377:604848fd6724 by Alex:
5D3: fix Makefiles to work on 1.2.3 and 1.1.3
The file was modifiedplatform/5D3.113/Makefile (diff)
The file was modifiedplatform/5D3.123/Makefile (diff)
Changeset 12376:364b93124e10 by Alex:
5D3: fix raw_rec and mlv_rec to work on 1.2.3 and 1.1.3
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
The file was modifiedmodules/raw_rec/raw_rec.c (diff)
Changeset 12375:ba6164290364 by Alex:
5D3: fix VRAM buffer choice for both 1.2.3 and 1.1.3 (workaround, need to finish the new-lv-buffer-detection branch)
The file was modifiedsrc/vram.c (diff)
Changeset 12374:09001ed83169 by Alex:
5D3: fix raw backend to work on both 1.2.3 and 1.1.3
The file was modifiedsrc/raw.c (diff)
Changeset 12373:4da2e9d900cb by Alex:
5D3: fix prop_lv_lens to work on both 1.2.3 and 1.1.3
The file was modifiedsrc/lens.h (diff)
Changeset 12372:09ad46f646c3 by Alex:
5D3: fix bottom bar hack to work on both 1.2.3 and 1.1.3
The file was modifiedsrc/gui-common.c (diff)
Changeset 12371:a11979f4a4b2 by Alex:
5D3: re-added firmware signature for 1.1.3
The file was modifiedsrc/fw-signature.h (diff)
Changeset 12370:0f0d761ccf6f by Alex:
5D3: fix FPS override to work on both 1.2.3 and 1.1.3
The file was modifiedsrc/fps-engio.c (diff)
Changeset 12369:ef2a303d9205 by Alex:
5D3-123: preparing to support both 1.2.3 and 1.1.3 in the same source tree
The file was modifiedplatform/5D3.113/Makefile.setup.default (diff)
The file was modifiedplatform/5D3.123/Makefile.setup.default (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 12368:c7655e989192 by Alex:
5D3 123: updated format consts
The file was modifiedplatform/5D3.123/consts.h (diff)
Changeset 12367:0daee2ed4aa5 by Alex:
Merged unified into 5D3-123
Changeset 12366:ca55600a6174 by Alex:
Minor tweak in bootflags.c
The file was modifiedsrc/bootflags.c (diff)
Changeset 12365:ffd1d533b1dc by a1ex <broscutamaker@gmail.com>:
Merged unified into 5D3-123
Changeset 12364:fa3d4cbaf86a by Alex:
mlv_play: fix issue 1771 (borders in HDMI mode)
The file was modifiedmodules/mlv_play/mlv_play.c (diff)
Changeset 12363:8e9dbb76be6a by Alex:
Merged external-monitor into 5D3-123
Changeset 12362:b3b4b10805c2 by Alex:
Fix merge conflict
The file was modifiedsrc/debug.c (diff)
Changeset 12361:a2a318257645 by Alex:
5D3-123: changes from cleanup branch
The file was modifiedplatform/5D3.123/Makefile.setup.default (diff)
The file was modifiedplatform/5D3.123/internals.h (diff)
Changeset 12360:3528f67d68d9 by Alex:
Merged unified into 5D3-123
Changeset 12359:eb1f5ad18955 by Alex:
Revert debug code
The file was modifiedsrc/raw.c (diff)
Changeset 12358:3f206406d27d by Alex:
External monitors: fix LV buffer display address for 5D3 1.2.3 in HDMI 1080i
The file was modifiedplatform/5D3.123/consts.h (diff)
Changeset 12357:495f8556e754 by Alex:
External monitors: recognize hdmi_code == 20 as HDMI 1080i (for 5D3 123)
The file was modifiedmodules/mlv_rec/mlv_rec.c (diff)
The file was modifiedsrc/bmp.c (diff)
The file was modifiedsrc/cropmarks.c (diff)
The file was modifiedsrc/debug.c (diff)
The file was modifiedsrc/lens.c (diff)
The file was modifiedsrc/movtweaks.c (diff)
The file was modifiedsrc/tweaks.c (diff)
The file was modifiedsrc/vram.c (diff)
The file was modifiedsrc/zebra.c (diff)
Changeset 12356:3d11781f7b2d by Alex:
Raw backend: fix raw2lv translation component (tested on 5D2)
The file was modifiedsrc/raw.c (diff)
Changeset 12355:2d113cb20fae by Alex:
Raw backend: fix raw2lv test
The file was modifiedsrc/raw.c (diff)
Changeset 12354:531f0470a99c by Alex:
vram: after updating display parameters, force a refresh of RAW backend parameters
The file was modifiedsrc/vram.c (diff)
Changeset 12353:0017f48636b1 by Alex:
update_vram_params should be private
The file was modifiedsrc/bmp.c (diff)
The file was modifiedsrc/vram.c (diff)
The file was modifiedsrc/vram.h (diff)
Changeset 12352:86d6d16d7044 by Alex:
Cropmarks: fix redraw on external monitors
The file was modifiedsrc/cropmarks.c (diff)
Changeset 12351:20af0cd71b76 by Alex:
Merged unified into 5D3-123
Changeset 12350:3f1f15a31090 by a1ex <broscutamaker@gmail.com>:
Merged unified into 5D3-123
Changeset 12349:0a5e09709ef7 by Alex:
5D3-123: stubs reformat
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12348:134ce9142097 by Alex:
Merged unified into 5D3-123
Changeset 12347:e0a1e77aeb30 by a1ex <broscutamaker@gmail.com>:
Merged unified into 5D3-123
Changeset 12346:a47de7e9f783 by Alex:
5D3.123: stubs for CreateMemoryChunk/AddMemoryChunk
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12345:3ba402cc792b by Alex:
Merged unified into 5D3-123
Changeset 12344:4e8de6b7655a by Alex:
5D3-123: HDMI mirroring is not identified by hdmi_code
The file was modifiedsrc/propvalues.c (diff)
Changeset 12343:3f39a7f837af by Alex:
5D3-123: when external monitor is used with mirroring enabled, ML should behave just as with built-in LCD; not tested<br>Based on the observations from Marekk http://www.magiclantern.fm/forum/index.php?topic=11017.msg113142#msg113142 and http://magiclantern.fm/forum/index.php?topic=9827.msg106132#msg106132 , and LRF https://bitbucket.org/hudson/magic-lantern/commits/32f3a5bd81936f986de904b12a542522cb37102f#comment-1036139<br><br>Code should be portable (no side effects expected on other cameras)
The file was modifiedsrc/propvalues.c (diff)
Changeset 12342:a0789ccd85b4 by Alex:
External monitors: check the size of PROP_HDMI_CHANGE_CODE
The file was modifiedsrc/movtweaks.c (diff)
Changeset 12341:60c6fa5b8868 by a1ex <broscutamaker@gmail.com>:
Merged unified into 5D3-123
Changeset 12340:81fb4978310c by a1ex <broscutamaker@gmail.com>:
Merged unified into 5D3-123
Changeset 12339:8a637f5d8fcc by a1ex <broscutamaker@gmail.com>:
Merged unified into 5D3-123
Changeset 12338:86d6f4409bc6 by Alex:
Merged unified into 5D3-123
Changeset 12337:8609d181bd63 by Alex:
Merged unified into 5D3-123
Changeset 12336:b17c87b7da83 by Alex:
5D3-123: updated SENSOR_TIMING_TABLE address
The file was modifiedsrc/fps-engio.c (diff)
Changeset 12335:67bed6748b46 by Alex:
Merged unified into 5D3-123
Changeset 12334:117069551757 by a1ex <broscutamaker@gmail.com>:
Merged unified into 5D3-123
Changeset 12333:b408191789a0 by Alex:
5D3-123: do not apply the palette workaround in LiveView (fixes conflict with display filters)
The file was modifiedsrc/tweaks.c (diff)
Changeset 12332:c614ddaf6c4c by Alex:
5D3-123: GetTaskName stub
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12331:3f646c753d54 by Alex:
5D3 123: stubs for SetTimerAfter and CancelTimer; deleted SetHPTimerAfterTimeout
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12330:e422f9df9eeb by Jarno Paananen <jarno.paananen@gmail.com>:
Timer and file IO stubs for 5D3.123
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12329:30bb136e4453 by Alex:
5D3-123: CANON_SHUTTER_RATING constant
The file was modifiedplatform/5D3.123/consts.h (diff)
Changeset 12328:3be65f8be188 by Alex:
5D3-123: CancelDateTimer stub
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12327:a12d53653f1f by a1ex <broscutamaker@gmail.com>:
Merged unified into 5D3-123
Changeset 12326:03c5f4366259 by Alex:
5D3-123: another workaround for uninitialized LV VRAM (this one makes Arkanoid playable again :P )
The file was modifiedsrc/tweaks.c (diff)
Changeset 12325:fadde9f5bd06 by Alex:
5D3-123: undo 2d0fb63
The file was modifiedsrc/bmp.c (diff)
Changeset 12324:72846f0bc65b by Alex:
Merged unified into 5D3-123
Changeset 12323:17aa99ecbed7 by Alex:
Merged unified into 5D3-123
Changeset 12322:8e2f732930a0 by Giovanni C <condellog@gmail.com>:
Merged in chris_miller/magic-lantern-1/chris_miller/added-stub-for-stopasifdmaadc-1397488668705 (pull request #471)<br><br>Added stub for StopASIFDMAADC
Changeset 12321:c3c7469a2c68 by chris_miller <chris.nz@gmail.com>:
Added stub for StopASIFDMAADC
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12320:622f3c2c4384 by Giovanni C <condellog@gmail.com>:
Merged unified into 5D3-123
Changeset 12319:9765bab7157b by Alex:
Un petit poisson d&#039;avril
The file was modifiedsrc/tweaks.c (diff)
Changeset 12318:fc2255772c0a by Alex:
Zoom on half-shutter: let&#039;s try a larger delay (the old one was causing too many missed shots)
The file was modifiedsrc/shoot.c (diff)
Changeset 12317:6924233a2e1b by a1ex <broscutamaker@gmail.com>:
Merged in chris_miller/magic-lantern/5D3-123 (pull request #459)<br><br>Liveview fixes for magic zoom and electronic level
Changeset 12316:2f597fbfa7c2 by Chris Miller <chris.nz@gmail.com>:
A better fix for the electronic level. Now always offsets the white line in the most appropriate direction.
The file was modifiedsrc/electronic_level.c (diff)
Changeset 12315:94600b6bf06f by Chris Miller <chris.nz@gmail.com>:
Merged hudson/magic-lantern into unified
Changeset 12314:4798778bea61 by Chris Miller <chris.nz@gmail.com>:
Backed out this change. It&#039;s better to have the misalignment as it was since the level collapses to a single line while at 45 degrees rather than when level in portrait mode.
The file was modifiedsrc/electronic_level.c (diff)
Changeset 12313:cd6564270246 by Chris Miller <chris.nz@gmail.com>:
Fix alignment of green bars for magic zoom and make them easier to see.
The file was modifiedsrc/histogram.h (diff)
The file was modifiedsrc/zebra.c (diff)
Changeset 12312:22b848a32c2a by Chris Miller <chris.nz@gmail.com>:
- Incorrect values were being written to memory.<br>- Fixed out-by-one error when dest was aligned.<br>- Prevent memory being written beyond end of range when dest isn&#039;t aligned.
The file was modifiedsrc/stdio.c (diff)
Changeset 12311:5cfa55d727d2 by Chris Miller <chris.nz@gmail.com>:
Electronic level lines were slightly misaligned
The file was modifiedsrc/electronic_level.c (diff)
Changeset 12310:199048d15230 by a1ex <broscutamaker@gmail.com>:
Merged unified into 5D3-123
Changeset 12309:48e7ddebc1b9 by Alex:
Installer: updated 5D3-123 FIR binary
The file was addedplatform/5D3.123/ML5D3123.FIR
The file was removedplatform/5D3.123/5D3_123.fir
Changeset 12308:db81d97d7419 by Alex:
5D3-123: installer requires 8.3 FIR name in order to work on 64GB EXFAT cards (credits 1% for hint)
The file was modifiedinstaller/5D3.123/Makefile (diff)
The file was modifiedplatform/5D3.123/Makefile.platform.default (diff)
Changeset 12307:a2fe8ee4aedf by Alex:
5D3-123: fix installer after clrscr workaround
The file was modifiedsrc/installer.c (diff)
Changeset 12306:2ae8eaa63b93 by Alex:
Merged unified into 5D3-123
Changeset 12305:a9dced4a127b by Alex:
Merged unified into 5D3.123
Changeset 12304:2d0fb63dad84 by Alex:
5D3-123: workaround for uninitialized LV VRAM in photo mode (clrscr will fill with black instead of transparent when there&#039;s no YUV data to show)
The file was modifiedsrc/bmp.c (diff)
Changeset 12303:82b0b3276511 by Alex:
5D3-123: switched REC indicator to elapsed time by default (remaining time takes a while to settle)
The file was modifiedsrc/bitrate-5d3.c (diff)
Changeset 12302:c24d8fb2165b by Alex:
5D3-123: cleaned up obsolete zoom tweaks
The file was modifiedplatform/5D3.123/features.h (diff)
The file was modifiedsrc/all_features.h (diff)
The file was modifiedsrc/gui-common.c (diff)
The file was modifiedsrc/gui-common.h (diff)
The file was modifiedsrc/tweaks.c (diff)
Changeset 12301:94b658040cbe by Alex:
5D3-123: looks like &quot;make zip&quot; expects the FIR in the platform directory
The file was addedplatform/5D3.123/5D3_123.fir
The file was removedinstaller/5D3.123/5D3_123.fir
Changeset 12300:135f0d65a4c8 by Alex:
5D3-123: experimental installation FIR binary
The file was addedinstaller/5D3.123/5D3_123.fir
Changeset 12299:6284f44d5792 by Alex:
Merged unbroken-installer into 5D3-123
Changeset 12298:49fe1a1bab8d by Alex:
5D3-123: removed obsolete reboot-ins.c (todo: the same on all platforms)
The file was removedinstaller/5D3.123/reboot-ins.c
Changeset 12297:c8a0bdb9f841 by Alex:
Renamed installer/5D3.112 to installer/5D3.123
The file was addedinstaller/5D3.123/Makefile
The file was addedinstaller/5D3.123/reboot-ins.c
The file was removedinstaller/5D3.112/Makefile
The file was removedinstaller/5D3.112/reboot-ins.c
Changeset 12296:fb48c9c4621c by Alex:
Merged unbroken-installer into 5D3-123
Changeset 12295:3add1a94572c by Alex:
raw_rec: fix bad merge
The file was modifiedmodules/raw_rec/raw_rec.c (diff)
Changeset 12294:0391ff813b5d by Alex:
5D3-123: formatted stubs
The file was modifiedcontrib/stub-format/stub-cleanup.py (diff)
The file was modifiedcontrib/stub-format/stub-format.py (diff)
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12293:817505a84710 by Alex:
5D3-123: cleaned up card bootflag code
The file was modifiedsrc/bootflags.c (diff)
Changeset 12292:b1296f05fb56 by Alex:
5D3 123: ML is now restored after formatting the card!
The file was modifiedplatform/5D3.123/Makefile.setup.default (diff)
The file was modifiedplatform/5D3.123/consts.h (diff)
The file was modifiedplatform/5D3.123/internals.h (diff)
The file was modifiedplatform/5D3.123/misc.c (diff)
The file was modifiedplatform/5D3.123/stubs.S (diff)
The file was modifiedsrc/bootflags.c (diff)
The file was modifiedsrc/debug.c (diff)
Changeset 12291:ac386dd7b0ef by Alex:
5D3 123: undo 9315c07 (don&#039;t works)
The file was modifiedplatform/5D3.123/internals.h (diff)
Changeset 12290:ae2328c0c900 by Alex:
5D3-123: rename FIO_Open to FIO_OpenFile
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12289:568e6ff46e93 by Alex:
Merged unified into 5D3-123
Changeset 12288:e8746c878b18 by alex@thinkpad:
5D3: preferred card = CF by default (somehow disappeared during merging)
The file was modifiedsrc/fio-ml.c (diff)
Changeset 12287:7246960e83b6 by alex@thinkpad:
5D3-123: merge from unified
Changeset 12286:08fe96ad3ba2 by alex@thinkpad:
5D3 123: updated for new FIO backend
The file was modifiedplatform/5D3.123/Makefile.setup.default (diff)
The file was modifiedplatform/5D3.123/consts.h (diff)
The file was modifiedplatform/5D3.123/internals.h (diff)
Changeset 12285:d1be7e707297 by alex@thinkpad:
Updated modules to check for firmware 1.2.3 (also kept compatibility with 1.1.3 for some of them)
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)
Changeset 12284:ceeb5b6656e7 by alex@thinkpad:
Merge from unified (reverted io_crypt to 113)
Changeset 12283:adcc064ced34 by alex@thinkpad:
Fixup movie restart
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12282:7f0f4be078df by alex@thinkpad:
5D3: preferred card = CF by default
The file was modifiedsrc/fio-5d3.c (diff)
Changeset 12281:716df71b328a by alex@thinkpad:
Updated adtg_gui
The file was modifiedmodules/adtg_gui/adtg_gui.c (diff)
Changeset 12280:d0d62ae44bc8 by Chris Miller <chris.nz@gmail.com>:
Updated for 1.2.3
The file was modifiedplatform/5D3.123/consts.h (diff)
Changeset 12279:2cce8a9d480e by alex@thinkpad:
5D3 123: update raw buffer address
The file was modifiedsrc/raw.c (diff)
Changeset 12278:1e8b20fbfcfe by Chris Miller <chris.nz@gmail.com>:
Found some more addresses that needed updating for 1.2.3
The file was modifiedsrc/bitrate-6d.c (diff)
The file was modifiedsrc/gui-common.c (diff)
The file was modifiedsrc/qemu-helper.c (diff)
The file was modifiedsrc/raw.c (diff)
Changeset 12277:9315c07ee7d1 by alex@thinkpad:
5D3 123: let&#039;s try Zoom on Half-Shutter without CONFIG_ZOOM_HALFSHUTTER_UILOCK (did Canon fix this or not?)
The file was modifiedplatform/5D3.123/internals.h (diff)
Changeset 12276:76419745e47b by Chris Miller <chris.nz@gmail.com>:
Wrong buffer macro was being tested, would have failed to compile on non quad-buffered cameras.
The file was modifiedsrc/zebra.c (diff)
Changeset 12275:edf17e77b896 by alex@thinkpad:
5D3 123: disabled some features no longer working after upgrade (fast zebras, full-screen magic zoom, brightness/contrast/saturation, crazy colors)
The file was modifiedplatform/5D3.123/features.h (diff)
Changeset 12274:cf5963f9847e by alex@thinkpad:
5D3 123: fixed LVAE_STRUCT, expo override working again
The file was modifiedplatform/5D3.123/consts.h (diff)
Changeset 12273:e114c9d64c35 by alex@thinkpad:
Quad-buffered Magic Zoom (for 5D3 123). Compile warning for busy vsync.
The file was modifiedsrc/zebra.c (diff)
Changeset 12272:2fb9392360ee by alex@thinkpad:
Quad-buffered display filters (for 5D3 123)
The file was modifiedplatform/5D3.123/consts.h (diff)
The file was modifiedsrc/tweaks.c (diff)
Changeset 12271:9b2b2ef3b491 by alex@thinkpad:
5D3 123: PROP_LV_LENS seems to be like 6D now
The file was modifiedsrc/lens.h (diff)
Changeset 12270:3ceb715aaf9b by alex@thinkpad:
5D3 123: fixed FRAME_ISO &amp; friends; ETTR working
The file was modifiedplatform/5D3.123/consts.h (diff)
Changeset 12269:315fc86baa4e by alex@thinkpad:
5D3 123: updated DLG_SIGNATURE. All stub test passed :)
The file was modifiedplatform/5D3.123/consts.h (diff)
Changeset 12268:41565df5f524 by alex@thinkpad:
5D3 123: new YUV422 image buffers (things changed a lot here for dual monitor support, and now LiveView is quad-buffered!)
The file was modifiedplatform/5D3.123/consts.h (diff)
The file was modifiedsrc/vram.c (diff)
Changeset 12267:8733a405299a by alex@thinkpad:
5D3 123: enable hexdump (Debug -&gt; Memory browser)
The file was modifiedplatform/5D3.123/features.h (diff)
Changeset 12266:2eea72887b60 by alex@thinkpad:
5D3 123: GetSizeOfMaxRegion
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12265:6311b234cb34 by magiclantern@magiclantern-VirtualBox:
Fixed stateobj_disp[1] offset
The file was modifiedplatform/5D3.123/consts.h (diff)
Changeset 12264:3a93dbdb3081 by magiclantern@magiclantern-VirtualBox:
Fixed DISPLAY_STATEOBJ
The file was modifiedplatform/5D3.123/consts.h (diff)
Changeset 12263:6fb14c09721b by chris_miller <chris.nz@gmail.com>:
Removed obsolete EDMAC_RegisterCompleteCBR definition
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12262:7fed8cd3ca81 by magiclantern@magiclantern-VirtualBox:
Ported ML over to 5D3 firmware 1.2.3.
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 modifiedmodules/script/script.c (diff)
The file was modifiedplatform/5D3.123/Makefile.platform.default (diff)
The file was modifiedplatform/5D3.123/consts.h (diff)
The file was modifiedplatform/5D3.123/include/platform/state-object.h (diff)
The file was modifiedplatform/5D3.123/internals.h (diff)
The file was modifiedplatform/5D3.123/stubs.S (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
The file was modifiedsrc/fw-signature.h (diff)
The file was modifiedsrc/reboot.c (diff)
Changeset 12261:5b4d70c9d3ae by alex@thinkpad:
Undo some stub changes to help transplanting old changesets
The file was modifiedplatform/5D3.123/stubs.S (diff)
Changeset 12260:aaf3b8c30b9e by alex@thinkpad:
Copied 5D3.113 to 5D3.123 in preparation for supporting firmware 1.2.3
The file was addedplatform/5D3.123/Makefile
The file was addedplatform/5D3.123/Makefile.setup.default
The file was addedplatform/5D3.123/cfn.c
The file was addedplatform/5D3.123/consts.h
The file was addedplatform/5D3.123/features.h
The file was addedplatform/5D3.123/gui.h
The file was addedplatform/5D3.123/include/platform/mvr.h
The file was addedplatform/5D3.123/internals.h
The file was addedplatform/5D3.123/misc.c
The file was addedplatform/5D3.123/stubs.S
Changeset 12259:aaae5044a449 by magiclantern@magiclantern-VirtualBox:
Renamed 5D3.113 to 5D3.123 in preparation for supporting firmware 1.2.3
The file was addedplatform/5D3.123/H264-alli.ini
The file was addedplatform/5D3.123/H264-ipb.ini
The file was addedplatform/5D3.123/Makefile.platform.default
The file was addedplatform/5D3.123/afma.h
The file was addedplatform/5D3.123/include/platform/state-object.h