1. Daniel Fort
  2. Magic Lantern
  3. Branches

Branches

update-to-EOSM.203_experimental_branch

View source
update-to-EOSM.203_experimental_branch
  • Contributors
    1. Loading...
Author Commit Message Date Builds
139 commits behind unified.
Daniel Fort
Merged lua_fix into update-to-EOSM.203_experimental_branch
Daniel Fort
Merge raw_video_10bit_12bit into update-to-EOSM.203_experimental_branch
Alex
Lua: misc doc updates (WIP)
Alex
lua_constants: reordered to get the simpler ones first in the doc
Alex
Lua: remove pre_shoot/post_shoot from docs (not yet implemented)
Alex
menu.c, select_menu_by_name: allow optional entry_name parameter; keep the current selection on error
Alex
copy2m.lua: add its menu in the script submenu, rather than Prefs (fixes duplicate menu - there were 2 menus with the same name)
Alex
Lua: always open script submenu on SET; show menus created by script under the script menu
Alex
menu.c: fix null pointer in mod_menu_rebuild
Alex
menu.c, entry_find_by_name: do not return duplicate entries and entries from dynamic menus (to be tested)
Alex
selftest.mo: test for autofocus routines
Alex
Lua: camera.shoot() no longer autofocuses by default
Alex
Lua: removed global shoot(); use camera.shoot() instead
Alex
api_test.lua: minor typo
Alex
lens_take_picture: wait for file number to change before returning; minor cleanups
Alex
Lua lens.focus: delay default to 10ms when wait=false; doc updates
Alex
force_liveview: make sure LV is fully started before returning
Alex
Lua: experimental lens.autofocus()
Alex
Lua: fine-tuned startup messages
Alex
Merged unified into lua_fix
Alex
Modules: allow including module.h in multiple source files (fixes compilation of edmac.mo)
Alex
Modules: removed some unused definitions
Alex
api_test.lua: fix typo in lens.focus call, thanks garry23
Alex
Lua: menu.open() can optionally select a given menu or submenu
Daniel Fort
conform raw_rec Bit depth menu to match mlv_rec
Alex
mlv_dump: fix dark/flat frame operation when the two clips have different spacing/padding offsets Test files: http://www.magiclantern.fm/forum/index.php?topic=16650.msg178809#msg178809
Daniel Fort
Merge unified into update-to-EOSM.203_experimental_branch. 5D3.113 and 5D3.123 now co-exist in unified.
Daniel Fort
Modified comment
Daniel Fort
Merged in the latest changes that fixes the broken merge that was posted on the Experimentals page
Alex
Raw backend: fix black borders on raw previews
Alex
Merged raw_video_10bit_12bit into crop_rec
Alex
mlv_rec: fix bad merge (to be tested)
Daniel Fort
Merge compressed_raw into update-to-EOSM.203_experimental_branch lossless module not working on EOSM yet but worth seeing if it affects silent module. There were some build errors but silent.mo seems to work fine.
Daniel Fort
Merge latest unified commits
Daniel Fort
Merge latest changes from raw_video_10bit_12bit into update-to-EOSM.203_experimental_branch
Alex
Moved bit depth setup from raw_rec/mlv_rec to raw backend; raw overlays should now refuse to run at bit depths other than 14
Alex
raw_rec, mlv_rec: minimize roundoff error when scaling black and white levels (using --black-fix in mlv_dump should be no longer needed)
Daniel Fort
Allow recording raw and H.264 simultaneously and turn on RAW_DEBUG_TYPE for testing mv1080 on the EOSM
Daniel Fort
Merge lua_fix into update-to-EOSM.203_experimental_branch
Daniel Fort
Merge manual_lens_info into update-to-EOSM.203_experimantal_branch
Daniel Fort
Merge crop_rec into update-to-EOSM.203_experimental_branch
Daniel Fort
cache_hacks needed for the raw_video_10bit_12bit merge to work
Alex
Merged raw_video_10bit_12bit into crop_rec
Alex
Merged 5D3-113-and-123 into crop_rec
Daniel Fort
Merge raw_video_10bit_12bit
Daniel Fort
Keep track of the real SoundDevShutDownIn address
Alex
rbf_font: very rough support for tab characters
Alex
editor.lua: exit file dialog if menu is no longer active
Alex
Lua: allow editing any script from context menu using editor.lua (Q -> Edit Script)
Alex
Lua: basic support for script arguments (arg, ...) http://www.lua.org/manual/5.1/manual.html#6
Alex
Lua: always use first line as script name in menu (use ... if too long)
Alex
Lua: display script file name on the right if the script is not running
Alex
Lua: fine-tuned user feedback when loading/running scripts
Alex
Lua: check string length in pixels when choosing between script name (first line) or script filename for menu display
Alex
Merged unified into lua_fix
Alex
menu: fix regression about font bg color
Alex
mlv_dump: fix long exposure metadata in DNG
Alex
chdk-dng: drop APEX exposure metadata (redundant, conflicts with regular exposure tags)
Alex
mlv_dump: fix black level bias when converting from lower bit depths (on 5D3, please use --black-fix=2048 at all bit depths from now on) http://www.magiclantern.fm/forum/index.php?topic=5601.msg177802#msg177802
g3gg0
mlv_dump: changed default white level (if no parameter given) for --white-fix to 15k as recommended by a1ex
g3gg0
mlv_dump: added option to set white level manually, correct white level setting when black level was set
g3gg0
mlv_dump: modify black level code to properly scale or set black level as expected
Daniel Fort
dmilligan's advice -- looks perfect and tested in ACR
Daniel Fort
pretty up the xmp output
Daniel Fort
Merge manual_lens_info into manual_lens_info_fixed -- again
David Milligan
ui.lua: reset cancel field to false when re-opening selection box
David Milligan
lens.lua: fix parent menu name
Daniel Fort
Merge manual_lens_info into manual_lens_info_fixed
David Milligan
lens.lua: fix config loading
David Milligan
config.lua fixes
David Milligan
lens.lua: store selected lens in config
Daniel Fort
Merge manual_lens_info changes into manual_lens_info_fixed keeping this branch for the changes in len.lua
Alex
Modules: handle commit messages with non-ASCII characters (fixes compiling lua.mo)
Alex
Merged raw_fixes into raw_video_10bit_12bit
Alex
Merged raw_fixes into raw_video_10bit_12bit
Alex
Merged raw_fixes into raw_video_10bit_12bit
Daniel Fort
Added some manual lenses and comments to the lua script. Note that at this point the lua_fix branch broke the EOSM data display but a1ex is working on fixing it.
Daniel Fort
Merge unified into manual_lens_info
Daniel Fort
Merge manual_lens_info -- ui.lua: fix some refactoring typos
Daniel Fort
Merge lens_info_fix into manual_lens_info
Daniel Fort
Merge lua_fix into manual_lens_info
Daniel Fort
Added ML-SETUP.FIR from a1ex
Eosm Developer
update of platform EOSM to firmware revision 2.0.3
Eosm Developer
Created new branch update-to-EOSM.203
g3gg0
mlv_dump: put DNG 14bpp enforcement at the right position
g3gg0
mlv_dump: enforce 14bpp correction for DNG output mode. code seems still buggy for 12bpp.
g3gg0
mlv_dump: preallocate buffers on RAWI
g3gg0
mlv_dump: remove pointer arithmetics for xref table reading
g3gg0
mlv_dump: added patches from 5f7a9d850d71 and a22302855d05 regarding black level correction for other bit depths
Daniel Fort
mlv_dump: fix to extract only the first frame (numbered 0)
g3gg0
mlv_rec: fixed chroma smooth regression in mlv_dump caused by API change in 5167619. thanks dfort/danne/bouncyball.
g3gg0
mlv_dump: removed ancient bugfix options. if there are buggy files, they can get recovered using older versions.
eNnvi
Added 6D support and changed default 700D PREFERRED_RAW_TYPE
David Milligan
ui.lua: fix some refactoring typos
David Milligan
Merge ‘lens_info_fix’ into ‘manual_lens_info’
David Milligan
Merge ‘lua_fix’ into ‘manual_lens_info’
Alex
Silent pictures: in burst modes, reserve memory for lossless DNG compression
Alex
Silent pictures: experimental lossless DNG compression (5D3 1.1.3)
Alex
chdk-dng: allow DNG compression (Lossless JPEG)
Alex
Merged edmac into compressed_raw
Alex
Silent pics: only show the slit-scan mode option when you actually select slit-scan
g3gg0
mlv_rec: fix startup delay
g3gg0
mlv_rec: synchronize parts of code with raw_rec, more needed. use double buffering again. fix alternating frame errors.
Alex
edmac.mo: experiment - log all EDMAC channels every 0.1ms
Alex
edmac.mo: show offset 0x40 on the info screen
Alex
edmac: edmac_get_channel
Alex
edmac: there are more than 48 connections (not sure how many)
Alex
Modules: allow including module.h in multiple source files (fixes compilation of edmac.mo)
Alex
Modules: removed some unused definitions
Alex
Merged in daniel_fort/magic-lantern/raw_video_10bit_12bit_700D_slurp (pull request #781) 650D and 700D: enable CONFIG_EDMAC_RAW_SLURP
g3gg0
mlv_play: added direct raw_twk support along with zoom support (5D3 tested)
g3gg0
raw_twk: added experimental module that uses engines (PACK16, DEF, DSUNPACK) to accelerate raw->YUV conversion
Daniel Fort
650D: enable CONFIG_EDMAC_RAW_SLURP
Daniel Fort
700D: enable CONFIG_EDMAC_RAW_SLURP
Alex
Merged in daniel_fort/magic-lantern/raw_video_10bit_12bit_debug (pull request #780) Increase RAW_DEBUG_TYPE limit
Daniel Fort
use hex units for PREFERRED_RAW_TYPE debugging
Daniel Fort
finding usable RAW_DEBUG_TYPE above the 64 limit
Alex
bfnt_draw_char: option for not erasing the background (old behavior, to fix existing code)
Alex
bmp_printf: erase background when using FONT_CANON (to be tested)
Alex
bmp_printf: allow transparent text on transparent background (note: this breaks binary compatibility with modules)
Alex
edmac.h: allow edmac_format_size to be called from core (of course, if the edmac module is loaded)
Alex
bench.mo: use microsecond timer for memory benchmarks
Alex
bench.mo: verify memcpy-like functions when running memory benchmark
Alex
edmac-memcpy.c: refactored to avoid static struct edmac_info
Alex
Merge new_raw_format
Alex
raw_rec: fix some resolution inconsistencies
Alex
raw_rec: minor resolution fine-tuning fix
David Milligan
ui.lua: use specific keys for canceling selector
David Milligan
ui.lua: cleanups and minor tweaks
David Milligan
lens.lua: ML menu item for changing manual lens
David Milligan
lua scriptiing: move common ui code out of editor.lua into lib/ui.lua and lib/filedlg.lua for reusability
David Milligan
xmp.lua: code comments and minor refactorings
Alex
Rewritten find_free_edmac_channels so it no longer requires user input
Alex
Moved find_free_edmac_channels to the edmac module
Alex
Moved EDMAC info screen and pretty-printing function to a module
David Milligan
lua scripting: xmp.lua metadata library (preliminary)
David Milligan
lua scripting: ui.lua minor cleanups and tweaks
David Milligan
lens.lua: script for overriding lens info for manual lenses based on user selection
David Milligan
lua scripting: expose overwriting lens info
David Milligan
lens_info: new field is_chipped to allow safely overriding lens name
g3gg0
mlv_play: restore bpp and black level in raw_info on exit
Alex
edmac: pretty-printing function for size configuration (edmac_format_size) auxiliary functions: edmac_get_info, edmac_fix_off1 also updated debug edmac info with the new function
Alex
edmac: edmac_get_pointer; comments
Alex
edmac: experimental model for total data transfer size
Alex
Enabled AbortEDmac stub (most models; not tested)
Alex
stub-cleanup.py: support for uncommenting unused stubs; minor refactors
Alex
Stubs format
Alex
raw_rec: remove unused odd bit depths from menu
Alex
engio_write wrapper
g3gg0
mlv_rec/mlv_play: add variable bit depth support. mlv_play requires experimental raw_twk if you want to playback other than 14bpp
Alex
raw_rec: allow max width to be multiple of 2 bytes and 8 pixels; all others are multiple of 16px
Alex
raw_rec: fix odd resolutions bug (make sure width is multiple of 8 pixels)
Alex
60D: use PREFERRED_RAW_TYPE (fixes digital ISO behavior and bad pixels in preview)
Alex
Raw backend: fix image freeze on 60D, maybe others (typo in 193dc59)
Alex
Raw backend: RAW_TYPE_ADDRESS no longer needed
Alex
raw_rec: allow 16-pixel increments for X resolution (experiment)
Alex
edmac_memcpy: looks like we can use widths that are not modulo 8 bytes
Alex
edmac-memcpy.c: refactored to avoid static struct edmac_info
Alex
raw_set_geometry: allow bit depths other than 14
Alex
Merge new_raw_format
David Milligan
EOSM: enable CONFIG_EDMAC_RAW_SLURP
David Milligan
raw bit depth: skip some frames after setting a new bit depth
Alex
crop_rec: fix shutter speeds when using FPS override
Alex
crop_rec: center raw buffer and Canon preview in x5 zoom mode (5D3)
Alex
crop_rec: easier to customize menu choices for each camera model
Rafael Brune
crop_rec: limit EOSM to 3x3 mode
Rafael Brune
crop_rec: EOSM uses more 10 CMOS registers, use register 7 to center crop recording area
Rafael Brune
Merged hudson/magic-lantern/crop_rec into crop_rec
Rafael Brune
crop_rec: add limited EOSM support to record mlv in 3x3 mode
David Milligan
raw bit depth: override bit depth related raw_info fields when changing bit depth
Alex
mlv_dump: fix DNG output for lower bit depths You need to disable all processing, e.g. mlv_dump M00-1234.MLV --dng --no-fixcp --no-stripes
Alex
Raw backend: fix image corruption when using other bit depths, on cameras using CONFIG_EDMAC_RAW_SLURP Other models will either have to enable this method, or patch Canon code to adjust image size.
David Milligan
10bit and 12bit raw video implementation for MLV Lite (confirmed working on 60D)
Alex
crop_rec: auto-refresh LiveView after leaving menu (rather than asking the user)
Alex
Merged raw_fixes into crop_rec
Alex
crop_rec: out_regs trick not needed
Alex
Merged patchmgr into crop_rec
Alex
Merged unified into crop_rec
Alex
Patch manager: PATCH_HOOK_OUT_REGS is not needed
Alex
Patch manager: save/restore CPSR flags for logging hooks
Alex
Patch manager: minor refactoring to remove some hardcoded offsets from logging hooks code
Alex
crop_rec: fix status indicator and make it a bit more visible
Alex
Merged raw_fixes into crop_rec
Alex
Merged unified into crop_rec
Alex
5D3: get LV RAW resolution from 0xC0F06800/4, instead of hardcoded values
Alex
Merged unified into crop_rec
Alex
Patch manager: refactored logging hooks code (nonfunctional, less verbose)
Alex
Patch manager: better check for jump ranges
Alex
Patch manager: use long jump for the logging function (so it can be used from modules on cameras that load them on RscMgr)
Alex
Patch manager: check jump ranges before installing logging hooks
Alex
Patch manager: minor fix (braces in macro)
Alex
merged unified into patchmgr
Alex
reloc.c: fix bad merge
Alex
Patch manager: fix compilation on cameras that use reloc.c
Alex
crop_rec: allow operation in photo mode (useful either as mild zoom, or for silent pictures)
Alex
crop_rec: show info about current mode in the bottom bar
Alex
crop_rec: fix interference with still photos
Alex
patch.h: added PATCH_HOOK_OUT_REGS (for overriding registers in the original function)
Alex
crop_rec: added some presets (720p unsquashed with 3x3 binning; 1x3 binning; 3x1 binning not working well)
Alex
menu: allow multiline help choices on both help fields
Alex
crop_rec: refactored to make the code a little more generic (easier to port)
Alex
crop_rec: include this module in default builds
Alex
crop_rec: support for 5D3 1.2.3, not tested
Alex
crop_rec: fix frame centering (5D3)
Alex
crop_rec: experimental module for 1:1 (3x) crop mode recording (5D3 1.1.3 for now)
Alex
Merged patchmgr into crop_rec
Alex
Patch manager: check for too many patches
Alex
Patch manager: fix crash with unpatch_memory_matrix (easy to reproduce with ettr + dual iso)
Alex
Patch manager: re-applied 654b09f (got lost during refactoring)
Alex
Merged unified into patchmgr
Alex
raw_rec/mlv_rec: updated with patch_instruction
Alex
Patch manager: everything back to patch.c
Alex
Patch manager: added matrix patches into patch-simple.c (so now it's quite far from simple, but this gives a clean diff)
Alex
Patch manager: renames to prepare merging both patch types in a single file
Alex
Patch manager: fix error display in menu, when ROM patches are active
Alex
Patch manager: print all errors to console when in debug mode
Alex
Patch manager: human-readable errors
Alex
Patch manager: fine-tuned error codes
Alex
fio-ml: fix Lua const char warnings in FIO_Rename/Copy/MoveFile
Alex
api_test.lua: minor cleanups
Alex
Lua: dryos.rename (including API tests)
Alex
Lua: ignore unknown button codes
Alex
api_test.lua: relax half-shutter check a bit (the event is not sent right away)
Alex
Lua: reserve 256K for umm_malloc instead of 512K (since we no longer load all scripts at once)
Alex
Merged in lua_umm_malloc (pull request #724) Use umm_malloc for Lua to reduce memory fragmentation
Alex
Close branch lua_umm_malloc
Alex
Lua: removed run_in_separate_task
Alex
Lua: menu item to show/hide the console
Alex
Lua: show last script error in menu (to be tested)
Alex
Lua: fix memory/semaphore leak when running the same script many times
Alex
Lua: hide "Run script" for complex scripts, since they can't be started twice
Alex
Lua: show errors in menu for complex scripts as well
Alex
Lua: refactored error handling in add_script
Alex
Lua: fix script loading loop (forgot FIO_FindClose)
Alex
scrnshot.lua: place menu item in its own script submenu
Alex
Lua: extract script name and description from comments (experiment)
Alex
Lua: allow any script to autorun; use a submenu for each script
Alex
Lua: show scripts right away after loading the autorun ones (no more delay)
Alex
Lua: cleanup passing script to lua_user_load_task
Alex
api_test.lua: converted to simple script, so it runs right away
Alex
pong.lua: fix undeclared counter
Alex
Lua: fix strict.lua after script unloading changes
Alex
Lua: fix some scripts randomly showing "error" state (refactored malloc/memset with calloc in lua.c)
Alex
mem.h: declared calloc
Alex
posix.c: fix calloc (error checking)
Alex
Lua: moved the "extra" scripts back (since the scripts are no longer loaded by default)
Alex
Modules: workaround for issue #2551 (UNPRESS_UDLR conflicting with UNPRESS_DP on 5D3)
David Milligan
lua scripting: update docs
David Milligan
lua scripting: some cleanups to the script menu display and help
David Milligan
lua scripting: script unloading and autorun options user can disable autorun scripts don't autorun until user runs them the first time "simple" scripts (no menus or events) don't autorun, only run on demand and unload when finished script menu now lists all available scripts, "simple" scripts can be run from here, "complex" scripts can have autorun disabled/enabled from here TODO: update docs TODO: the 'extra' directory is probably no longer needed
46 commits not shown.