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

fixes gphoto/gphoto2#570 fixes #932
gphoto · Nov 9, 2023 · a67ddde · a67ddde
1 parent ad610a4
commit a67ddde
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
@@ -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;

diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
@@ -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 @@ camera_wait_for_event (Camera *camera, int timeout,
 	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 {