darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

switch on Pc control or tether mode for Fuji on demand.

Browse Source 
fixes https://github.com/gphoto/gphoto2/issues/570
fixes https://github.com/gphoto/libgphoto2/issues/932
This commit is contained in:
Marcus Meissner
2023-11-09 12:00:08 +01:00
parent ad610a4537
commit a67dddeebe
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
camlibs/ptp2/config.c
View File

@@ -508,8 +508,10 @@ camera_prepare_capture (Camera *camera, GPContext *context)
propval.u16 = 0x0001;
LOG_ON_PTP_E (ptp_setdevicepropvalue (params, 0xd38c, &propval, PTP_DTC_UINT16));
propval.u16 = 0x0002;
propval.u16 = 0x0001;
LOG_ON_PTP_E (ptp_setdevicepropvalue (params, PTP_DPC_FUJI_PriorityMode, &propval, PTP_DTC_UINT16));
return GP_OK;
}
break;

9
camlibs/ptp2/library.c
View File

@@ -5224,6 +5224,9 @@ camera_fuji_capture (Camera *camera, CameraCaptureType type, CameraFilePath *pat
C_PTP (ptp_terminateopencapture (params,params->opencapture_transid));
}
propval.u16 = 0x0002;
LOG_ON_PTP_E (ptp_setdevicepropvalue (params, PTP_DPC_FUJI_PriorityMode, &propval, PTP_DTC_UINT16));
C_PTP (ptp_getobjecthandles (params, PTP_HANDLER_SPECIAL, 0x000000, 0x000000, &beforehandles));
C_PTP_REP (ptp_getdevicepropvalue (params, PTP_DPC_ExposureTime, &propval, PTP_DTC_UINT32));
@@ -7101,6 +7104,12 @@ sonyout:
if ( (params->deviceinfo.VendorExtensionID == PTP_VENDOR_FUJI) &&
ptp_property_issupported(params, PTP_DPC_FUJI_CurrentState)
) {
PTPPropertyValue propval;
/* reenable event wait mode */
propval.u16 = 0x0001;
LOG_ON_PTP_E (ptp_setdevicepropvalue (params, PTP_DPC_FUJI_PriorityMode, &propval, PTP_DTC_UINT16));
/* current strategy ... as the camera (currently) does not send us ObjectAdded events for some reason...
* we just synthesize them for the generic PTP event handler code */
do {