This instance will be upgraded to Heptapod 0.31.0 (final) on 2022-05-24 at 14:00 UTC+2 (a few minutes of down time)

Commit 53f49834 authored by alex@thinkpad's avatar alex@thinkpad
Browse files

Updated some LiveView AF properties for newer models

(tested on 700D)

--HG--
branch : lua_fix
parent 90be2484da2e
......@@ -294,8 +294,6 @@ static int handle_prop_string(lua_State * L, const char * name)
else if(!strcmp(name, "PARTIAL_SETTING")) prop_id = PROP_PARTIAL_SETTING;
/// @tfield property EMPOWER_OFF
else if(!strcmp(name, "EMPOWER_OFF")) prop_id = PROP_EMPOWER_OFF;
/// @tfield property LVAF_MODE
else if(!strcmp(name, "LVAF_MODE")) prop_id = PROP_LVAF_MODE;
/// @tfield property ACTIVE_SWEEP_STATUS
else if(!strcmp(name, "ACTIVE_SWEEP_STATUS")) prop_id = PROP_ACTIVE_SWEEP_STATUS;
/// @tfield property EFIC_TEMP
......@@ -462,14 +460,18 @@ static int handle_prop_string(lua_State * L, const char * name)
else if(!strcmp(name, "DIGITAL_ZOOM_RATIO")) prop_id = PROP_DIGITAL_ZOOM_RATIO;
/// @tfield property INFO_BUTTON_FUNCTION
else if(!strcmp(name, "INFO_BUTTON_FUNCTION")) prop_id = PROP_INFO_BUTTON_FUNCTION;
/// @tfield property CONTINUOUS_AF_MODE
else if(!strcmp(name, "CONTINUOUS_AF_MODE")) prop_id = PROP_CONTINUOUS_AF_MODE;
/// @tfield property CONTINUOUS_AF_VALID
else if(!strcmp(name, "CONTINUOUS_AF_VALID")) prop_id = PROP_CONTINUOUS_AF_VALID;
/// @tfield property PROP_LIVE_VIEW_AF_SYSTEM
else if(!strcmp(name, "PROP_LIVE_VIEW_AF_SYSTEM")) prop_id = PROP_LIVE_VIEW_AF_SYSTEM;
/// @tfield property PROP_CONTINUOUS_AF
else if(!strcmp(name, "PROP_CONTINUOUS_AF")) prop_id = PROP_CONTINUOUS_AF;
/// @tfield property PROP_MOVIE_SERVO_AF
else if(!strcmp(name, "PROP_MOVIE_SERVO_AF")) prop_id = PROP_MOVIE_SERVO_AF;
/// @tfield property PROP_MOVIE_SERVO_AF_VALID
else if(!strcmp(name, "PROP_MOVIE_SERVO_AF_VALID")) prop_id = PROP_MOVIE_SERVO_AF_VALID;
/// @tfield property PROP_SHUTTER_AF_DURING_RECORD
else if(!strcmp(name, "PROP_SHUTTER_AF_DURING_RECORD")) prop_id = PROP_SHUTTER_AF_DURING_RECORD;
/// @tfield property REGISTRATION_DATA_UPDATE_FUNC
else if(!strcmp(name, "REGISTRATION_DATA_UPDATE_FUNC")) prop_id = PROP_REGISTRATION_DATA_UPDATE_FUNC;
/// @tfield property MOVIE_REC_AF
else if(!strcmp(name, "MOVIE_REC_AF")) prop_id = PROP_MOVIE_REC_AF;
/// @tfield property LIMITED_TV_VALUE_AT_AUTOISO
else if(!strcmp(name, "LIMITED_TV_VALUE_AT_AUTOISO")) prop_id = PROP_LIMITED_TV_VALUE_AT_AUTOISO;
/// @tfield property LOUDNESS_BUILT_IN_SPEAKER
......
......@@ -173,7 +173,6 @@
#define PROP_DEFAULT_BRACKET 0x8002000A
#define PROP_PARTIAL_SETTING 0x8002000B
#define PROP_EMPOWER_OFF 0x80030007 // 1 == prohibit, 2 == permit
#define PROP_LVAF_MODE 0x8004001d // 0 = shutter killer, 1 = live mode, 2 = face detect
#define PROP_ACTIVE_SWEEP_STATUS 0x8002000C // 1 == cleaning sensor?
......@@ -492,10 +491,13 @@
#define PROP_INFO_BUTTON_FUNCTION 0x02070006
#define PROP_CONTINUOUS_AF_MODE 0x80000042
#define PROP_CONTINUOUS_AF_VALID 0x80000043 //also toggles servo
#define PROP_LIVE_VIEW_AF_SYSTEM 0x8004001D // 0 = quick AF, 1 = live mode, 2 = face detect, 3 = multi
#define PROP_CONTINUOUS_AF 0x80040040 // bool, new models only, photo mode only
#define PROP_MOVIE_SERVO_AF 0x80000042 // PROP_CONTINUOUS_AF_MODE, bool, new models only
#define PROP_MOVIE_SERVO_AF_VALID 0x80000043 // PROP_CONTINUOUS_AF_VALID, to MPU only?
#define PROP_SHUTTER_AF_DURING_RECORD 0x8000003C // PROP_MOVIE_REC_AF
#define PROP_REGISTRATION_DATA_UPDATE_FUNC 0x80000044 // custom slave cBr?
#define PROP_MOVIE_REC_AF 0x8000003C
// #define PROP_AF_CURRENT_AISERVO_STYLE 0x8004004B
......
......@@ -97,7 +97,7 @@ volatile PROP_INT(PROP_AF_MODE, af_mode);
volatile PROP_INT(PROP_METERING_MODE, metering_mode);
volatile PROP_INT(PROP_DRIVE, drive_mode);
volatile PROP_INT(PROP_STROBO_FIRING, strobo_firing);
volatile PROP_INT(PROP_LVAF_MODE, lvaf_mode);
volatile PROP_INT(PROP_LIVE_VIEW_AF_SYSTEM, lv_af_mode);
volatile PROP_INT(PROP_IMAGE_REVIEW_TIME, image_review_time);
volatile PROP_INT(PROP_MIRROR_DOWN, mirror_down);
volatile PROP_INT(PROP_LCD_BRIGHTNESS, backlight_level);
......
......@@ -87,7 +87,7 @@ extern int folder_number;
extern int file_number_also;
extern int drive_mode;
extern int strobo_firing;
extern int lvaf_mode;
extern int lv_af_mode;
extern int image_review_time;
extern int lv_disp_mode;
extern int mirror_down;
......
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