From ff235bc3545e313eee89f2ecbbde77fe3c62d794 Mon Sep 17 00:00:00 2001 From: Marius Steffen Date: Sat, 14 Jul 2018 04:51:33 +0200 Subject: [PATCH] Added "Natural light auto" whitebalance setting and bias for Nikon (introduced with Nikon D850?) --- camlibs/ptp2/config.c | 2 ++ camlibs/ptp2/ptp.h | 1 + 2 files changed, 3 insertions(+) diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index 604c2eb20..302178518 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -1540,6 +1540,7 @@ static struct deviceproptableu16 whitebalance[] = { { N_("Shade"), 0x8011, PTP_VENDOR_NIKON }, { N_("Color Temperature"), 0x8012, PTP_VENDOR_NIKON }, { N_("Preset"), 0x8013, PTP_VENDOR_NIKON }, + { N_("Natural light auto"), 0x8016, PTP_VENDOR_NIKON }, { N_("Fluorescent Lamp 1"), 0x8001, PTP_VENDOR_FUJI }, { N_("Fluorescent Lamp 2"), 0x8002, PTP_VENDOR_FUJI }, @@ -8243,6 +8244,7 @@ static struct submenu capture_settings_menu[] = { { N_("Flash White Balance Bias"), "flashwhitebias", PTP_DPC_NIKON_WhiteBalanceFlashBias, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_UWBBias, _put_Nikon_UWBBias }, { N_("Cloudy White Balance Bias"), "cloudywhitebias", PTP_DPC_NIKON_WhiteBalanceCloudyBias, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_UWBBias, _put_Nikon_UWBBias }, { N_("Shady White Balance Bias"), "shadewhitebias", PTP_DPC_NIKON_WhiteBalanceShadeBias, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_UWBBias, _put_Nikon_UWBBias }, + { N_("Natural light auto White Balance Bias"), "naturallightautowhitebias", PTP_DPC_NIKON_WhiteBalanceNaturalLightAutoBias, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_UWBBias, _put_Nikon_UWBBias }, /* older Nikons have INT8 ranges */ { N_("Auto White Balance Bias"), "autowhitebias", PTP_DPC_NIKON_WhiteBalanceAutoBias, PTP_VENDOR_NIKON, PTP_DTC_INT8, _get_Nikon_WBBias, _put_Nikon_WBBias }, { N_("Tungsten White Balance Bias"), "tungstenwhitebias", PTP_DPC_NIKON_WhiteBalanceTungstenBias, PTP_VENDOR_NIKON, PTP_DTC_INT8, _get_Nikon_WBBias, _put_Nikon_WBBias }, diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h index ddfd3623c..dd4364133 100644 --- a/camlibs/ptp2/ptp.h +++ b/camlibs/ptp2/ptp.h @@ -2064,6 +2064,7 @@ typedef struct _PTPCanonEOSDeviceInfo { #define PTP_DPC_NIKON_TunePreset2 0xD153 #define PTP_DPC_NIKON_TunePreset3 0xD154 #define PTP_DPC_NIKON_TunePreset4 0xD155 +#define PTP_DPC_NIKON_WhiteBalanceNaturalLightAutoBias 0xD15E /* Only encountered in D850? */ #define PTP_DPC_NIKON_BeepOff 0xD160 #define PTP_DPC_NIKON_AutofocusMode 0xD161 #define PTP_DPC_NIKON_AFAssist 0xD163