From f0f170f0f17d50804d459e99b99b1ea1c709e475 Mon Sep 17 00:00:00 2001 From: mpeex Date: Sun, 19 Jan 2025 14:54:38 +0100 Subject: [PATCH 1/2] updated for XT1 latest firmware 5.52 --- camlibs/ptp2/config.c | 21 ++++++++++++++------- camlibs/ptp2/library.c | 3 ++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index 466e3fc00..a977c1872 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -515,6 +515,7 @@ camera_prepare_capture (Camera *camera, GPContext *context) if (have_prop(camera, params->deviceinfo.VendorExtensionID, PTP_DPC_FUJI_PriorityMode)) { propval.u16 = 0x0002; + //the line below causes camera to move from BULB to 30s, afterwards becomes unusable LOG_ON_PTP_E (ptp_setdevicepropvalue (params, PTP_DPC_FUJI_PriorityMode, &propval, PTP_DTC_UINT16)); } @@ -1455,15 +1456,19 @@ static struct deviceproptableu16 whitebalance[] = { { N_("Fluorescent Lamp 1"), 0x8001, PTP_VENDOR_FUJI }, { N_("Fluorescent Lamp 2"), 0x8002, PTP_VENDOR_FUJI }, { N_("Fluorescent Lamp 3"), 0x8003, PTP_VENDOR_FUJI }, - { N_("Fluorescent Lamp 4"), 0x8004, PTP_VENDOR_FUJI }, - { N_("Fluorescent Lamp 5"), 0x8005, PTP_VENDOR_FUJI }, +// { N_("Fluorescent Lamp 4"), 0x8004, PTP_VENDOR_FUJI }, +// { N_("Fluorescent Lamp 5"), 0x8005, PTP_VENDOR_FUJI }, + { N_("Daylight"), 0x4, PTP_VENDOR_FUJI }, + { N_("Incandescent"), 0x6, PTP_VENDOR_FUJI }, { N_("Shade"), 0x8006, PTP_VENDOR_FUJI }, { N_("Choose Color Temperature"),0x8007, PTP_VENDOR_FUJI }, { N_("Preset Custom 1"), 0x8008, PTP_VENDOR_FUJI }, { N_("Preset Custom 2"), 0x8009, PTP_VENDOR_FUJI }, { N_("Preset Custom 3"), 0x800a, PTP_VENDOR_FUJI }, - { N_("Preset Custom 4"), 0x800b, PTP_VENDOR_FUJI }, - { N_("Preset Custom 5"), 0x800c, PTP_VENDOR_FUJI }, +// { N_("Preset Custom 4"), 0x800b, PTP_VENDOR_FUJI }, +// { N_("Preset Custom 5"), 0x800c, PTP_VENDOR_FUJI }, + { N_("Underwater"), 0x8, PTP_VENDOR_FUJI }, + { N_("Auto"), 0x2, PTP_VENDOR_FUJI }, { N_("Shade"), 0x8011, PTP_VENDOR_SONY }, { N_("Cloudy"), 0x8010, PTP_VENDOR_SONY }, @@ -3087,10 +3092,12 @@ _put_Olympus_OMD_Bulb(CONFIG_PUT_ARGS) static struct deviceproptableu16 fuji_action[] = { { N_("Shoot"), 0x0304, 0 }, - { N_("Bulb On"), 0x0500, 0 }, - { N_("Bulb Off"), 0x000c, 0 }, +// { N_("Bulb On"), 0x0500, 0 }, +// { N_("Bulb Off"), 0x000c, 0 }, { N_("AF"), 0x0200, 0 }, { N_("Cancel AF"), 0x0004, 0 }, + { N_("Unknown"), 0x0104, 0 }, + /* D208 is some kind of control, likely bitmasked. reported like an enum. * 0x200 seems to mean focusing? * 0x208 capture? @@ -6116,7 +6123,7 @@ static struct deviceproptablei16 fuji_shutterspeed[] = { GENERICI16TABLE(Fuji_ShutterSpeed,fuji_shutterspeed) static struct deviceproptableu32 fuji_new_shutterspeed[] = { - { N_("bulb"), 0xffffffff, 0 }, +// { N_("bulb"), 0xffffffff, 0 }, { "60m", 64000180, 0 }, { "30m", 64000150, 0 }, { "15m", 64000120, 0 }, diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 172e698da..15cd5e484 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -9756,7 +9756,8 @@ camera_init (Camera *camera, GPContext *context) break; /* case PTP_VENDOR_SONY: setup already done in fixup_cached_deviceinfo */ case PTP_VENDOR_FUJI: - CR (camera_prepare_capture (camera, context)); + //the line below causes camera to move from BULB to 30s, afterwards becomes unusable + //CR (camera_prepare_capture (camera, context)); break; case PTP_VENDOR_GP_SIGMAFP: if (ptp_operation_issupported(params, 0x9035)) { From 708419cde26d7c6db8796fed60388e74a604526a Mon Sep 17 00:00:00 2001 From: mpeex <142585282+mpeex@users.noreply.github.com> Date: Fri, 7 Feb 2025 10:12:26 +0100 Subject: [PATCH 2/2] Update camlibs/ptp2/config.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Hubert Figuière --- camlibs/ptp2/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index a977c1872..e41c603bb 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -1458,8 +1458,8 @@ static struct deviceproptableu16 whitebalance[] = { { N_("Fluorescent Lamp 3"), 0x8003, PTP_VENDOR_FUJI }, // { N_("Fluorescent Lamp 4"), 0x8004, PTP_VENDOR_FUJI }, // { N_("Fluorescent Lamp 5"), 0x8005, PTP_VENDOR_FUJI }, - { N_("Daylight"), 0x4, PTP_VENDOR_FUJI }, - { N_("Incandescent"), 0x6, PTP_VENDOR_FUJI }, + { N_("Daylight"), 0x0004, PTP_VENDOR_FUJI }, + { N_("Incandescent"), 0x0006, PTP_VENDOR_FUJI }, { N_("Shade"), 0x8006, PTP_VENDOR_FUJI }, { N_("Choose Color Temperature"),0x8007, PTP_VENDOR_FUJI }, { N_("Preset Custom 1"), 0x8008, PTP_VENDOR_FUJI },