diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2018-11-12 07:53:43 +0100 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2018-11-12 07:53:43 +0100 |
| commit | 86f7cf08eff483dc8e9df7b836605e514081ddde (patch) | |
| tree | 1e4b1524e4ae3d653ef332eda30210e8cd4ad00e | |
| parent | 5ec4d8af2b8c3e4f6bd7a593932ce3d5e269fbd8 (diff) | |
| download | libgphoto2-86f7cf08eff483dc8e9df7b836605e514081ddde.tar.gz | |
added power zoom as seen on SX720HS
for https://github.com/gphoto/libgphoto2/issues/316
| -rw-r--r-- | camlibs/ptp2/config.c | 1 | ||||
| -rw-r--r-- | camlibs/ptp2/ptp-pack.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index 35f6dc95e..e7b68bcdb 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -8182,6 +8182,7 @@ static struct submenu capture_settings_menu[] = { { N_("Long Exp Noise Reduction"), "longexpnr", PTP_DPC_NIKON_1_LongExposureNoiseReduction, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OnOff_UINT8, _put_Nikon_OnOff_UINT8 }, { N_("Auto Focus Mode 2"), "autofocusmode2", PTP_DPC_NIKON_A4AFActivation, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OnOff_UINT8, _put_Nikon_OnOff_UINT8 }, { N_("Zoom"), "zoom", PTP_DPC_CANON_Zoom, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_ZoomRange, _put_Canon_ZoomRange }, + { N_("Zoom"), "zoom", PTP_DPC_CANON_EOS_PowerZoomPosition, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_INT, _put_INT }, { N_("Assist Light"), "assistlight", PTP_DPC_CANON_AssistLight, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_AssistLight, _put_Canon_AssistLight }, { N_("Rotation Flag"), "autorotation", PTP_DPC_CANON_RotationScene, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_AutoRotation, _put_Canon_AutoRotation }, { N_("Self Timer"), "selftimer", PTP_DPC_CANON_SelfTime, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_SelfTimer, _put_Canon_SelfTimer }, diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c index 007de01d9..f79adafa4 100644 --- a/camlibs/ptp2/ptp-pack.c +++ b/camlibs/ptp2/ptp-pack.c @@ -2227,6 +2227,7 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, case PTP_DPC_CANON_EOS_ContinousAFMode: case PTP_DPC_CANON_EOS_MirrorUpSetting: case PTP_DPC_CANON_EOS_OLCInfoVersion: + case PTP_DPC_CANON_EOS_PowerZoomPosition: dpd->DataType = PTP_DTC_UINT32; break; /* enumeration for AEM is never provided, but is available to set */ |