Read about our upcoming Code of Conduct on this issue

Commit bcc84ccb authored by alex@thinkpad's avatar alex@thinkpad
Browse files

Merged 100D_merge_fw101 into crop_rec_4k

(minor fixes)

--HG--
branch : crop_rec_4k
......@@ -11,3 +11,4 @@
/* Not working */
#undef FEATURE_TRAP_FOCUS
#undef FEATURE_MAGIC_ZOOM_FULL_SCREEN // https://bitbucket.org/hudson/magic-lantern/issues/2842
......@@ -2,10 +2,10 @@
#define __platform_state_object_h
#define DISPLAY_STATE DISPLAY_STATEOBJ
#define INPUT_SET_IMAGE_VRAM_PARAMETER_MUTE_FLIP_CBR 23
#define INPUT_ENABLE_IMAGE_PHYSICAL_SCREEN_PARAMETER 24
//#define INPUT_SET_IMAGE_VRAM_PARAMETER_MUTE_FLIP_CBR 24 /* unused */
#define INPUT_ENABLE_IMAGE_PHYSICAL_SCREEN_PARAMETER 25
#define EVF_STATE (*(struct state_object **)0x6733C)
// #define MOVREC_STATE (*(struct state_object **)0x691AC)
// #define SSS_STATE (*(struct state_object **)0x91BD8)
#endif // __platform_state_object_h
\ No newline at end of file
#endif // __platform_state_object_h
......@@ -252,7 +252,7 @@ static void fps_read_current_timer_values();
#define FPS_TIMER_A_MIN (fps_timer_a_orig)
#elif defined(CONFIG_100D)
#define TG_FREQ_BASE 32000000
#define FPS_TIMER_A_MIN (ZOOM ? 676 : MV1080CROP ? 540 : 520)
#define FPS_TIMER_A_MIN (ZOOM ? 724 : MV1080CROP ? 540 : 520)
#undef FPS_TIMER_B_MIN
// no need to cause confusions as recording speed cannot handle such high fps in crop mode
// (ZOOM || MV1080CROP ? 1288 : 1970)) <-- these are ok while not recording.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment