View source
update-to-5D.136-wip
  • Contributors
    1. Loading...
Author Commit Message Date Builds
17 commits behind default.
Daniel Fort
5D3.136: partially working in QEMU https://www.magiclantern.fm/forum/index.php?topic=18941.msg221472#msg221472
Daniel Fort
5D3.136 stubs: found several discrepancies using check-stubs.py script. https://www.magiclantern.fm/forum/index.php?topic=18941.msg221469#msg221469
Daniel Fort
5D3.136: attempt to update partially working 5D3.135 to 5D3.136 - not yet working
Daniel Fort
Corrected constants. Thanks critix
Daniel Fort
Merged unified into update-to-5D.135-wip
Alex
Ghost image: further cleanups and fixes
Alex
Ghost image: fix crash (issues #2796, #2783, #2878, #2885)
Erik Krause
features.tmpl edited online with Bitbucket: use id in th section heading to allow for direct linking via anchor
Alex
Merged in edmac (pull request #886) EDMAC module: fixes for DIGIC 4, connection map
Alex
Merged in adv_int (pull request #907) Advanced intervalometer updates
Alex
Merged in memory-backend (pull request #906) Memory backend improvements
Alex
Makefile: fix "make install_qemu CONFIG_QEMU=y" for minimal targets
Alex
Merged in nikfreak/magic-lantern/unified_sf_dump_70D (pull request #853) sf_dump.mo: support for 70D
Alex
Close branch
nikfreak
add 70D stubs for sf_dump module
nikfreak
Created new branch unified_sf_dump_70D
Alex
Merged in es_as/magic-lantern (pull request #891) 650D: sf_dump stubs
Espen
650D:sf_dump stubs
Alex
Merged in daniel_fort/magic-lantern/unified_650D.104_stub_fix (pull request #923) Fix 650D PlayMovieGuideApp_handler
Alex
Close branch
Daniel Fort
Fixed stub. Discovered while running lua API tests. https://www.magiclantern.fm/forum/index.php?topic=7473.msg200626#msg200626
Alex
memset64/memcpy64: use versions from b831cb1; fix calls from Magic Zoom to ensure proper alignment
Alex
Backout b831cb1 (breaks Magic Zoom and CONFIG_MARK_UNUSED_MEMORY_AT_STARTUP, as memset64 is not the same as memset)
Daniel Fort
Merged in latest unified changes just to keep this up to date. Not tested.
Daniel Fort
Merged in latest unified to remove conflicts from pull request
Alex
adv_int: ignore empty lines when loading keyframes
Alex
adv_int: use strstr instead of my_strstr (fixes slow load)
Alex
Include strstr in ML core
Alex
adv_int: refactor keyframe time formatting
Alex
adv_int: auto-load the saved sequence at startup
Alex
adv_int: renamed menu entry to "Ramping options"
Alex
Memory backend: drop timestamps from history; show last 1024 events
Alex
Memory backend: show total allocations (number and amount), including untracked ones
Alex
Memory backend: allow using shoot_malloc as a last resort, even for small blocks; allow small blocks (smaller than minimum_free_space / 64) to break the minimum_free_space limit (until minimum_free_space / 4) fine-tuned until the old set of Lua scripts were able to run on 1100D without umm_malloc
Alex
Memory backend: a pointer to task names (rather than copying the full string) should be enough
Alex
Memory backend: renamed memcheck_mallocbuf to memcheck_entries
Alex
Moved memset64 and memcpy64 to bench.mo - simplified to accept only 32-bit aligned pointers - using regular memset for Magic Zoom - closing issue #1995
Alex
Memory backend: if shoot_malloc fails, try SRM next (poor man's autodetection, since we don't know how to query the available size in advance)
Alex
exmem: reworked shoot_malloc to handle large requests better - moved autodetection to dedicated functions (for both fragmented and continuous allocations) - autodetect the max available size for large requests (slower, but when it fails, it fails gracefully)
Alex
exmem: removed the "relaxed" checks introduced in 04f02a4 (not sure why they were needed; we'll find out if it fails)
Alex
exmem: speed-up shoot_malloc (1s timeout probably not needed)
Alex
exmem: do not keep track of full shoot memory allocations (allows reserving some memory in advance and allocating all the remaining RAM afterwards)
Alex
Memory backend: fix handling of untracked blocks (possible buffer overflow before this fix)
Alex
Memory backend: figured out why AllocateContinuousMemoryResource may crash with many small blocks (todo: figure out where to keep 89e3b12 or not; adapt tests if not)
Alex
Memory backend: when checking available memory, allocate both Shoot ans SRM at the same time (they may overlap)
Alex
Memory backend: fix initialization
Alex
mem.c: option to disable heap poisoning (useful when running in QEMU with -d memcheck - with this, overflowing reads will be caught as well)
Alex
Memory backend: allow breaking minimum_free_space for small blocks (it was possible to fail the allocation for very small blocks that could not be covered by shoot_malloc)
Alex
Memory backend: allow AllocateMemory as a last resort, even if free space is below limit (it was possible to fail the allocation for very small blocks that could not be covered by shoot_malloc)
Alex
memory backend: reduce memcheck area (should reduce overhead a bit)
Alex
memory backend: ignore null pointers passed to free (Lua does that)
Alex
exmem: when autodetecting available memory, print all srm/shoot memory blocks to console
Daniel Fort
Find the latest version of exiftool.
Alex
Merged in garry23/dof-fix-for-focus.c/garry23/focusc-edited-online-with-bitbucket-by-g-1495645868417 (pull request #831) Changed the DoF equations to better handle integer math and used a different source for the equations.
Alex
Dummy merge (reference changeset for make install_qemu)
Alex
Merged in makefile-updates (pull request #898) Makefile updates part 2 (minor fixes, updated make install_qemu)
Alex
focus.c: fix possible overflow when computing hyperfocal (corner case) examples (focal_len, focus_dist): 73 4689 90 7123 91 7282 98 8444 ...
Alex
focus.c: fix typo pointed out by garry23 http://www.magiclantern.fm/forum/index.php?topic=9741.msg196728#msg196728
Alex
Makefile: updated rules for "make install_qemu" (for reference, should anyone ever want to use them on older changesets) Before using them, qemu has to be installed first in qemu-eos (from the qemu branch) QEMU installation directory can be changed from the QEMU_DIR environment variable, or from Makefile.user
Garry George
Changed the DoF equations to better handle integer math and used a different source for the equations.
Garry George
focus.c edited online with Bitbucket
Garry George
focus.c edited online with Bitbucket (updated)
Garry George
focus.c edited online with Bitbucket by Garry
Alex
Makefile: moved default QEMU directory to qemu-eos
Alex
Makefile: also updated QEMU_INSTALLED_DBI_DIR to use QEMU_PATH
Alex
Makefile: fix copy/paste error
Alex
Makefile: fix cleaning up after "make zip"; removed warning
Alex
Makefile: allow changing QEMU installation directory from Makefile.user and/or the environment (QEMU_DIR)
Alex
Makefile: zip and install_qemu targets for modules
Alex
Makefile: always clean after running install_check http://www.magiclantern.fm/forum/index.php?topic=991.msg194444#msg194444
Alex
Makefile: always rebuild version.o
Alex
Makefile: prevent install_check from running in parallel with building regular ML (conflicts while compiling from the same sources - http://www.magiclantern.fm/forum/index.php?topic=991.msg194315#msg194315 )
Alex
edmac: make sure the log files don't have unnecessary newlines (channels with complex size configuration may get printed on multiple lines; that makes the log file harder to parse)
Alex
edmac: LOG_INTERVAL can now be changed from menu (persistent setting)
Alex
edmac: use numbered log file names
Alex
edmac: fix behavior when the extra info buffer gets full
Alex
edmac: use half-shutter as trigger for logging EDMAC channels; fine-tuned messages
Alex
edmac: fix crash on models other than 5D3 (there was a hardcoded stub)
Alex
edmac: fix crash when using "Log EDMAC usage" on D4 models
Alex
Merged unified into edmac
Alex
Added edmac.mo to nightly builds
Alex
edmac-memcpy: check to make sure all models have AbortEDmac (to make sure it's correct: selftest.mo -> Stubs API test)
Alex
Makefile: drop unused SUPPORTED_MODELS / SUPPORTED_UNIFIED_MODELS
Alex
Merged in makefile-updates (pull request #873) Makefile updates to use any valid ARM toolchain
Alex
Makefile: fix 7D build_fir
Alex
Makefile: fix building Lua with gcc 4.7.3
Alex
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)
Alex
Card LED: always use CARD_LED_ADDRESS, LEDON and LEDOFF (backed out 5bfab05 to fix installer on 7D - 0x800c00 not mandatory?)
Alex
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
Alex
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)
Daniel Fort
Found some things that needed fixing while working on the 5D3.135 firmware update.
Daniel Fort
Got the rest of the pieces in order -- sort of. Not working yet.
Daniel Fort
formatting fix
Alex
Makefile: fix building xor_chk from its own directory
Alex
Makefile: more .NOTPARALLEL fixes
Alex
Makefile: fix 7D FIR path (just for consistency)
Alex
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)
Daniel Fort
All stubs found.
Daniel Fort
Another constant that has changed.
Daniel Fort
Found another changed constant.
Daniel Fort
Made change in 5D3.134 constants.
Daniel Fort
Another changed constant that needs fixing in 5D3.134 also?
Daniel Fort
Maybe found more constants that have changed.
Daniel Fort
Found some stubs that changed. Also should change 5D3.134
Daniel Fort
Setup for minimal autoexec.bin
Daniel Fort
Updated Makefiles and qemu script.
Daniel Fort
Prepare source tree for firmware update.
Daniel Fort
Fixed syntax error.
Daniel Fort
Added porting thread URL.
Daniel Fort
Merged in latest unified.
Alex
Makefile: fix README.rst generation with POSIX shells to reproduce: cd modules/filepref; make clean; rm -f README.rst; make SHELL=dash
Alex
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
Alex
Makefile: monitor wifi connection when using WIFI_SD=y (experimental, helps troubleshooting connectivity issues)
Alex
Makefile: minor refactors for WIFI_SD (coding style) also fixed a typo
Alex
Modules: better error handling for missing rst2html http://www.magiclantern.fm/forum/index.php?topic=17099
Alex
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
Alex
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)
Alex
Makefile: do not print toolchain info on recursive calls
Alex
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 …
Alex
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)
Alex
Makefile: fix module_strings dependency rule (previously, there was an error with make -j)
Alex
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=
Alex
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
Alex
Makefile: fix running from other directory e.g. from qemu: make -C ../magic-lantern/ 500D_install_qemu
Alex
Makefile: model-specific install targets for the root directory examples: make 500D_install; make 500D_install_qemu
Alex
7D: fix compiling with FEATURE_VIDEO_HACKS
Alex
Makefile: fix building 7D_MASTER
Alex
Makefile: minor cleanups from 0b9b550
Alex
Makefile: always define CONFIG_$(MODEL)_$(FW_VERSION) e.g. CONFIG_5D3_113, CONIFG_7D_203 and so on
Alex
Makefile: fix for GNU make 3.8.1 (thanks g3gg0)
Alex
Makefile: fix newline issue with WIFI_SD=y
Daniel Fort
Some more areas where 5D3.134 needed special attention.
Daniel Fort
Found SENSOR_TIMING_TABLE value for 1.3.4
Daniel Fort
Needed to add the 5D3.134 firmware to the prop_lv_lens structure. http://www.magiclantern.fm/forum/index.php?topic=18966.msg193324#msg193324
Daniel Fort
DIALOG_MnCardFormatBegin was off. Now the Canon menus no longer flicker when first accessing the ML menu outside of LiveView.
Daniel Fort
Fixed card formatting constants. http://www.magiclantern.fm/forum/index.php?topic=2864.msg193141#msg193141
Alex
Makefile: fix Mac issue (undefine not supported) http://www.magiclantern.fm/forum/index.php?topic=2864.msg192847#msg192847
Georg Hofstetter
fixed late evaluation issue in rule builder
Alex
Makefile.platform.map: fix indentation
Alex
Makefile: rules for "make install_qemu" (to use them, qemu has to be installed first)
Alex
Makefile: with WIFI_SD=y, ping the card until it comes online (useful for router connections)
Daniel Fort
Found addresses for dumping the serial flash but like the 5D3.113 it isn't working.
Daniel Fort
Removed ML-SETUP.FIR, fixed a few stubs and cleaned up stubs.S file.
Alex
Makefile: portable way to get number of processors
Georg Hofstetter
further makefile cleanup, added make check to show which models were built and their memory usage
Georg Hofstetter
fix 'all' target for models
Georg Hofstetter
disable ASSERT for 7D_MASTER
Georg Hofstetter
removed explicit make executable definition. allows to run e.g. 'remake' to debug make rules
Georg Hofstetter
reworked model make rules to support different firmware versions for a model [to be thoroughly tested]
Georg Hofstetter
disable ASSERT for 7D_MASTER
Alex
Feature matrix: updated links
Alex
Merged in daniel_fort/magic-lantern/unified-6D-sf_dump (pull request #876) Add 6D.116 to sf_dump module
Alex
Merged in daniel_fort/magic-lantern/unified-600D-audio_meters_fix (pull request #877) 600D audio meters fix
Alex
Makefile: also print CONFIG overrides from command-line (alongside the ones from Makefile.user)
Alex
Makefile: print tips for using make -j (how to set it by default in Makefiles?)
Alex
Makefile: silence warning about CONFIG_SITE (some recent Linux distros use it)
Daniel Fort
600D also needs Audio IC turned on at boot.
Alex
Makefile: portable way to get libgcc.a's path
Alex
Makefile: removed old dropbox target
Alex
Makefile: print build info after "make zip"; skip EXIDX line
Alex
Makefile: fix CONFIG_CCACHE
Alex
Makefile: use "gio mount" rather than "gvfs-mount" (they are interchangeable; older systems may require gvfs-mount, newer systems will print warnings)
Alex
Makefile: if no valid ARM GCC is found in PATH, try to find one in the home directory
Daniel Fort
Added 6D.116 to sf_dump module.
Daniel Fort
Resolved merge conflict. Added AbortEDmac stub.
Alex
Makefile: fix compiling tcc
Alex
Makefile: moved toolchain setup to Makefile.setup (this allows toolchain to be overridden from Makefile.user)
Alex
Makefile: fixes to allow compiling ML with Linaro arm-eabi-gcc; updated toolchain recommendations
Alex
Makefile: updated toolchain recommendation; minor edits
Alex
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.
Alex
Makefile: use gcc 5.4.1 by default (current version from https://launchpad.net/gcc-arm-embedded )
Daniel Fort
Merged unified into update-to-5D3.134 -- still need to work on some new stubs.
Alex
Merged in daniel_fort/magic-lantern/unified_650D_audio_meters_fix (pull request #870) 650D audio meters fix
Daniel Fort
650D has the same audio meters issue as the 700D -- needs the same fix.
Alex
Merged in daniel_fort/magic-lantern/unified_700D_audio_meters_fix_1 (pull request #866) Audio meters fix for 700D Approved-by: Daniel Fort <dan@digiola.com>
Daniel Fort
Audio meters stop functioning after recording the first clip when using mlv_snd. Easy fix suggested by a1ex.
Alex
installer: fix compilation
Alex
Merged in daniel_fort/magic-lantern/update-to-700D.115 (pull request #813) Update to 700D.115
Alex
700D: fix AbortEDmac
Alex
Dummy merge with dfort's unified
Alex
700D, 6D, 7D: fix AbortEDmac
Alex
700D: undo dialog_refresh_timer change in mlv_rec/mlv_lite (this address is the same in 1.1.4 and 1.1.5)
Daniel Fort
Update sf_dump module to 700D.115
Daniel Fort
Fixed is_taskid_valid stub.
Daniel Fort
Merged unified into update-to-700D.115
Alex
Merged in daniel_fort/magic-lantern/unified_silent_module_fix (pull request #854) modify silent.c to work with commit f404e5f
Alex
TCC Makefile: fix minor typo
Alex
silent.c: there are no info bars in paused LiveView mode
Daniel Fort
Added minimal autoexec.bin for 700D
Daniel Fort
Merged unified into update-to-700D.115
Daniel Fort
modify silent.c to work with commit f404e5f Raw backend: allow displaying raw previews without conflicting with LiveView info bars
Alex
Merged in raw_fixes (pull request #828) Raw fixes part 5
Alex
fio-ml: added get_dcim_dir_suffix(); moved get_dcim_dir() from dryos.h
Alex
mlv_rec/mlv_lite: moved write_mlv_vers_blocks to mlv.c/h (avoids duplicate code)
Alex
edmac.mo: display connection map (experiment)
Alex
mlv_play: fix a fio_malloc issue (not tested, might fix issue #2766)
Alex
Merged in raw_capture_info (pull request #827)
Alex
mlv_dump: fix compilation after rawc header update
Alex
get_current_dialog_handler: fix return value when no dialogs are present
Georg Hofstetter
fix rules to allow "make -j"
Alex
Merged in edmac (pull request #811) EDMAC module + fixes
Alex
edmac-memcpy: fix compilation
Alex
Merged unified into edmac
Alex
Merged in backtrace (pull request #849) Stack trace (aka backtrace) in crash logs
Alex
Close branch backtrace
Alex
selftest: fix incorrect strings (AllocateMemory != system memory)
Alex
Makefile: minor fine-tuning; updated comments
Alex
Makefile: fix compiling backtrace on fresh clone
Alex
selftest: fine-tuned comments and strings
Alex
selftest: re-enabled fault emulations (some of them are useful for testing the stack trace, as they will trigger ERR70)
Alex
backtrace: sync with qemu (e4376a1)
Alex
Makefile: workaround to unbreak the builds (how to fix it properly?)
Alex
Makefile: mark $(QEMU_INSTALLED_DBI_DIR)/backtrace.% as optional dependency todo: any way to do the same without .SECONDEXPANSION ?
Alex
Makefile: moved backtrace.o at the top to fix first-time compilation this makes sure backtrace.h is created before any other files that may use it (currently boot-hack.c) also remove the symlinks on "make clean"
Alex
backtrace: sync with qemu (3db5423, fbb532b, ab6d33c, 115fe25)
Alex
Stack traces for crash and assert logs, using the backtrace backend
Alex
Updated backtrace.c to work on the camera as well (same source file for both QEMU and ML)
Alex
arm-mcr.h: fixed read_lr (not sure what the problem was) and added read_sp
Alex
Imported backtrace code from 29f6edc
Alex
Ghost image: fixed issue #2749
Alex
Merged in daniel_fort/magic-lantern/find_fnt.py-update (pull request #844) find_fnt.py update
Alex
Merged in daniel_fort/magic-lantern/unified-multiple-FW_VERSION-minimal-ML (pull request #846) Multiple firmware versions for minimal ML
Daniel Fort
Makefile.platform.base error trap for multiple firmware versions
Daniel Fort
Added suggestion by @a1ex to guess the ROM[0,1] load address.
Daniel Fort
Changed "base" to the address used when dumping the ROM
Daniel Fort
Merged unified into update-to-5D3.134
Georg Hofstetter
dual_iso: change cr2hdr to use the same wrapper for module_strings like mlv_dump, also fixes compile error caused by a module.h change from static to global (module_strings_wrapper.h from 0c1c8b3)
Alex
Modules: allow including module.h in multiple source files (b0574dd)
Alex
Undo 4126b56 (to allow merging with crop_rec_4k)