Skip to content

Commit

Permalink
sony manual focus is actually INT16, not UINT16. #793
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanstout authored and msmeissn committed Nov 4, 2023
1 parent f97c305 commit ad610a4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions camlibs/ptp2/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -8867,8 +8867,8 @@ _put_Sony_ManualFocus(CONFIG_PUT_ARGS)
else xpropval.i16 = 0;
C_PTP (ptp_sony_setdevicecontrolvalueb (params, PTP_DPC_SONY_NearFar, &xpropval, PTP_DTC_INT16));
} else {
xpropval.u16 = 1;
C_PTP (ptp_sony_setdevicecontrolvalueb (params, 0xd2d2, &xpropval, PTP_DTC_UINT16));
xpropval.i16 = 1;
C_PTP (ptp_sony_setdevicecontrolvalueb (params, 0xd2d2, &xpropval, PTP_DTC_INT16));
}
*alreadyset = 1;
return GP_OK;
Expand Down Expand Up @@ -10672,7 +10672,7 @@ static struct submenu camera_actions_menu[] = {
{ N_("Synchronize camera date and time with PC"),"syncdatetime", PTP_DPC_CANON_EOS_CameraTime, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_Canon_SyncTime, _put_Canon_SyncTime },

{ N_("Auto-Focus"), "autofocus", PTP_DPC_SONY_AutoFocus, PTP_VENDOR_SONY, PTP_DTC_UINT16, _get_Sony_Autofocus, _put_Sony_Autofocus },
{ N_("Manual-Focus"), "manualfocus", PTP_DPC_SONY_NearFar, PTP_VENDOR_SONY, PTP_DTC_INT16, _get_Sony_ManualFocus, _put_Sony_ManualFocus },
{ N_("Manual-Focus"), "manualfocus", PTP_DPC_SONY_NearFar, PTP_VENDOR_SONY, PTP_DTC_INT16, _get_Sony_ManualFocus, _put_Sony_ManualFocus },
{ N_("Capture"), "capture", PTP_DPC_SONY_Capture, PTP_VENDOR_SONY, PTP_DTC_UINT16, _get_Sony_Capture, _put_Sony_Capture },
{ N_("Power Down"), "powerdown", 0, 0, PTP_OC_PowerDown, _get_PowerDown, _put_PowerDown },
{ N_("Focus Lock"), "focuslock", 0, PTP_VENDOR_CANON, PTP_OC_CANON_FocusLock, _get_Canon_FocusLock, _put_Canon_FocusLock },
Expand Down

0 comments on commit ad610a4

Please sign in to comment.