diff options
| author | Jan Kundrát <jkt@jankundrat.com> | 2021-08-07 15:19:49 +0200 |
|---|---|---|
| committer | Marcus Meissner <meissner@suse.de> | 2021-08-07 16:03:05 +0200 |
| commit | f85168fa3820c17c97a9975731391f21559144fe (patch) | |
| tree | 393dae0f0556fd0c2a7e612354e07e07ea2be249 /camlibs | |
| parent | 94efe00f0170f81dea85d6a0fe89b12111e98d19 (diff) | |
| download | libgphoto2-f85168fa3820c17c97a9975731391f21559144fe.tar.gz | |
Canon: basic control over Movie Servo AF
This supports just the Enabled/Disabled choices as defined in the camera
menu (on RP, Menu -> Shooting -> 5 -> Movie Servo AF). Even when active,
the servo AF can be suspended by tapping the LCD screen at the bottom
left corner with a green "SERVO AF" button; I do not see any PTP
property getting changed upon suspend/resume.
Tested on EOS RP and on 5Div.
Related-bug: #700
Diffstat (limited to 'camlibs')
| -rw-r--r-- | camlibs/ptp2/config.c | 7 | ||||
| -rw-r--r-- | camlibs/ptp2/ptp-pack.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index 3c87df433..96ba37415 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -6994,6 +6994,12 @@ static struct deviceproptableu8 nikon_facedetection[] = { }; GENERIC8TABLE(Nikon_FaceDetection,nikon_facedetection) +static struct deviceproptableu32 canon_eos_movieservoaf[] = { + { N_("Off"), 0x0, 0 }, + { N_("On"), 0x1, 0 }, +}; +GENERIC32TABLE(Canon_EOS_MovieServoAF,canon_eos_movieservoaf) + static int _get_BatteryLevel(CONFIG_GET_ARGS) { unsigned char value_float , start, end; @@ -10393,6 +10399,7 @@ static struct submenu capture_settings_menu[] = { { N_("Sensor Crop"), "sensorcrop", PTP_DPC_SONY_SensorCrop, PTP_VENDOR_SONY, PTP_DTC_UINT8, _get_Sony_SensorCrop, _put_Sony_SensorCrop }, { N_("HDMI Output Data Depth"), "hdmioutputdatadepth", PTP_DPC_NIKON_HDMIOutputDataDepth, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_HDMIDataDepth, _put_Nikon_HDMIDataDepth }, { N_("Face Detection"), "facedetection", PTP_DPC_NIKON_FaceDetection, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_FaceDetection, _put_Nikon_FaceDetection }, + { N_("Movie Servo AF"), "movieservoaf", PTP_DPC_CANON_EOS_MovieServoAF, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_Canon_EOS_MovieServoAF, _put_Canon_EOS_MovieServoAF }, { 0,0,0,0,0,0,0 }, }; diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c index 7c7fe8840..082fb1b43 100644 --- a/camlibs/ptp2/ptp-pack.c +++ b/camlibs/ptp2/ptp-pack.c @@ -2315,6 +2315,7 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, unsigned int d case PTP_DPC_CANON_EOS_LvAfSystem: case PTP_DPC_CANON_EOS_OneShotRawOn: case PTP_DPC_CANON_EOS_FlashChargingState: + case PTP_DPC_CANON_EOS_MovieServoAF: dpd->DataType = PTP_DTC_UINT32; break; /* enumeration for AEM is never provided, but is available to set */ |