FailedChanges

Summary

  1. Merged in OtherOnePercent/magic-lantern/OtherOnePercent/update-timings-for-6d-to-avoid-problems--1403463297020 (pull request #522) Update timings for 6D to avoid problems. It will have to be done a 3rd time if direct table patching happens.
  2. Don't need aggressive update, it causes problems
  3. Update timings for 6D to avoid problems. It will have to be done a 3rd time if direct table patching happens.
  4. 550D: fixed issue #1613 (centering focus box)
  5. EOS-M: experimental menu trigger from the DELETE button (long press). Not tested, does it work?
  6. 6D: declared ML_RESERVED_MEM as 640K; does it work?
  7. Startup: moved ML_RESERVED_MEM outside ifdef's to be visible from everywhere
  8. 6D: missing stubs from nikfreak, http://www.magiclantern.fm/forum/index.php?topic=3904.msg119450#msg119450
  9. 550D: ResLock stubs
  10. Reloc: clean cache before executing modified code
  11. Fix memory checks for CONFIG_ALLOCATE_MEMORY_POOL (fixes boot for 550D and 1100D)
  12. Free memory dialog: fix display of AUTOEXEC.BIN size
  13. Merged in gui-timers (pull request #518) Refactoring with GUI timers
  14. Merged in edmac-cleanup (pull request #516) Small EDMAC refactoring
  15. Long joystick press: small race condition fix
  16. Cleanup some leftover code related to joystick press
  17. Long joystick press: small fix (stop checking when pressing left/right/up/down)
  18. 5D3/5D2/50D/7D: refactored joystick menu navigation with GUI timers (and enabled it on 7D)
  19. Refactored redraw_after with GUI timers
  20. Added a simple wrapper for GUI timers: delayed_call
  21. 5D3/5D2/50D: removed old joypress code (to be rewritten with GUI timers)
  22. CONFIG_ENGINE_RESLOCK should be mandatory everywhere (anything broken?)
  23. 5D2: enabled CONFIG_ENGINE_RESLOCK
  24. edmac_channel_to_index: direction argument not needed
  25. EDMAC info: show overview for the third EDMAC group on DIGIC V cameras
  26. EDMAC info: print results from edmac_get_dir
  27. EDMAC info: refactored with edmac_get_* calls
  28. EDMAC: simplified edmac_get_dir (read if channel & 0x8 else write) and added range checking to all getters
  29. edmac_get_dir: return "unused" for out-of-range channels
  30. edmac_get_state: prevent lockup on older cameras, where there are fewer EDMAC channels
  31. edmac_memcpy: find_free_edmac_channels now displays edmac channel numbers, not indices
  32. EDMAC: refactored channel<->index mapping (moved to edmac.c/h)
Changeset 10383:64d376b884ef by a1ex <broscutamaker@gmail.com>:
Merged in OtherOnePercent/magic-lantern/OtherOnePercent/update-timings-for-6d-to-avoid-problems--1403463297020 (pull request #522)<br><br>Update timings for 6D to avoid problems. It will have to be done a 3rd time if direct table patching happens.
Changeset 10382:1016519d6e58 by One Percent <NOTAFRAIDOFNSA@YAHOO.COM>:
Don&#039;t need aggressive update, it causes problems
The file was modifiedplatform/6D.113/internals.h (diff)
Changeset 10381:84fbfc042a37 by One Percent <NOTAFRAIDOFNSA@YAHOO.COM>:
Update timings for 6D to avoid problems. It will have to be done a 3rd time if direct table patching happens.
The file was modifiedsrc/fps-engio.c (diff)
Changeset 10380:6b45ad9a6dcd by Alex:
550D: fixed issue #1613 (centering focus box)
The file was modifiedsrc/tweaks.c (diff)
Changeset 10379:e876a7b1117e by Alex:
EOS-M: experimental menu trigger from the DELETE button (long press). Not tested, does it work?
The file was modifiedsrc/menu.c (diff)
Changeset 10378:82abbc454711 by Alex:
6D: declared ML_RESERVED_MEM as 640K; does it work?
The file was modifiedplatform/6D.113/consts.h (diff)
Changeset 10377:190ff5f88465 by Alex:
Startup: moved ML_RESERVED_MEM outside ifdef&#039;s to be visible from everywhere
The file was modifiedsrc/boot-hack.c (diff)
Changeset 10376:b2c719fd3fe5 by Alex:
6D: missing stubs from nikfreak, http://www.magiclantern.fm/forum/index.php?topic=3904.msg119450#msg119450
The file was modifiedplatform/6D.113/stubs.S (diff)
Changeset 10375:f5c2d91b0f91 by Alex:
550D: ResLock stubs
The file was modifiedplatform/550D.109/stubs.S (diff)
Changeset 10374:d10501ffd8ac by Alex:
Reloc: clean cache before executing modified code
The file was modifiedsrc/reloc.c (diff)
Changeset 10373:8c212a43cf8c by Alex:
Fix memory checks for CONFIG_ALLOCATE_MEMORY_POOL (fixes boot for 550D and 1100D)
The file was modifiedsrc/boot-hack.c (diff)
The file was modifiedsrc/tasks.h (diff)
Changeset 10372:066acee63539 by Alex:
Free memory dialog: fix display of AUTOEXEC.BIN size
The file was modifiedsrc/mem.c (diff)
Changeset 10371:47190565ac47 by a1ex <broscutamaker@gmail.com>:
Merged in gui-timers (pull request #518)<br><br>Refactoring with GUI timers
Changeset 10370:1e632f1c7dfc by a1ex <broscutamaker@gmail.com>:
Merged in edmac-cleanup (pull request #516)<br><br>Small EDMAC refactoring
Changeset 10369:eb053c87b498 by Alex:
Long joystick press: small race condition fix
The file was modifiedsrc/menu.c (diff)
Changeset 10368:05b0417ef845 by Alex:
Cleanup some leftover code related to joystick press
The file was modifiedsrc/debug.c (diff)
Changeset 10367:8fdf8ca03c52 by Alex:
Long joystick press: small fix (stop checking when pressing left/right/up/down)
The file was modifiedsrc/gui-common.c (diff)
The file was modifiedsrc/menu.c (diff)
Changeset 10366:e8ed90bacac1 by Alex:
5D3/5D2/50D/7D: refactored joystick menu navigation with GUI timers (and enabled it on 7D)
The file was modifiedplatform/50D.109/internals.h (diff)
The file was modifiedplatform/5D2.212/internals.h (diff)
The file was modifiedplatform/7D.203/internals.h (diff)
The file was modifiedsrc/gui-common.h (diff)
The file was modifiedsrc/menu.c (diff)
Changeset 10365:347606bb9a6e by Alex:
Refactored redraw_after with GUI timers
The file was modifiedsrc/gui-common.c (diff)
Changeset 10364:024b96265955 by Alex:
Added a simple wrapper for GUI timers: delayed_call
The file was modifiedsrc/gui-common.c (diff)
The file was modifiedsrc/gui-common.h (diff)
Changeset 10363:732f2f2ff5b9 by Alex:
5D3/5D2/50D: removed old joypress code (to be rewritten with GUI timers)
The file was modifiedplatform/50D.109/gui.c (diff)
The file was modifiedplatform/5D2.212/gui.c (diff)
The file was modifiedsrc/gui.c (diff)
Changeset 10362:abf40a125805 by Alex:
CONFIG_ENGINE_RESLOCK should be mandatory everywhere (anything broken?)
The file was modifiedplatform/1100D.105/internals.h (diff)
The file was modifiedplatform/50D.109/internals.h (diff)
The file was modifiedplatform/5D2.212/internals.h (diff)
The file was modifiedplatform/5D3.113/internals.h (diff)
The file was modifiedplatform/60D.111/internals.h (diff)
The file was modifiedplatform/650D.104/internals.h (diff)
The file was modifiedplatform/6D.113/internals.h (diff)
The file was modifiedplatform/700D.113/internals.h (diff)
The file was modifiedplatform/EOSM.202/internals.h (diff)
The file was modifiedsrc/edmac-memcpy.c (diff)
The file was modifiedsrc/qemu-helper.c (diff)
Changeset 10361:7d97e2c8276c by Alex:
5D2: enabled CONFIG_ENGINE_RESLOCK
The file was modifiedplatform/5D2.212/internals.h (diff)
The file was modifiedplatform/5D2.212/stubs.S (diff)
Changeset 10360:862db9175256 by Alex:
edmac_channel_to_index: direction argument not needed
The file was modifiedsrc/edmac-memcpy.c (diff)
The file was modifiedsrc/edmac.c (diff)
The file was modifiedsrc/edmac.h (diff)
Changeset 10359:9c3fd0ae055b by Alex:
EDMAC info: show overview for the third EDMAC group on DIGIC V cameras
The file was modifiedsrc/debug.c (diff)
Changeset 10358:40ce954a167e by Alex:
EDMAC info: print results from edmac_get_dir
The file was modifiedsrc/debug.c (diff)
Changeset 10357:f4a69c5acc99 by Alex:
EDMAC info: refactored with edmac_get_* calls
The file was modifiedsrc/debug.c (diff)
Changeset 10356:6cb8b2fc1510 by Alex:
EDMAC: simplified edmac_get_dir (read if channel &amp; 0x8 else write) and added range checking to all getters
The file was modifiedsrc/edmac.c (diff)
Changeset 10355:2c69fe13211f by Alex:
edmac_get_dir: return &quot;unused&quot; for out-of-range channels
The file was modifiedsrc/edmac.c (diff)
Changeset 10354:adf46f801440 by Alex:
edmac_get_state: prevent lockup on older cameras, where there are fewer EDMAC channels
The file was modifiedsrc/edmac.c (diff)
Changeset 10353:ad5fe17271c7 by Alex:
edmac_memcpy: find_free_edmac_channels now displays edmac channel numbers, not indices
The file was modifiedsrc/edmac-memcpy.c (diff)
Changeset 10352:b24d19683a87 by Alex:
EDMAC: refactored channel&lt;-&gt;index mapping (moved to edmac.c/h)
The file was modifiedsrc/edmac-memcpy.c (diff)
The file was modifiedsrc/edmac.c (diff)
The file was modifiedsrc/edmac.h (diff)