SuccessChanges

Summary

  1. mlv_dump: remove metadata modes. they were not really useful and dont make too much sense.
  2. chdk-dng: fix some found 64 bit issues
  3. mlv_dump: print human readable serial numbers for both camera and lens
  4. mlv_rec: properly fill lensSerial with a hex representation of the serial number in lens_info struct
  5. Merged lua_fix into crop_rec_4k
  6. Merged new-dryos-task-hooks into lua_fix
  7. Task hooks: disabled task switch debug messages by default (too verbose)
  8. 550D, 600D: fix memory allocation (amend 5b4fe18)
  9. 6D: ADTG shutter addresses did not work, trying another set
  10. 6D: fix ADTG shutter addresses after memory layout change http://www.magiclantern.fm/forum/index.php?topic=5601.msg194754#msg194754 http://www.magiclantern.fm/forum/index.php?topic=5601.msg191914#msg191914 http://www.magiclantern.fm/forum/index.php?topic=15088.msg190890#msg190890 not tested, just confirmed the new addresses in QEMU fixme: are these deterministic? under what conditions?
  11. lua_camera: minor help tweaks
  12. lua_camera: getter for gui.mode (missed in 706b131) + API tests
  13. gui-common: fix exit_(play|qr|menu)_mode on 60D (camera.gui tests from api_test.lua are working now)
  14. gui-common: refactored exit_play_qr_mode/exit_menu_mode to avoid duplicate code added exit_play_qr_menu_mode (generic)
  15. Backout bc10355 (undo screenshot palette fix, not portable, issue #2821)
  16. lua_menu: fix hidden, advanced and edit_mode not working from menu declaration http://www.magiclantern.fm/forum/index.php?topic=21258 todo: test all these settings and refactor to avoid duplicate code
  17. Merged unified into lua_fix
  18. Merged unified into crop_rec_4k
  19. mlv_dump: fix 0.5 LSB roundoff error when averaging
  20. Makefile: drop unused SUPPORTED_MODELS / SUPPORTED_UNIFIED_MODELS
  21. Merged in makefile-updates (pull request #873) Makefile updates to use any valid ARM toolchain
  22. Makefile: fix 7D build_fir
  23. Makefile: fix building Lua with gcc 4.7.3
  24. Makefile: only attempt to build/install/check ML-SETUP.FIR if there is a valid installer directory (some platforms may not have have one - 7D_MASTER, new ports)
  25. Lua: fix menu.open missing from docs http://www.magiclantern.fm/forum/index.php?topic=21195
  26. Lua stdio: fix buffering issues (error messages written to stderr with fprintf, maybe others)
  27. Lua: sort scripts by filename at startup http://www.magiclantern.fm/forum/index.php?topic=21155
  28. Lua: updated menu.get to return string by default to get an integer: menu.get("Foo", "Bar", 0) old syntax is still valid: menu.get("Foo", "Bar", "") updated API tests http://www.magiclantern.fm/forum/index.php?topic=21145
  29. Merged makefile-updates into lua-fix
  30. Card LED: always use CARD_LED_ADDRESS, LEDON and LEDOFF (backed out 5bfab05 to fix installer on 7D - 0x800c00 not mandatory?)
  31. Makefile: moved 7D-specific tweaks (FIR etc) into main target (7D.203) for consistency with other platforms, including 7D2 to build the regular FIR: make build_fir to build the installer FIR: make ML-SETUP.FIR -B
  32. Makefile: FIR building updates - always install ML-SETUP.FIR (zip, install, install_qemu) - build_fir for regular ML (not installer) now gives AUTOEXEC.FIR - to recompile ML-SETUP.FIR: "make ML-SETUP.FIR -B" from platform directory - "make zip" will also compile the installer from source, without replacing the precompiled ML-SETUP.FIR (just to make sure the source code changes do not interfere with building the installer)
  33. Makefile: fix building xor_chk from its own directory
  34. Makefile: more .NOTPARALLEL fixes
  35. Makefile: fix 7D FIR path (just for consistency)
  36. Makefile: use .NOTPARALLEL in top-level Makefiles, rather than double-colon rules ML platforms/modules are built sequentially, but within each platform/module, parallel build is used to be tested on Mac with -j8 (on Make 3.81, double-colon are executed in parallel, while in 4.2.1 they are sequential)
  37. Makefile: fix README.rst generation with POSIX shells to reproduce: cd modules/filepref; make clean; rm -f README.rst; make SHELL=dash
  38. Makefile: serialize "make install", fix some related dependencies parallel copying could lock up WIFI_SD cards to reproduce: "WIFI_SD=y make install ML_MODULES=" from platform/CAM directory
  39. Makefile: monitor wifi connection when using WIFI_SD=y (experimental, helps troubleshooting connectivity issues)
  40. Makefile: minor refactors for WIFI_SD (coding style) also fixed a typo
  41. Modules: better error handling for missing rst2html http://www.magiclantern.fm/forum/index.php?topic=17099
  42. Makefile: speed optimizations - helper to evaluate only once, only if used - modules hgstamp: only evaluate if used - CF_CARD, VERSION: only evaluate once if used - PWD is special? renamed to avoid unneeded shell calls Profiling tips: - perf record make; perf report --sort comm - make SHELL="sh -x" - make clean SHELL="sh -x" |& grep "^+" | sort | uniq -c
  43. Makefile: enable parallel compilation for modules, but compile them sequentially huge modules like Lua will compile much faster compiling everything in parallel is not 100% safe (some dependency checks may fail)
  44. Makefile: do not print toolchain info on recursive calls
  45. Makefile: reworked global targets install: doesn't make sense, as we no longer have a "one size fits all" build capable of running on all models (alternative: 5D3.113_install, 60D_install etc) zip: build zip for each camera model, sequentially (parallel build still used within each zip) all: similar to zip (build camera models sequentially, but use parallel compilation within each platform) clean, check: these can run in parallel (no restrictions)
  46. Makefile: fix module dependency checking on "make zip" by default, a module succeeds if it can be loaded on any camera model, from those compiled (doesn't matter which one) when using "make zip", we only want to include the modules compatible with current camera model, without considering other models (fixme: not the cleanest way to implement this)
  47. Makefile: fix module_strings dependency rule (previously, there was an error with make -j)
  48. Makefile: dropped ML_MODULES_STATIC (unused) and renamed ML_MODULES_DYNAMIC to ML_MODULES note: if you have customized the module list in Makefile.modules.user, just rename ML_MODULES_DYNAMIC to ML_MODULES to compile without modules: make 5D3 ML_MODULES=
  49. Makefile: fix "make clean" from modules directory with stale modules from other branches https://bitbucket.org/hudson/magic-lantern/pull-requests/873/makefile-updates-to-use-any-valid-arm/diff#comment-48250675
  50. Merged makefile-updates into lua_fix
  51. Makefile: fix running from other directory e.g. from qemu: make -C ../magic-lantern/ 500D_install_qemu
  52. Makefile: model-specific install targets for the root directory examples: make 500D_install; make 500D_install_qemu
  53. 7D: fix compiling with FEATURE_VIDEO_HACKS
  54. Makefile: fix building 7D_MASTER
  55. Makefile: minor cleanups from 0b9b550
  56. Makefile: always define CONFIG_$(MODEL)_$(FW_VERSION) e.g. CONFIG_5D3_113, CONIFG_7D_203 and so on
  57. Makefile: fix for GNU make 3.8.1 (thanks g3gg0)
  58. Makefile: fix newline issue with WIFI_SD=y
  59. Makefile: fix Mac issue (undefine not supported) http://www.magiclantern.fm/forum/index.php?topic=2864.msg192847#msg192847
  60. fixed late evaluation issue in rule builder
  61. Makefile.platform.map: fix indentation
  62. fixed late evaluation issue in rule builder
  63. Merged new-dryos-task-hooks into lua_fix
  64. 550D, 600D: reserve 576K for ML (640 is a bit too much, 512 is too tight)
  65. Merged makefile-updates into lua_fix
  66. Makefile: rules for "make install_qemu" (to use them, qemu has to be installed first)
  67. Lua: initial sketch for camera.gui (Canon GUI modes) Moved display.idle to camera.gui.idle; removed camera.state
  68. gui-common: exit_menu_mode; minor fix in exit_play_qr_mode
  69. gui-common: enter_menu_mode
  70. Moved enter_play_mode, exit_play_qr_mode and PLAY/MENU status helpers to gui-common
  71. Lua: lv.vidmode (current video mode, as string) API tests included
  72. get_video_mode_name: handle paused LiveView mode (PAUSED-LV) and regular photo mode outside LiveView (PH-NOLV)
  73. Lua: lv.overlays (status of Canon/ML overlays in LiveView) API test included
  74. Lua: console.visible (status) API tests updated
  75. Lua: lens.autofocusing (status) API test included (requires user to start autofocusing, as lens.autofocus() blocks until finished)
  76. lua_key.c: fix warning
  77. Lua: fix led_blink, issue #2808
  78. Merged unified into lua_fix
  79. Makefile: with WIFI_SD=y, ping the card until it comes online (useful for router connections)
  80. Makefile: portable way to get number of processors
  81. further makefile cleanup, added make check to show which models were built and their memory usage
  82. fix 'all' target for models
  83. disable ASSERT for 7D_MASTER
  84. removed explicit make executable definition. allows to run e.g. 'remake' to debug make rules
  85. reworked model make rules to support different firmware versions for a model [to be thoroughly tested]
  86. disable ASSERT for 7D_MASTER
  87. Feature matrix: updated links
  88. Merged in daniel_fort/magic-lantern/unified-6D-sf_dump (pull request #876) Add 6D.116 to sf_dump module
  89. Added 6D.116 to sf_dump module.
  90. Merged in daniel_fort/magic-lantern/unified-600D-audio_meters_fix (pull request #877) 600D audio meters fix
  91. 600D also needs Audio IC turned on at boot.
  92. Makefile: also print CONFIG overrides from command-line (alongside the ones from Makefile.user)
  93. Makefile: print tips for using make -j (how to set it by default in Makefiles?)
  94. Makefile: silence warning about CONFIG_SITE (some recent Linux distros use it)
  95. Makefile: portable way to get libgcc.a's path
  96. Makefile: removed old dropbox target
  97. Makefile: print build info after "make zip"; skip EXIDX line
  98. Makefile: fix CONFIG_CCACHE
  99. Makefile: use "gio mount" rather than "gvfs-mount" (they are interchangeable; older systems may require gvfs-mount, newer systems will print warnings)
  100. Task hooks: fix task overriding on very old DryOS models (to be tested on all camera models)
  101. Makefile: if no valid ARM GCC is found in PATH, try to find one in the home directory
  102. selftest: check handling of null pointer errors (make sure a crash log is saved) 100D and 70D used to crash in this scenario, rather than saving a log http://www.magiclantern.fm/forum/index.php?topic=16040.msg190279#msg190279 (next few pages)
  103. Merged unified into new-dryos-task-hooks
  104. Makefile: fix compiling tcc
  105. Makefile: moved toolchain setup to Makefile.setup (this allows toolchain to be overridden from Makefile.user)
  106. Makefile: fixes to allow compiling ML with Linaro arm-eabi-gcc; updated toolchain recommendations
  107. Makefile: updated toolchain recommendation; minor edits
  108. Makefile: attempt to use any arm-none-eabi-gcc from PATH, if already installed (to be tested) By default, it will attempt to use ~/gcc-arm-none-eabi-5_4-2016q3 if installed.
  109. Makefile: use gcc 5.4.1 by default (current version from https://launchpad.net/gcc-arm-embedded )
  110. selftest: save the stub test log in ML/LOGS
  111. selftest: include the stub test summary in the log file
  112. sokoban.lua: save current level in the config file (simple script using the "config" library)
  113. sokoban.lua: refactored the main loop; fixed missing "you win" message
  114. Lua: trigger the config_save event after running the main body of a script (this allows simple scripts to use the config library)
  115. Lua: minor error handling cleanup (simplified logic)
  116. config.lua fixes
  117. console: fix displayed size when console has many empty lines
  118. Lua: clear console when starting a script from menu
  119. Lua: refactored iterations through lua_script list (use a getter for lua_State -> lua_script mapping whenever possible)
  120. Lua: use a message queue for key.wait() (fixes missed key presses caused by race conditios, including quick press/release)
  121. Lua: moved script semaphores into struct lua_script (refactor)
  122. Lua: refactored lua_take_semaphore calls - checking for success: if (result == 0) instead of if(!result) - checking whether "sem" was set: use assert (rather than giving the same error message as a semaphore timeout)
  123. Lua: disable powersave for simple scripts
Changeset 14446:49a22df84796 by g3gg0:
mlv_dump: remove metadata modes. they were not really useful and dont make too much sense.
The file was modifiedmodules/mlv_rec/mlv_dump.c (diff)
Changeset 14445:301f3bd9a8c3 by g3gg0:
chdk-dng: fix some found 64 bit issues
The file was modifiedsrc/chdk-dng.c (diff)
The file was modifiedsrc/chdk-dng.h (diff)
Changeset 14444:f778781ad73c by g3gg0:
mlv_dump: print human readable serial numbers for both camera and lens
The file was modifiedmodules/mlv_rec/mlv_dump.c (diff)
Changeset 14443:d81a99ad4927 by g3gg0:
mlv_rec: properly fill lensSerial with a hex representation of the serial number in lens_info struct
The file was modifiedmodules/mlv_rec/mlv.c (diff)
Changeset 14442:a164cbc33f10 by alex@thinkpad:
Merged lua_fix into crop_rec_4k
Changeset 14441:bf8aa3650d2b by alex@thinkpad:
Merged new-dryos-task-hooks into lua_fix
Changeset 14440:be1f5a30e86f by alex@thinkpad:
Task hooks: disabled task switch debug messages by default<br>(too verbose)
The file was modifiedsrc/boot-hack.c (diff)
Changeset 14439:a0aedff60f8a by alex@thinkpad:
550D, 600D: fix memory allocation (amend 5b4fe18)
The file was modifiedsrc/arm-mcr.h (diff)
The file was modifiedsrc/boot-hack.c (diff)
Changeset 14438:0fe3220a880b by alex@thinkpad:
6D: ADTG shutter addresses did not work, trying another set
The file was modifiedplatform/6D.116/consts.h (diff)
Changeset 14437:224843f599b8 by alex@thinkpad:
6D: fix ADTG shutter addresses after memory layout change<br>http://www.magiclantern.fm/forum/index.php?topic=5601.msg194754#msg194754<br>http://www.magiclantern.fm/forum/index.php?topic=5601.msg191914#msg191914<br>http://www.magiclantern.fm/forum/index.php?topic=15088.msg190890#msg190890<br>not tested, just confirmed the new addresses in QEMU<br>fixme: are these deterministic? under what conditions?
The file was modifiedplatform/6D.116/consts.h (diff)
Changeset 14436:e4ab5b79a173 by alex@thinkpad:
lua_camera: minor help tweaks
The file was modifiedmodules/lua/lua_camera.c (diff)
Changeset 14435:029052971e74 by alex@thinkpad:
lua_camera: getter for gui.mode (missed in 706b131) + API tests
The file was modifiedmodules/lua/lua_camera.c (diff)
The file was modifiedscripts/api_test.lua (diff)
Changeset 14434:485997b4cad1 by alex@thinkpad:
gui-common: fix exit_(play|qr|menu)_mode on 60D (camera.gui tests from api_test.lua are working now)
The file was modifiedsrc/gui-common.c (diff)
Changeset 14433:d7cdf70e2977 by alex@thinkpad:
gui-common: refactored exit_play_qr_mode/exit_menu_mode to avoid duplicate code<br>added exit_play_qr_menu_mode (generic)
The file was modifiedsrc/gui-common.c (diff)
The file was modifiedsrc/gui-common.h (diff)
Changeset 14432:2642fbe1f171 by alex@thinkpad:
Backout bc10355 (undo screenshot palette fix, not portable, issue #2821)
The file was modifiedsrc/screenshot.c (diff)
The file was modifiedsrc/tweaks.c (diff)
Changeset 14431:cd5a40ae0672 by alex@thinkpad:
lua_menu: fix hidden, advanced and edit_mode not working from menu declaration<br>http://www.magiclantern.fm/forum/index.php?topic=21258<br>todo: test all these settings and refactor to avoid duplicate code
The file was modifiedmodules/lua/lua_menu.c (diff)
Changeset 14430:0ec68430819f by alex@thinkpad:
Merged unified into lua_fix
Changeset 14429:f9eed6b80204 by alex@thinkpad:
Merged unified into crop_rec_4k
Changeset 14428:ce89663ff596 by alex@thinkpad:
mlv_dump: fix 0.5 LSB roundoff error when averaging
The file was modifiedmodules/mlv_rec/mlv_dump.c (diff)
Changeset 14427:97b73e7a781e by alex@thinkpad:
Makefile: drop unused SUPPORTED_MODELS / SUPPORTED_UNIFIED_MODELS
The file was modifiedMakefile.user.default (diff)
Changeset 14426:82126d84f311 by alex@thinkpad:
Merged in makefile-updates (pull request #873)<br><br>Makefile updates to use any valid ARM toolchain
Changeset 14425:6cef1ea3d9bf by alex@thinkpad:
Makefile: fix 7D build_fir
The file was modifiedplatform/7D.203/Makefile (diff)
Changeset 14424:52bccf5762ee by alex@thinkpad:
Makefile: fix building Lua with gcc 4.7.3
The file was modifiedsrc/Makefile.src.config (diff)
Changeset 14423:a28936719d11 by alex@thinkpad:
Makefile: only attempt to build/install/check ML-SETUP.FIR if there is a valid installer directory<br>(some platforms may not have have one - 7D_MASTER, new ports)
The file was modifiedplatform/Makefile.platform.extras (diff)
Changeset 14422:84e8d24ae87f by alex@thinkpad:
Lua: fix menu.open missing from docs<br>http://www.magiclantern.fm/forum/index.php?topic=21195
The file was modifiedmodules/lua/lua_menu.c (diff)
Changeset 14421:cd768c4cec37 by alex@thinkpad:
Lua stdio: fix buffering issues<br>(error messages written to stderr with fprintf, maybe others)
The file was modifiedmodules/lua/lua/ml-lua-shim.c (diff)
Changeset 14420:b2f245c13d7e by alex@thinkpad:
Lua: sort scripts by filename at startup<br>http://www.magiclantern.fm/forum/index.php?topic=21155
The file was modifiedmodules/lua/lua.c (diff)
Changeset 14419:cadbb0ea4230 by alex@thinkpad:
Lua: updated menu.get to return string by default<br>to get an integer: menu.get(&quot;Foo&quot;, &quot;Bar&quot;, 0)<br>old syntax is still valid: menu.get(&quot;Foo&quot;, &quot;Bar&quot;, &quot;&quot;)<br>updated API tests<br>http://www.magiclantern.fm/forum/index.php?topic=21145
The file was modifiedmodules/lua/lua_menu.c (diff)
The file was modifiedscripts/api_test.lua (diff)
Changeset 14418:c60d970a5b08 by alex@thinkpad:
Merged makefile-updates into lua-fix
Changeset 14417:5b81f34b425a by alex@thinkpad:
Card LED: always use CARD_LED_ADDRESS, LEDON and LEDOFF<br>(backed out 5bfab05 to fix installer on 7D - 0x800c00 not mandatory?)
The file was modifiedplatform/7D.203/consts.h (diff)
The file was modifiedsrc/debug.c (diff)
The file was modifiedsrc/installer.c (diff)
Changeset 14416:1d98a0736cb8 by alex@thinkpad:
Makefile: moved 7D-specific tweaks (FIR etc) into main target (7D.203)<br>for consistency with other platforms, including 7D2<br>to build the regular FIR: make build_fir<br>to build the installer FIR: make ML-SETUP.FIR -B
The file was modifiedplatform/7D.203/Makefile (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 14415:f8beef0ca833 by alex@thinkpad:
Makefile: FIR building updates<br>- always install ML-SETUP.FIR (zip, install, install_qemu)<br>- build_fir for regular ML (not installer) now gives AUTOEXEC.FIR<br>- to recompile ML-SETUP.FIR: &quot;make ML-SETUP.FIR -B&quot; from platform directory<br>- &quot;make zip&quot; will also compile the installer from source, without replacing the precompiled ML-SETUP.FIR<br>&nbsp; (just to make sure the source code changes do not interfere with building the installer)
The file was modifiedMakefile.inc (diff)
The file was modifiedMakefile.top (diff)
The file was modifiedplatform/Makefile.platform.base (diff)
The file was modifiedplatform/Makefile.platform.extras (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 14414:47f3108811c3 by alex@thinkpad:
Makefile: fix building xor_chk from its own directory
The file was modifiedbuild_tools/Makefile (diff)
Changeset 14413:59a6d0a40c7f by alex@thinkpad:
Makefile: more .NOTPARALLEL fixes
The file was modifiedMakefile (diff)
The file was modifiedinstaller/Makefile (diff)
Changeset 14412:5249a4ab74fa by alex@thinkpad:
Makefile: fix 7D FIR path<br>(just for consistency)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 14411:2c627b19c8df by alex@thinkpad:
Makefile: use .NOTPARALLEL in top-level Makefiles, rather than double-colon rules<br>ML platforms/modules are built sequentially, but within each platform/module, parallel build is used<br>to be tested on Mac with -j8<br>(on Make 3.81, double-colon are executed in parallel, while in 4.2.1 they are sequential)
The file was modifiedMakefile (diff)
The file was modifiedmodules/Makefile (diff)
The file was modifiedplatform/Makefile (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 14410:36d3ec245c1f by alex@thinkpad:
Makefile: fix README.rst generation with POSIX shells<br>to reproduce: cd modules/filepref; make clean; rm -f README.rst; make SHELL=dash
The file was modifiedmodules/Makefile.modules (diff)
Changeset 14409:01953d31029b by alex@thinkpad:
Makefile: serialize &quot;make install&quot;, fix some related dependencies<br>parallel copying could lock up WIFI_SD cards<br>to reproduce: &quot;WIFI_SD=y make install ML_MODULES=&quot; from platform/CAM directory
The file was modifiedMakefile.inc (diff)
The file was modifiedmodules/Makefile (diff)
The file was modifiedmodules/Makefile.modules (diff)
Changeset 14408:e592e31c3b41 by alex@thinkpad:
Makefile: monitor wifi connection when using WIFI_SD=y<br>(experimental, helps troubleshooting connectivity issues)
The file was modifiedMakefile.user.default (diff)
Changeset 14407:84d6ed453e7a by alex@thinkpad:
Makefile: minor refactors for WIFI_SD (coding style)<br>also fixed a typo
The file was modifiedMakefile.user.default (diff)
Changeset 14406:26fe70cea745 by alex@thinkpad:
Modules: better error handling for missing rst2html<br>http://www.magiclantern.fm/forum/index.php?topic=17099
The file was modifiedmodules/Makefile.modules (diff)
The file was modifiedmodules/readme2modulestrings.py (diff)
Changeset 14405:5ea430b1fb60 by alex@thinkpad:
Makefile: speed optimizations<br>- helper to evaluate only once, only if used<br>- modules hgstamp: only evaluate if used<br>- CF_CARD, VERSION: only evaluate once if used<br>- PWD is special? renamed to avoid unneeded shell calls<br>Profiling tips:<br>- perf record make; perf report --sort comm<br>- make SHELL=&quot;sh -x&quot;<br>- make clean SHELL=&quot;sh -x&quot; |&amp; grep &quot;^+&quot; | sort | uniq -c
The file was modifiedMakefile.inc (diff)
The file was modifiedMakefile.top (diff)
The file was modifiedMakefile.user.default (diff)
The file was modifiedmodules/Makefile.modules (diff)
Changeset 14404:f2ed3dc0790a by alex@thinkpad:
Makefile: enable parallel compilation for modules, but compile them sequentially<br>huge modules like Lua will compile much faster<br>compiling everything in parallel is not 100% safe (some dependency checks may fail)
The file was modifiedmodules/Makefile (diff)
The file was modifiedmodules/Makefile.modules (diff)
Changeset 14403:4d93c8f7bca3 by alex@thinkpad:
Makefile: do not print toolchain info on recursive calls
The file was modifiedMakefile.setup.toolchain (diff)
Changeset 14402:d20616702840 by alex@thinkpad:
Makefile: reworked global targets<br>install: doesn&#039;t make sense, as we no longer have a &quot;one size fits all&quot; build capable of running on all models<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (alternative: 5D3.113_install, 60D_install etc)<br>zip: build zip for each camera model, sequentially (parallel build still used within each zip)<br>all: similar to zip (build camera models sequentially, but use parallel compilation within each platform)<br>clean, check: these can run in parallel (no restrictions)
The file was modifiedMakefile (diff)
The file was modifiedplatform/Makefile (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 14401:aa050618c27f by alex@thinkpad:
Makefile: fix module dependency checking on &quot;make zip&quot;<br>by default, a module succeeds if it can be loaded on any camera model, from those compiled (doesn&#039;t matter which one)<br>when using &quot;make zip&quot;, we only want to include the modules compatible with current camera model, without considering other models<br>(fixme: not the cleanest way to implement this)
The file was modifiedMakefile.inc (diff)
Changeset 14400:718e285e224d by alex@thinkpad:
Makefile: fix module_strings dependency rule<br>(previously, there was an error with make -j)
The file was modifiedmodules/Makefile.modules (diff)
Changeset 14399:2db4026d348a by alex@thinkpad:
Makefile: dropped ML_MODULES_STATIC (unused) and renamed ML_MODULES_DYNAMIC to ML_MODULES<br>note: if you have customized the module list in Makefile.modules.user, just rename ML_MODULES_DYNAMIC to ML_MODULES<br>to compile without modules: make 5D3 ML_MODULES=
The file was modifiedmodules/Makefile (diff)
The file was modifiedmodules/Makefile.modules.default (diff)
Changeset 14398:ff1401e9fc1c by alex@thinkpad:
Makefile: fix &quot;make clean&quot; from modules directory with stale modules from other branches<br>https://bitbucket.org/hudson/magic-lantern/pull-requests/873/makefile-updates-to-use-any-valid-arm/diff#comment-48250675
The file was modifiedmodules/Makefile (diff)
Changeset 14397:29f030c2864e by alex@thinkpad:
Merged makefile-updates into lua_fix
Changeset 14396:3ca10bd65cbf by alex@thinkpad:
Makefile: fix running from other directory<br>e.g. from qemu: make -C ../magic-lantern/ 500D_install_qemu
The file was modifiedMakefile (diff)
Changeset 14395:919971999199 by alex@thinkpad:
Makefile: model-specific install targets for the root directory<br>examples: make 500D_install; make 500D_install_qemu
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 14394:871f759a2ada by alex@thinkpad:
7D: fix compiling with FEATURE_VIDEO_HACKS
The file was modifiedsrc/ml_rpc.h (diff)
Changeset 14393:6a08a65fe077 by alex@thinkpad:
Makefile: fix building 7D_MASTER
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 14392:c7554e33d373 by alex@thinkpad:
Makefile: minor cleanups from 0b9b550
The file was modifiedMakefile.user.default (diff)
Changeset 14391:440a589e5781 by alex@thinkpad:
Makefile: always define CONFIG_$(MODEL)_$(FW_VERSION)<br>e.g. CONFIG_5D3_113, CONIFG_7D_203 and so on
The file was modifiedplatform/5D3.113/Makefile.setup.default (diff)
The file was modifiedplatform/5D3.123/Makefile.setup.default (diff)
The file was modifiedsrc/Makefile.src (diff)
Changeset 14390:539328ffa29d by alex@thinkpad:
Makefile: fix for GNU make 3.8.1<br>(thanks g3gg0)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 14389:f03c00c5604f by alex@thinkpad:
Makefile: fix newline issue with WIFI_SD=y
The file was modifiedMakefile.user.default (diff)
Changeset 14388:84d1418c2bae by alex@thinkpad:
Makefile: fix Mac issue (undefine not supported)<br>http://www.magiclantern.fm/forum/index.php?topic=2864.msg192847#msg192847
The file was modifiedMakefile.setup (diff)
Changeset 14387:623689fc0520 by g3gg0:
fixed late evaluation issue in rule builder
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 14386:bda493a4af60 by alex@thinkpad:
Makefile.platform.map: fix indentation
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 14385:ab6ed83893c1 by g3gg0:
fixed late evaluation issue in rule builder
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 14384:60c763bc0456 by alex@thinkpad:
Merged new-dryos-task-hooks into lua_fix
Changeset 14383:5b4fe1896509 by alex@thinkpad:
550D, 600D: reserve 576K for ML<br>(640 is a bit too much, 512 is too tight)
The file was modifiedplatform/550D.109/Makefile.platform.default (diff)
The file was modifiedplatform/600D.102/Makefile.platform.default (diff)
The file was modifiedsrc/boot-hack.c (diff)
Changeset 14382:5bcd52b5db2e by alex@thinkpad:
Merged makefile-updates into lua_fix
Changeset 14381:27f4105cfa83 by alex@thinkpad:
Makefile: rules for &quot;make install_qemu&quot;<br>(to use them, qemu has to be installed first)
The file was modifiedMakefile.inc (diff)
Changeset 14380:706b1311f786 by alex@thinkpad:
Lua: initial sketch for camera.gui (Canon GUI modes)<br>Moved display.idle to camera.gui.idle; removed camera.state
The file was modifiedmodules/lua/lua_camera.c (diff)
The file was modifiedmodules/lua/lua_display.c (diff)
The file was modifiedscripts/api_test.lua (diff)
Changeset 14379:1a55233d4b5c by alex@thinkpad:
gui-common: exit_menu_mode; minor fix in exit_play_qr_mode
The file was modifiedsrc/gui-common.c (diff)
The file was modifiedsrc/gui-common.h (diff)
Changeset 14378:c1d164e1fdf4 by alex@thinkpad:
gui-common: enter_menu_mode
The file was modifiedsrc/gui-common.c (diff)
The file was modifiedsrc/gui-common.h (diff)
Changeset 14377:1a9917c75999 by alex@thinkpad:
Moved enter_play_mode, exit_play_qr_mode and PLAY/MENU status helpers to gui-common
The file was modifiedsrc/gui-common.c (diff)
The file was modifiedsrc/gui-common.h (diff)
The file was modifiedsrc/shoot.c (diff)
The file was modifiedsrc/shoot.h (diff)
The file was modifiedsrc/tweaks.c (diff)
Changeset 14376:3c5220204c98 by alex@thinkpad:
Lua: lv.vidmode (current video mode, as string)<br>API tests included
The file was modifiedmodules/lua/lua_lv.c (diff)
The file was modifiedscripts/api_test.lua (diff)
Changeset 14375:608755552ec2 by alex@thinkpad:
get_video_mode_name: handle paused LiveView mode (PAUSED-LV) and regular photo mode outside LiveView (PH-NOLV)
The file was modifiedsrc/propvalues.c (diff)
Changeset 14374:811e02485610 by alex@thinkpad:
Lua: lv.overlays (status of Canon/ML overlays in LiveView)<br>API test included
The file was modifiedmodules/lua/lua_lv.c (diff)
The file was modifiedscripts/api_test.lua (diff)
Changeset 14373:36f1a4c763b7 by alex@thinkpad:
Lua: console.visible (status)<br>API tests updated
The file was modifiedmodules/lua/lua_console.c (diff)
The file was modifiedscripts/api_test.lua (diff)
Changeset 14372:254314a2010f by alex@thinkpad:
Lua: lens.autofocusing (status)<br>API test included (requires user to start autofocusing, as lens.autofocus() blocks until finished)
The file was modifiedmodules/lua/lua_lens.c (diff)
The file was modifiedscripts/api_test.lua (diff)
Changeset 14371:0381d5061c40 by alex@thinkpad:
lua_key.c: fix warning
The file was modifiedmodules/lua/lua_key.c (diff)
Changeset 14370:45a225b14ef2 by alex@thinkpad:
Lua: fix led_blink, issue #2808
The file was modifiedmodules/lua/lua_globals.c (diff)
Changeset 14369:aa09cc145c8d by alex@thinkpad:
Merged unified into lua_fix
Changeset 14368:383ea35cd0e1 by alex@thinkpad:
Makefile: with WIFI_SD=y, ping the card until it comes online (useful for router connections)
The file was modifiedMakefile.user.default (diff)
Changeset 14367:7fd995a3d2fe by alex@thinkpad:
Makefile: portable way to get number of processors
The file was modifiedsrc/Makefile.src (diff)
Changeset 14366:30a88aae702c by g3gg0:
further makefile cleanup, added make check to show which models were built and their memory usage
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 14365:37dd5965566a by g3gg0:
fix &#039;all&#039; target for models
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 14364:dcc15836c1f3 by g3gg0:
disable ASSERT for 7D_MASTER
The file was modifiedsrc/dryos.h (diff)
Changeset 14363:376a9cc553a9 by g3gg0:
removed explicit make executable definition. allows to run e.g. &#039;remake&#039; to debug make rules
The file was modifiedMakefile.top (diff)
Changeset 14362:e6ffbdf45848 by g3gg0:
reworked model make rules to support different firmware versions for a model [to be thoroughly tested]
The file was modifiedMakefile (diff)
The file was modifiedplatform/Makefile (diff)
The file was modifiedplatform/Makefile.platform.base (diff)
The file was modifiedplatform/Makefile.platform.map (diff)
Changeset 14361:9033380d4145 by g3gg0:
disable ASSERT for 7D_MASTER
The file was modifiedsrc/dryos.h (diff)
Changeset 14360:a494258984e1 by alex@thinkpad:
Feature matrix: updated links
The file was modifiedfeatures/features-html.py (diff)
Changeset 14359:3f85e3402fe5 by Alex <broscutamaker@gmail.com>:
Merged in daniel_fort/magic-lantern/unified-6D-sf_dump (pull request #876)<br><br>Add 6D.116 to sf_dump module
Changeset 14358:c326fdc91130 by Daniel Fort <dan@digiola.com>:
Added 6D.116 to sf_dump module.
The file was modifiedmodules/sf_dump/sf_dump.c (diff)
Changeset 14357:75a085c2d38c by Alex <broscutamaker@gmail.com>:
Merged in daniel_fort/magic-lantern/unified-600D-audio_meters_fix (pull request #877)<br><br>600D audio meters fix
Changeset 14356:c82a97f50486 by Daniel Fort <dan@digiola.com>:
600D also needs Audio IC turned on at boot.
The file was modifiedsrc/audio-common.c (diff)
Changeset 14355:d4e642179ab3 by alex@thinkpad:
Makefile: also print CONFIG overrides from command-line<br>(alongside the ones from Makefile.user)
The file was modifiedsrc/Makefile.src (diff)
Changeset 14354:447a93cb1862 by alex@thinkpad:
Makefile: print tips for using make -j<br>(how to set it by default in Makefiles?)
The file was modifiedsrc/Makefile.src (diff)
Changeset 14353:4b4b194b47be by alex@thinkpad:
Makefile: silence warning about CONFIG_SITE<br>(some recent Linux distros use it)
The file was modifiedMakefile.setup (diff)
Changeset 14352:345427fce64c by alex@thinkpad:
Makefile: portable way to get libgcc.a&#039;s path
The file was modifiedMakefile.setup.toolchain (diff)
The file was modifiedMakefile.user.default (diff)
Changeset 14351:26c84b1af25e by alex@thinkpad:
Makefile: removed old dropbox target
The file was modifiedMakefile (diff)
Changeset 14350:be16e64382b6 by alex@thinkpad:
Makefile: print build info after &quot;make zip&quot;; skip EXIDX line
The file was modifiedMakefile.inc (diff)
The file was modifiedsrc/Makefile.src (diff)
Changeset 14349:d3e332db1169 by alex@thinkpad:
Makefile: fix CONFIG_CCACHE
The file was modifiedMakefile.setup (diff)
Changeset 14348:f51317e620f6 by alex@thinkpad:
Makefile: use &quot;gio mount&quot; rather than &quot;gvfs-mount&quot;<br>(they are interchangeable; older systems may require gvfs-mount, newer systems will print warnings)
The file was modifiedMakefile.user.default (diff)
Changeset 14347:0391160eb560 by alex@thinkpad:
Task hooks: fix task overriding on very old DryOS models<br>(to be tested on all camera models)
The file was modifiedsrc/boot-hack.c (diff)
Changeset 14346:9aec0a114e6b by alex@thinkpad:
Makefile: if no valid ARM GCC is found in PATH, try to find one in the home directory
The file was modifiedMakefile.setup.toolchain (diff)
Changeset 14345:84dd3fdfe3c6 by alex@thinkpad:
selftest: check handling of null pointer errors (make sure a crash log is saved)<br>100D and 70D used to crash in this scenario, rather than saving a log<br>http://www.magiclantern.fm/forum/index.php?topic=16040.msg190279#msg190279 (next few pages)
The file was modifiedmodules/selftest/selftest.c (diff)
Changeset 14344:02c1a680ebe3 by alex@thinkpad:
Merged unified into new-dryos-task-hooks
Changeset 14343:cd0ee9461466 by alex@thinkpad:
Makefile: fix compiling tcc
The file was addedMakefile.setup.toolchain
The file was modifiedMakefile.setup (diff)
The file was modifiedtcc/Makefile (diff)
Changeset 14342:d06fe5db790f by alex@thinkpad:
Makefile: moved toolchain setup to Makefile.setup<br>(this allows toolchain to be overridden from Makefile.user)
The file was modifiedMakefile.setup (diff)
The file was modifiedMakefile.user.default (diff)
Changeset 14341:993fd34e896f by alex@thinkpad:
Makefile: fixes to allow compiling ML with Linaro arm-eabi-gcc; updated toolchain recommendations
The file was modifiedMakefile.user.default (diff)
Changeset 14340:579cec74efd8 by alex@thinkpad:
Makefile: updated toolchain recommendation; minor edits
The file was modifiedMakefile.user.default (diff)
Changeset 14339:6566325a85e8 by alex@thinkpad:
Makefile: attempt to use any arm-none-eabi-gcc from PATH, if already installed (to be tested)<br>By default, it will attempt to use ~/gcc-arm-none-eabi-5_4-2016q3 if installed.
The file was modifiedMakefile.user.default (diff)
Changeset 14338:e533765f6941 by alex@thinkpad:
Makefile: use gcc 5.4.1 by default (current version from https://launchpad.net/gcc-arm-embedded )
The file was modifiedMakefile.user.default (diff)
Changeset 14337:edbf5ee5fc13 by alex@thinkpad:
selftest: save the stub test log in ML/LOGS
The file was modifiedmodules/selftest/selftest.c (diff)
Changeset 14336:b1b8162ce0e6 by alex@thinkpad:
selftest: include the stub test summary in the log file
The file was modifiedmodules/selftest/selftest.c (diff)
Changeset 14335:2c8a5d00bca4 by alex@thinkpad:
sokoban.lua: save current level in the config file<br>(simple script using the &quot;config&quot; library)
The file was modifiedscripts/sokoban.lua (diff)
Changeset 14334:06e722000783 by alex@thinkpad:
sokoban.lua: refactored the main loop; fixed missing &quot;you win&quot; message
The file was modifiedscripts/sokoban.lua (diff)
Changeset 14333:3aa71a6650c5 by alex@thinkpad:
Lua: trigger the config_save event after running the main body of a script<br>(this allows simple scripts to use the config library)
The file was modifiedmodules/lua/config.ld (diff)
The file was modifiedmodules/lua/lua.c (diff)
Changeset 14332:e58024eb9bc3 by alex@thinkpad:
Lua: minor error handling cleanup (simplified logic)
The file was modifiedmodules/lua/lua.c (diff)
The file was modifiedscripts/lib/config.lua (diff)
Changeset 14330:f701759236b5 by alex@thinkpad:
console: fix displayed size when console has many empty lines
The file was modifiedsrc/console.c (diff)
Changeset 14329:0fbcfb0e33c4 by alex@thinkpad:
Lua: clear console when starting a script from menu
The file was modifiedmodules/lua/lua.c (diff)
Changeset 14328:ed6e385d6989 by alex@thinkpad:
Lua: refactored iterations through lua_script list<br>(use a getter for lua_State -&gt; lua_script mapping whenever possible)
The file was modifiedmodules/lua/lua.c (diff)
Changeset 14327:cf3cbf682827 by alex@thinkpad:
Lua: use a message queue for key.wait()<br>(fixes missed key presses caused by race conditios, including quick press/release)
The file was modifiedmodules/lua/lua.c (diff)
The file was modifiedmodules/lua/lua_common.h (diff)
The file was modifiedmodules/lua/lua_key.c (diff)
Changeset 14326:426b80c4db13 by alex@thinkpad:
Lua: moved script semaphores into struct lua_script (refactor)
The file was modifiedmodules/lua/lua.c (diff)
Changeset 14325:eff9892a27d9 by alex@thinkpad:
Lua: refactored lua_take_semaphore calls<br>- checking for success: if (result == 0) instead of if(!result)<br>- checking whether &quot;sem&quot; was set: use assert (rather than giving the same error message as a semaphore timeout)
The file was modifiedmodules/lua/lua.c (diff)
The file was modifiedmodules/lua/lua_lv.c (diff)
The file was modifiedmodules/lua/lua_menu.c (diff)
The file was modifiedmodules/lua/lua_property.c (diff)
The file was modifiedmodules/lua/lua_task.c (diff)
Changeset 14324:7e8c58a8c76f by alex@thinkpad:
Lua: disable powersave for simple scripts
The file was modifiedmodules/lua/lua.c (diff)