View source
EOSM2.103_wip
  • Contributors
    1. Loading...
Author Commit Message Date Builds
17 commits behind default.
Daniel Fort
state-object: updated https://www.magiclantern.fm/forum/index.php?topic=15895.msg209800#msg209800
Daniel Fort
state-object: INPUT_SET_IMAGE_VRAM_PARAMETER_MUTE_FLIP_CBR no longer used https://www.magiclantern.fm/forum/index.php?topic=15895.msg209792#msg209792
Daniel Fort
Change EOSM2 const.h value for DRYOS_ASSERT_HANDLER - thanks @ccritix
Daniel Fort
Merged in work done on EOSM2.103_patchmgr
Daniel Fort
patch_instruction moved from "Don't click me!" to boot-hack.c
Daniel Fort
Patch test https://www.magiclantern.fm/forum/index.php?topic=15895.msg197715#msg197715
Daniel Fort
Finally able to get into the ML menu https://bitbucket.org/hudson/magic-lantern/commits/90f702cde5dc45dc112164556fb300ab3045fce7?at=qemu
Daniel Fort
Merged in patchmgr
Daniel Fort
Fixes dirty pixels on LCD. Thanks nikfreak. https://www.magiclantern.fm/forum/index.php?topic=15895.msg197666#msg197666
Daniel Fort
EOSM was listed twice and 70D wasn't listed.
Daniel Fort
Revert changes made for minimal test in the previous commit.
Daniel Fort
Daniel Fort
Reverted debugging changes.
Daniel Fort
Formatted comments.
Daniel Fort
raw.c debugging - temporary, remember to revert this.
Daniel Fort
PREFERRED_RAW_TYPE: This didn't work but is worth noting until the real fix is found.
Daniel Fort
This extends the time between starting the camera and LiveView freezing up. Still need to look into it some more.
Daniel Fort
Found value for PHOTO_CMOS_ISO_START
Daniel Fort
Found FRAME_CMOS_ISO_START using adtg_gui
Alex
Modules: patch.h no longer needed
Daniel Fort
Changed from DEBUGMSG to PATCH Doesn't seem to make much difference at this stage. Camera keeps freezing up with either one so let's go with the newer method.
Daniel Fort
Missed one in beep.c
Daniel Fort
More tinkering without resolving any issues.
Daniel Fort
Adding changes from pull request #897
Daniel Fort
Trying to track down an issue with the shutter speed not displaying properly in movie mode.
Daniel Fort
Another formula in a constant that might be causing issues.
Daniel Fort
Formatting changes. Found other constants that might not work if the value has a formula in it.
Daniel Fort
This shouldn't make a difference but apparently it does. LUA tests can now complete.
Daniel Fort
Pretty formatting for hex numbers.
Daniel Fort
Found SRM_BUFFER_SIZE will be useful later.
Daniel Fort
FRAME_SHUTTER_BLANKING_WRITE is not defined on EOSM. Check back later to see if it can be used.
Daniel Fort
setup to experiment with different edmac channels.
Daniel Fort
Merged unified into wip
Daniel Fort
Start with EOSM values.
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 )
Daniel Fort
a1ex pointed out a mistake in one of the stubs. https://www.magiclantern.fm/forum/index.php?topic=15895.msg196560#msg196560
Alex
Patch manager: nicer way to avoid calling _reapply_cache_patches when not present (fixes compiling the installer target and removes the need for defining NO_CACHE_PATCHES)
Daniel Fort
MENU_MODE and PLAY_MODE keep failing on the selftest API stub tests. This doesn't make a difference but maybe it is better to keep it like the EOSM until it passes the tests.
Daniel Fort
EOSM2 probably needs this special case because it is a full-time LiveView camera like the EOSM. Revisit this when we can save MLV and DNG files.
Daniel Fort
Turning on some minor options. Doesn't seem to do anything.
Daniel Fort
Assuming the EOSM2 belongs to the group of cameras that requires the SoundDevShutDownIn hack -- fixed in the crop_rec_4k branch. However, the audio meters are not working in the ML user interface even with this hack. https://www.magiclantern.fm/forum/index.php?topic=20597.0
Daniel Fort
adtg_gui working. Found missing addresses. https://www.magiclantern.fm/forum/index.php?topic=15895.msg196476#msg196476
Daniel Fort
EOSM2 uses same structure as 6D and 5D3.123. Didn't expect that, thought it would be more like the EOSM.
Daniel Fort
Updated comment to track how these addresses were determined.
Daniel Fort
More of a guess on this. Found out that YUV422_LV_BUFFER values increment by 0x410000 on 6D and EOSM.
Daniel Fort
Checked stubs against 6D.116.
Daniel Fort
Added mpu communication stubs.
Alex
Merged unified into patchmgr
Daniel Fort
Corrected comment.
Daniel Fort
Need to enable new-dryos-task-hooks
Daniel Fort
Merged in latest new-dryos-task-hooks.
Alex
boot-hack: use CONFIG_NEW_DRYOS_TASK_HOOKS to enable new-style DryOS hooks (undefining HIJACK_TASK_ADDR was not obvious)
Daniel Fort
Confirmed the correct stubs for task_trampoline and task_dispatch_hook. Added relevant comment for task_dispatch_hook. https://www.magiclantern.fm/forum/index.php?topic=15895.msg196251#msg196251
Daniel Fort
SF_flash_size is the same as the 100D.
Daniel Fort
This is works better for disk images because unmount doesn't completely remove the disk from /dev.
Daniel Fort
Added comment because it doesn't work on camera. Pretty sure this is the right address so something else must be wrong.
Daniel Fort
Fixed Tasks stubs
Daniel Fort
Merged in latest new-dryos-task-hooks
Daniel Fort
Commented out CONFIG_HELLO_WORLD according to a1ex's instructions for checking out the dryos task messages. https://www.magiclantern.fm/forum/index.php?topic=15895.msg196199#msg196199
Alex
boot-hack: uninstall cache hacks after booting (to be tested)
Alex
boot-hack: more debug messages regarding memory allocation (for HIJACK_CACHE_HACK and RSCMGR_MEMORY_PATCH_END)
Alex
boot-hack: fix CONFIG_HELLO_WORLD & friends when booting with HIJACK_CACHE_HACK (task_dispatch_hook should not be set in this case)
Daniel Fort
defined DEBUG_TASK_HOOK as per this post in order to see the dryos task switching: https://www.magiclantern.fm/forum/index.php?topic=17969.msg195883#msg195883 Remember to undef this later!
Daniel Fort
Merged new-dryos-task-hooks
Daniel Fort
Second try at merging in new-dryos-task-hooks. This time it worked.
Alex
boot-hack: fix task dispatch hook message missing when booting with HIJACK_CACHE_HACK
Daniel Fort
Camera boot flag enabled - firmware signature is different on camera than in QEMU.
Daniel Fort
Added FIR file to see if we can set the camera boot flag.
Daniel Fort
Merged in latest unified
Alex
Task hooks: disabled task switch debug messages by default (too verbose)
Alex
550D, 600D: fix memory allocation (amend 5b4fe18)
Alex
6D: ADTG shutter addresses did not work, trying another set
Alex
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?
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)
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)
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
Patch manager: moved reapply_cache_patches into sync_caches also made it private
Alex
Makefile: fix for GNU make 3.8.1 (thanks g3gg0)
Alex
Makefile: fix newline issue with WIFI_SD=y
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
550D, 600D: reserve 576K for ML (640 is a bit too much, 512 is too tight)
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)
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
Task hooks: fix task overriding on very old DryOS models (to be tested on all camera models)
Alex
Makefile: if no valid ARM GCC is found in PATH, try to find one in the home directory
Alex
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)
Alex
Merged unified into new-dryos-task-hooks
Daniel Fort
Added 6D.116 to sf_dump module.
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
Add EOSM2.103 to installer/Makefile
Daniel Fort
Merges unified into EOSM2.103_wip
Daniel Fort
Change line to avoid conflict when merging unified.
alex@thinkpad.localdomain
Merged unified into patchmgr
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
tskmon: in null pointer check, retrieve last last task name directly, rather than calling is_taskid_valid also fixed some possible null pointer bugs in the... null pointer checking code (fixes crash when reporting null pointer on 100D and likely on all other cameras with new-style DryOS hooks)
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
Daniel Fort
Merged unified into EOSM2.103_wip
Alex
reloc: allow up to 16 fixups; fix stop condition
Alex
reloc: handle PC-relative add (ADR) (also updated sign handling in LDR, for consistency)
Alex
patchmgr: fix bad merge in reloc.c (52b733594b2e)
Alex
Patch manager: ensure valid menu name for all entries
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
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
Daniel Fort
Cleaned up changes not needed for pull request.
Daniel Fort
Added back only the EOSM2 changes.
Daniel Fort
Revert boot-hack.c to current unified version
Daniel Fort
Merged unified into EOSM2.103_wip
Alex
get_current_dialog_handler: fix return value when no dialogs are present
Georg Hofstetter
fix rules to allow "make -j"
Daniel Fort
Reformatted EDMAC stubs.
Daniel Fort
Removed PROPAD_GetPropertyData stub. https://bitbucket.org/hudson/magic-lantern/pull-requests/684/mlv_rec-eliminate-propad_getpropertydata/diff
Daniel Fort
Various places where EOSM2 will probably need same treatment as EOSM.
Daniel Fort
Need AbortEDmac stub for selftest module.
Daniel Fort
Found values for the io_crypt module but needs testing.
Daniel Fort
Added EOSM2 to gui.
Daniel Fort
Added long press menu option. Still can't get into ML menus.
Daniel Fort
Merged unified into EOSM2.103_wip
Daniel Fort
Fixed up formatting.
Alex
patch.c: fix warning
Alex
Merged unified into patchmgr
Alex
Merged in edmac (pull request #811) EDMAC module + fixes
Alex
edmac-memcpy: fix compilation
Alex
Merged unified into edmac
Daniel Fort
Finally got rid of the state objects Assert message.
Daniel Fort
Minor tweaks -- need to revisit these later.
Daniel Fort
More stub fixes, Dialog handlers
Daniel Fort
Found another stub that was off. This one was copied from the 100D code that also looked like it was off when compared with the 700D and EOSM.
Daniel Fort
Just keeping formatting consistent.
Daniel Fort
Used on 100D, seems more elegant.
Daniel Fort
Need to use 8.3 filenames. EOSM2_103.sym is 9.3
Daniel Fort
Fixed FIO stubs, firmware signature found and finished with Hello World for now.
Daniel Fort
Merged unified into EOSM2.103_wip
Alex
Merged in backtrace (pull request #849) Stack trace (aka backtrace) in crash logs
Alex
Close branch backtrace
Daniel Fort
Fixed ROM_ALLOCMEM_INIT.
Daniel Fort
Almost but not quite working with AllocateMemory pool.