adda shutterspeed override list for Fuji XT-2

https://github.com/gphoto/libgphoto2/issues/506

1 files changed, 82 insertions, 6 deletions

diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
index b5da8b6cc..ad4f5d9cf 100644
--- a/camlibs/ptp2/config.c
+++ b/camlibs/ptp2/config.c
@@ -4699,17 +4699,92 @@ static struct deviceproptablei16 fuji_shutterspeed[] = {
 };
 GENERICI16TABLE(Fuji_ShutterSpeed,fuji_shutterspeed)
 
+static struct deviceproptableu32 fuji_new_shutterspeed[] = {
+	{ N_("bulb"),	0xffffffff, 0 },
+	{ "60m",	64000180, 0 },
+	{ "30m",	64000150, 0 },
+	{ "15m",	64000120, 0 },
+	{ "8m",		64000090, 0 },
+	{ "4m",		64000060, 0 },
+	{ "2m",		64000030, 0 },
+	{ "60s",	64000000, 0 },
+	{ "50s",	50796833, 0 },
+	{ "40s",	40317473, 0 },
+	{ "30s",	32000000, 0 },
+	{ "25s",	25398416, 0 },
+	{ "20s",	20158736, 0 },
+	{ "15s",	16000000, 0 },
+	{ "13s",	12699208, 0 },
+	{ "10s",	10079368, 0 },
+	{ "8s",		8000000, 0 },
+	{ "6s",		6349604, 0 },
+	{ "5s",		5039684, 0 },
+	{ "4s",		4000000, 0 },
+	{ "3s",		3174802, 0 },
+	{ "2.5s",	2519842, 0 },
+	{ "2s",		2000000, 0 },
+	{ "1.6s",	1587401, 0 },
+	{ "1.3s",	1259921, 0 },
+	{ "1s",		1000000, 0 },
+	{ "0.8s",	793700, 0 },
+	{ "0.6s",	629960, 0 },
+	{ "1/2",	500000, 0 },
+	{ "0.4s",	396850, 0 },
+	{ "1/3",	314980, 0 },
+	{ "1/4",	250000, 0 },
+	{ "1/5",	198425, 0 },
+	{ "1/6",	157490, 0 },
+	{ "1/8",	125000, 0 },
+	{ "1/10",	99212, 0 },
+	{ "1/13",	78745, 0 },
+	{ "1/15",	62500, 0 },
+	{ "1/20",	49606, 0 },
+	{ "1/25",	39372, 0 },
+	{ "1/30",	31250, 0 },
+	{ "1/40",	24803, 0 },
+	{ "1/50",	19686, 0 },
+	{ "1/60",	15625, 0 },
+	{ "1/80",	12401, 0 },
+	{ "1/100",	9843, 0 },
+	{ "1/125",	7812, 0 },
+	{ "1/160",	6200, 0 },
+	{ "1/200",	4921, 0 },
+	{ "1/250",	3906, 0 },
+	{ "1/320",	3100, 0 },
+	{ "1/400",	2460, 0 },
+	{ "1/500",	1953, 0 },
+	{ "1/640",	1550, 0 },
+	{ "1/800",	1230, 0 },
+	{ "1/1000",	976, 0 },
+	{ "1/1250",	775, 0 },
+	{ "1/1600",	615, 0 },
+	{ "1/2000",	488, 0 },
+	{ "1/2500",	387, 0 },
+	{ "1/3200",	307, 0 },
+	{ "1/4000",	244, 0 },
+	{ "1/5000",	193, 0 },
+	{ "1/6400",	153, 0 },
+	{ "1/8000",	122, 0 },
+	{ "1/10000",	96, 0 },
+	{ "1/13000",	76, 0 },
+	{ "1/16000",	61, 0 },
+	{ "1/20000",	48, 0 },
+	{ "1/25000",	38, 0 },
+	{ "1/32000",	30, 0 },
+};
+GENERIC32TABLE(Fuji_New_ShutterSpeed,fuji_new_shutterspeed)
+
 static struct deviceproptableu8 nikon_remotetimeout[] = {
-	{ N_("1 minute"),	0x00, 0 },
-	{ N_("5 minutes"),	0x01, 0 },
-	{ N_("10 minutes"),	0x02, 0 },
-	{ N_("15 minutes"),	0x03, 0 },
+	{ N_("1 minute"),	0x00,	0 },
+	{ N_("5 minutes"),	0x01,	0 },
+	{ N_("10 minutes"),	0x02,	0 },
+	{ N_("15 minutes"),	0x03,	0 },
 };
 GENERIC8TABLE(Nikon_RemoteTimeout,nikon_remotetimeout)
 
 static struct deviceproptableu8 nikon_optimizeimage[] = {
-	{ N_("Normal"),		0x00, 0 },
-	{ N_("Vivid"),		0x01, 0 },
+	{ N_("Normal"),		0x00,	0 },
+	{ N_("Vivid"),		0x01,	0 },
 	{ N_("Sharper"),	0x02, 0 },
 	{ N_("Softer"),		0x03, 0 },
 	{ N_("Direct Print"),	0x04, 0 },
@@ -8722,6 +8797,7 @@ static struct submenu capture_settings_menu[] = {
 	{ N_("Focusing Point"),                 "focusingpoint",            PTP_DPC_CANON_FocusingPoint,            PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_FocusingPoint,           _put_Canon_FocusingPoint },
 	{ N_("Sharpness"),                      "sharpness",                PTP_DPC_Sharpness,                      0,                  PTP_DTC_UINT8,  _get_Sharpness,                     _put_Sharpness },
 	{ N_("Capture Delay"),                  "capturedelay",             PTP_DPC_CaptureDelay,                   0,                  PTP_DTC_UINT32, _get_Milliseconds,                  _put_Milliseconds },
+	{ N_("Shutter Speed"),                  "shutterspeed",             PTP_DPC_ExposureTime,		    PTP_VENDOR_FUJI,    PTP_DTC_UINT32,	_get_Fuji_New_ShutterSpeed,	    _put_Fuji_New_ShutterSpeed },
 	{ N_("Shutter Speed"),                  "shutterspeed",             PTP_DPC_ExposureTime,                   0,                  PTP_DTC_UINT32, _get_ExpTime,                       _put_ExpTime },
 	{ N_("Shutter Speed"),                  "shutterspeed",             PTP_DPC_CANON_ShutterSpeed,             PTP_VENDOR_CANON,   PTP_DTC_UINT16, _get_Canon_ShutterSpeed,            _put_Canon_ShutterSpeed },
 	{ N_("Shutter Speed"),                  "shutterspeed",             0,						PTP_VENDOR_PANASONIC,   PTP_DTC_INT32, _get_Panasonic_Shutter,         _put_Panasonic_Shutter },