Menu
▾
▴
[gphoto-cvs] SF.net SVN: gphoto:[11623] branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2
|
From: <mar...@us...> - 2008-12-15 20:57:04
|
Revision: 11623
http://gphoto.svn.sourceforge.net/gphoto/?rev=11623&view=rev
Author: marcusmeissner
Date: 2008-12-15 20:56:59 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
added some nikon property ids, report names
Modified Paths:
--------------
branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ChangeLog
branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c
branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/library.c
branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ptp.c
branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ptp.h
Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ChangeLog
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ChangeLog 2008-12-15 20:35:52 UTC (rev 11622)
+++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ChangeLog 2008-12-15 20:56:59 UTC (rev 11623)
@@ -1,3 +1,7 @@
+2008-12-14 Marcus Meissner <ma...@je...>
+
+ * ptp.h: Found some Nikon property ids.
+
2008-11-27 Marcus Meissner <ma...@je...>
* library.c: Got the data for the D700 and D300, included.
@@ -2,10 +6,7 @@
Changed nikon capture code to work with the D700 and other
- newer Nikon DSLRs. And some adjustments to work with
- older ones too.
+ newer Nikon DSLRs.
* ptp.[ch]: Decode the Nikon DSLR current rotation flag.
* ptp.h: Mark up the operation codes for Nikons.
- * config.c: Nikon low light indicator query.
-
2008-11-23 Marcus Meissner <ma...@je...>
Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c 2008-12-15 20:35:52 UTC (rev 11622)
+++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c 2008-12-15 20:56:59 UTC (rev 11623)
@@ -1068,6 +1068,13 @@
};
GENERIC8TABLE(Nikon_FlashMode,nikon_flashmode)
+static struct deviceproptableu8 nikon_afmode[] = {
+ { N_("AF-S"), 0, 0 },
+ { N_("AF-C"), 1, 0 },
+ /* more for newer */
+};
+GENERIC8TABLE(Nikon_AFMode,nikon_afmode)
+
static struct deviceproptableu8 flash_modemanualpower[] = {
{ N_("Full"), 0x00, 0 },
{ "1/2", 0x01, 0 },
@@ -2732,7 +2739,7 @@
static struct submenu capture_settings_menu[] = {
{ N_("Long Exp Noise Reduction"), "longexpnr", PTP_DPC_NIKON_LongExposureNoiseReduction, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OnOff_UINT8, _put_Nikon_OnOff_UINT8},
- { N_("Auto Focus Mode"), "autofocusmode", PTP_DPC_NIKON_AutofocusMode, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OnOff_UINT8, _put_Nikon_OnOff_UINT8},
+ { N_("Auto Focus Mode"), "autofocusmode", PTP_DPC_NIKON_AutofocusMode, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_AFMode, _put_Nikon_AFMode},
{ N_("Auto Focus Mode 2"), "autofocusmode2", PTP_DPC_NIKON_A4AFActivation, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OnOff_UINT8, _put_Nikon_OnOff_UINT8},
{ N_("Zoom"), "zoom", PTP_DPC_CANON_Zoom, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_ZoomRange, _put_Canon_ZoomRange},
{ N_("Assist Light"), "assistlight", PTP_DPC_CANON_AssistLight, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_AssistLight, _put_Canon_AssistLight},
Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/library.c
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/library.c 2008-12-15 20:35:52 UTC (rev 11622)
+++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/library.c 2008-12-15 20:56:59 UTC (rev 11623)
@@ -519,8 +519,9 @@
{"Kodak:ZD710", 0x040a, 0x05c0, 0},
/* Peter F Bradshaw <pf...@ex...> */
{"Kodak:C813", 0x040a, 0x05c3, 0},
+ /* reported by Christian Le Corre <lec...@gm...> */
+ {"Kodak:C913", 0x040a, 0x05c6, 0},
-
/* HP PTP cameras */
#if 0
/* 0x4002 seems to be the mass storage ID, which various forums suggest. -Marcus */
Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ptp.c
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ptp.c 2008-12-15 20:35:52 UTC (rev 11622)
+++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ptp.c 2008-12-15 20:56:59 UTC (rev 11623)
@@ -3300,6 +3300,12 @@
N_("Shady White Balance Bias")},
{PTP_DPC_NIKON_WhiteBalanceColorTemperature, /* 0xD01e */
N_("White Balance Colour Temperature")},
+ {PTP_DPC_NIKON_WhiteBalancePresetNo, /* 0xD01f */
+ N_("White Balance Present Number")},
+ {PTP_DPC_NIKON_WhiteBalancePresetVal0, /* 0xD025 */
+ N_("White Balance Present Value 0")},
+ {PTP_DPC_NIKON_WhiteBalancePresetVal1, /* 0xD026 */
+ N_("White Balance Present Value 1")},
{PTP_DPC_NIKON_ImageSharpening, /* 0xD02a */
N_("Sharpening")},
{PTP_DPC_NIKON_ToneCompensation, /* 0xD02b */
@@ -3315,13 +3321,15 @@
{PTP_DPC_NIKON_CSMMenuBankSelect, /* 0xD040 */
"PTP_DPC_NIKON_CSMMenuBankSelect"},
{PTP_DPC_NIKON_MenuBankNameA, /* 0xD041 */
- "PTP_DPC_NIKON_MenuBankNameA"},
+ N_("Menu Bank Name A")},
{PTP_DPC_NIKON_MenuBankNameB, /* 0xD042 */
- "PTP_DPC_NIKON_MenuBankNameB"},
+ N_("Menu Bank Name B")},
{PTP_DPC_NIKON_MenuBankNameC, /* 0xD043 */
- "PTP_DPC_NIKON_MenuBankNameC"},
+ N_("Menu Bank Name C")},
{PTP_DPC_NIKON_MenuBankNameD, /* 0xD044 */
- "PTP_DPC_NIKON_MenuBankNameD"},
+ N_("Menu Bank Name D")},
+ {PTP_DPC_NIKON_ResetBank, /* 0xD045 */
+ N_("Reset Menu Bank")},
{PTP_DPC_NIKON_A1AFCModePriority, /* 0xD048 */
"PTP_DPC_NIKON_A1AFCModePriority"},
{PTP_DPC_NIKON_A2AFSModePriority, /* 0xD049 */
@@ -3419,19 +3427,26 @@
N_("No CF Card Release")},
{PTP_DPC_NIKON_ImageCommentString, /* 0xD090 */
N_("Image Comment String")},
- {PTP_DPC_NIKON_ImageCommentAttach, /* 0xD091 */
- N_("Image Comment Attach")},
+ {PTP_DPC_NIKON_ImageCommentEnable, /* 0xD091 */
+ N_("Image Comment Enable")},
{PTP_DPC_NIKON_ImageRotation, /* 0xD092 */
N_("Image Rotation")},
{PTP_DPC_NIKON_Bracketing, /* 0xD0c0 */
N_("Exposure Bracketing")},
- {PTP_DPC_NIKON_ExposureBracketingIntervalDist, /* 0xD0c1 */
- N_("Exposure Bracketing Distance")},
- {PTP_DPC_NIKON_BracketingProgram, /* 0xD0c2 */
- N_("Exposure Bracketing Number")},
- {PTP_DPC_NIKON_WhiteBalanceBracketStep, N_("NIKON White Balance Bracket Step")}, /* 0xD0C4 */
+ {PTP_DPC_NIKON_AutoExposureBracketStep, /* 0xD0c1 */
+ N_("Exposure Bracketing Step")},
+ {PTP_DPC_NIKON_AutoExposureBracketProgram, /* 0xD0c2 */
+ N_("Exposure Bracketing Program")},
+ {PTP_DPC_NIKON_AutoExposureBracketCount, /* 0xD0c3 */
+ N_("Auto Exposure Bracket Count")},
+ {PTP_DPC_NIKON_WhiteBalanceBracketStep, N_("White Balance Bracket Step")}, /* 0xD0C4 */
+ {PTP_DPC_NIKON_WhiteBalanceBracketProgram, N_("White Balance Bracket Program")}, /* 0xD0C5 */
{PTP_DPC_NIKON_LensID, /* 0xD0E0 */
N_("Lens ID")},
+ {PTP_DPC_NIKON_LensSort, /* 0xD0E1 */
+ N_("Lens Sort")},
+ {PTP_DPC_NIKON_LensType, /* 0xD0E2 */
+ N_("Lens Type")},
{PTP_DPC_NIKON_FocalLengthMin, /* 0xD0E3 */
N_("Min. Focal Length")},
{PTP_DPC_NIKON_FocalLengthMax, /* 0xD0E4 */
@@ -3443,23 +3458,34 @@
{PTP_DPC_NIKON_ExposureTime, /* 0xD100 */
N_("Nikon Exposure Time")},
{PTP_DPC_NIKON_ACPower, N_("AC Power")}, /* 0xD101 */
+ {PTP_DPC_NIKON_WarningStatus, N_("Warning Status")},/* 0xD102 */
{PTP_DPC_NIKON_MaximumShots, /* 0xD103 */
N_("Maximum Shots")},
- {PTP_DPC_NIKON_AFLLock, N_("NIKON AF-L Locked")},/* 0xD104 */
- {PTP_DPC_NIKON_AutoExposureLock, /* 0xD105 */
- N_("Auto Exposure Lock")},
- {PTP_DPC_NIKON_AutoFocusLock, /* 0xD106 */
- N_("Auto Focus Lock")},
+ {PTP_DPC_NIKON_AFLockStatus, N_("AF Locked")},/* 0xD104 */
+ {PTP_DPC_NIKON_AELockStatus, N_("AE Locked")},/* 0xD105 */
+ {PTP_DPC_NIKON_FVLockStatus, N_("FV Locked")},/* 0xD106 */
{PTP_DPC_NIKON_AutofocusLCDTopMode2, /* 0xD107 */
N_("AF LCD Top Mode 2")},
{PTP_DPC_NIKON_AutofocusArea, /* 0xD108 */
N_("Active AF Sensor")},
+ {PTP_DPC_NIKON_FlexibleProgram, /* 0xD109 */
+ N_("Flexible Program")},
{PTP_DPC_NIKON_LightMeter, /* 0xD10a */
N_("Exposure Meter")},
{PTP_DPC_NIKON_CameraOrientation, /* 0xD10e */
N_("Camera Orientation")},
{PTP_DPC_NIKON_ExposureApertureLock, /* 0xD111 */
N_("Exposure Aperture Lock")},
+ {PTP_DPC_NIKON_ExternalFlashAttached, /* 0xD120 */
+ N_("External Flash Attached")},
+ {PTP_DPC_NIKON_ExternalFlashStatus, /* 0xD121 */
+ N_("External Flash Status")},
+ {PTP_DPC_NIKON_ExternalFlashSort, /* 0xD122 */
+ N_("External Flash Sort")},
+ {PTP_DPC_NIKON_ExternalFlashCompensation, /* 0xD124 */
+ N_("External Flash Compensation")},
+ {PTP_DPC_NIKON_NewExternalFlashMode, /* 0xD125 */
+ N_("External Flash Mode")},
{PTP_DPC_NIKON_FlashExposureCompensation, /* 0xD126 */
N_("Flash Exposure Compensation")},
{PTP_DPC_NIKON_OptimizeImage, /* 0xD140 */
@@ -3692,10 +3718,11 @@
{PTP_DPC_StillCaptureMode, PTP_VENDOR_NIKON, 32787, N_("Remote")},
{PTP_DPC_StillCaptureMode, PTP_VENDOR_NIKON, 32787, N_("Mirror Up")},
{PTP_DPC_StillCaptureMode, PTP_VENDOR_NIKON, 32788, N_("Timer + Remote")},
- PTP_VENDOR_VAL_BOOL(PTP_DPC_NIKON_AutofocusMode,PTP_VENDOR_NIKON),
PTP_VENDOR_VAL_RBOOL(PTP_DPC_NIKON_AFAssist,PTP_VENDOR_NIKON),
PTP_VENDOR_VAL_RBOOL(PTP_DPC_NIKON_ImageReview,PTP_VENDOR_NIKON),
PTP_VENDOR_VAL_BOOL(PTP_DPC_NIKON_GridDisplay,PTP_VENDOR_NIKON),
+ {PTP_DPC_NIKON_AutofocusMode, PTP_VENDOR_NIKON, 0, N_("AF-S")},
+ {PTP_DPC_NIKON_AutofocusMode, PTP_VENDOR_NIKON, 1, N_("AF-C")},
{PTP_DPC_NIKON_AFAreaIllumination, PTP_VENDOR_NIKON, 0, N_("Auto")},
{PTP_DPC_NIKON_AFAreaIllumination, PTP_VENDOR_NIKON, 1, N_("Off")},
{PTP_DPC_NIKON_AFAreaIllumination, PTP_VENDOR_NIKON, 2, N_("On")},
Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ptp.h
===================================================================
--- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ptp.h 2008-12-15 20:35:52 UTC (rev 11622)
+++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ptp.h 2008-12-15 20:56:59 UTC (rev 11623)
@@ -1188,6 +1188,9 @@
#define PTP_DPC_NIKON_WhiteBalanceCloudyBias 0xD01C
#define PTP_DPC_NIKON_WhiteBalanceShadeBias 0xD01D
#define PTP_DPC_NIKON_WhiteBalanceColorTemperature 0xD01E
+#define PTP_DPC_NIKON_WhiteBalancePresetNo 0xD01F
+#define PTP_DPC_NIKON_WhiteBalancePresetVal0 0xD025
+#define PTP_DPC_NIKON_WhiteBalancePresetVal1 0xD026
#define PTP_DPC_NIKON_ImageSharpening 0xD02A
#define PTP_DPC_NIKON_ToneCompensation 0xD02B
#define PTP_DPC_NIKON_ColorModel 0xD02C
@@ -1199,6 +1202,7 @@
#define PTP_DPC_NIKON_MenuBankNameB 0xD042
#define PTP_DPC_NIKON_MenuBankNameC 0xD043
#define PTP_DPC_NIKON_MenuBankNameD 0xD044
+#define PTP_DPC_NIKON_ResetBank 0xD045
#define PTP_DPC_NIKON_A1AFCModePriority 0xD048
#define PTP_DPC_NIKON_A2AFSModePriority 0xD049
#define PTP_DPC_NIKON_A3GroupDynamicAF 0xD04A
@@ -1208,6 +1212,7 @@
#define PTP_DPC_NIKON_FocusAreaIllumWhenSelected 0xD04E
#define PTP_DPC_NIKON_FocusAreaWrap 0xD04F
#define PTP_DPC_NIKON_A7VerticalAFON 0xD050
+#define PTP_DPC_NIKON_FocusAreaZone 0xD052
#define PTP_DPC_NIKON_ISOAuto 0xD054
#define PTP_DPC_NIKON_B2ISOStep 0xD055
#define PTP_DPC_NIKON_EVStep 0xD056
@@ -1227,8 +1232,9 @@
#define PTP_DPC_NIKON_D6ControlPanelFinderRearControl 0xD06D
#define PTP_DPC_NIKON_ControlPanelFinderViewfinder 0xD06E
#define PTP_DPC_NIKON_D7Illumination 0xD06F
+#define PTP_DPC_NIKON_NrHighISO 0xD070
#define PTP_DPC_NIKON_E1FlashSyncSpeed 0xD074
-#define PTP_DPC_NIKON_FlashShutterSpeed 0xD075
+#define PTP_DPC_NIKON_FlashShutterSpeed 0xD075 /* SB Low Limit */
#define PTP_DPC_NIKON_E3AAFlashMode 0xD076
#define PTP_DPC_NIKON_E4ModelingFlash 0xD077
#define PTP_DPC_NIKON_BracketSet 0xD078
@@ -1248,49 +1254,83 @@
#define PTP_DPC_NIKON_F6ButtonsAndDials 0xD089
#define PTP_DPC_NIKON_NoCFCard 0xD08A
#define PTP_DPC_NIKON_ImageCommentString 0xD090
-#define PTP_DPC_NIKON_ImageCommentAttach 0xD091
+#define PTP_DPC_NIKON_ImageCommentEnable 0xD091
#define PTP_DPC_NIKON_ImageRotation 0xD092
#define PTP_DPC_NIKON_Bracketing 0xD0C0
-#define PTP_DPC_NIKON_ExposureBracketingIntervalDist 0xD0C1
-#define PTP_DPC_NIKON_BracketingProgram 0xD0C2
+#define PTP_DPC_NIKON_AutoExposureBracketStep 0xD0C1 /* auto exposure bracketing step */
+#define PTP_DPC_NIKON_AutoExposureBracketProgram 0xD0C2
+#define PTP_DPC_NIKON_AutoExposureBracketCount 0xD0C3
#define PTP_DPC_NIKON_WhiteBalanceBracketStep 0xD0C4
+#define PTP_DPC_NIKON_WhiteBalanceBracketProgram 0xD0C5
#define PTP_DPC_NIKON_LensID 0xD0E0
+#define PTP_DPC_NIKON_LensSort 0xD0E1
+#define PTP_DPC_NIKON_LensType 0xD0E2
#define PTP_DPC_NIKON_FocalLengthMin 0xD0E3
#define PTP_DPC_NIKON_FocalLengthMax 0xD0E4
#define PTP_DPC_NIKON_MaxApAtMinFocalLength 0xD0E5
#define PTP_DPC_NIKON_MaxApAtMaxFocalLength 0xD0E6
#define PTP_DPC_NIKON_ExposureTime 0xD100
#define PTP_DPC_NIKON_ACPower 0xD101
-#define PTP_DPC_NIKON_MaximumShots 0xD103
-#define PTP_DPC_NIKON_AFLLock 0xD104
-#define PTP_DPC_NIKON_AutoExposureLock 0xD105
-#define PTP_DPC_NIKON_AutoFocusLock 0xD106
+#define PTP_DPC_NIKON_WarningStatus 0xD102
+#define PTP_DPC_NIKON_MaximumShots 0xD103 /* remain shots (in RAM buffer?) */
+#define PTP_DPC_NIKON_AFLockStatus 0xD104
+#define PTP_DPC_NIKON_AELockStatus 0xD105
+#define PTP_DPC_NIKON_FVLockStatus 0xD106
#define PTP_DPC_NIKON_AutofocusLCDTopMode2 0xD107
#define PTP_DPC_NIKON_AutofocusArea 0xD108
+#define PTP_DPC_NIKON_FlexibleProgram 0xD109
#define PTP_DPC_NIKON_LightMeter 0xD10A
#define PTP_DPC_NIKON_CameraOrientation 0xD10E
#define PTP_DPC_NIKON_ExposureApertureLock 0xD111
+#define PTP_DPC_NIKON_ExternalFlashAttached 0xD120
+#define PTP_DPC_NIKON_ExternalFlashStatus 0xD121
+#define PTP_DPC_NIKON_ExternalFlashSort 0xD122
+#define PTP_DPC_NIKON_ExternalFlashCompensation 0xD124
+#define PTP_DPC_NIKON_NewExternalFlashMode 0xD125
#define PTP_DPC_NIKON_FlashExposureCompensation 0xD126
#define PTP_DPC_NIKON_OptimizeImage 0xD140
#define PTP_DPC_NIKON_Saturation 0xD142
+#define PTP_DPC_NIKON_BW_FillerEffect 0xD143
+#define PTP_DPC_NIKON_BW_Sharpness 0xD144
+#define PTP_DPC_NIKON_BW_Contrast 0xD145
+#define PTP_DPC_NIKON_BW_Setting_Type 0xD146
#define PTP_DPC_NIKON_BeepOff 0xD160
#define PTP_DPC_NIKON_AutofocusMode 0xD161
#define PTP_DPC_NIKON_AFAssist 0xD163
-#define PTP_DPC_NIKON_PADVPMode 0xD164
+#define PTP_DPC_NIKON_PADVPMode 0xD164 /* iso auto time */
#define PTP_DPC_NIKON_ImageReview 0xD165
#define PTP_DPC_NIKON_AFAreaIllumination 0xD166
#define PTP_DPC_NIKON_FlashMode 0xD167
#define PTP_DPC_NIKON_FlashCommanderMode 0xD168
#define PTP_DPC_NIKON_FlashSign 0xD169
+#define PTP_DPC_NIKON_ISO_Auto 0xD16A
#define PTP_DPC_NIKON_RemoteTimeout 0xD16B
#define PTP_DPC_NIKON_GridDisplay 0xD16C
#define PTP_DPC_NIKON_FlashModeManualPower 0xD16D
#define PTP_DPC_NIKON_FlashModeCommanderPower 0xD16E
+#define PTP_DPC_NIKON_AutoFP 0xD16F
#define PTP_DPC_NIKON_CSMMenu 0xD180
+#define PTP_DPC_NIKON_WarningDisplay 0xD181
+#define PTP_DPC_NIKON_BatteryCellKind 0xD182
+#define PTP_DPC_NIKON_ISOAutoHiLimit 0xD183
#define PTP_DPC_NIKON_BracketingFramesAndSteps 0xD190
-#define PTP_DPC_NIKON_LowLight 0xD1B0
+#define PTP_DPC_NIKON_LowLight 0xD1B0 /* exp disp status */
+#define PTP_DPC_NIKON_ExposureIndicateStatus 0xD1B1 /* exp indicate status */
#define PTP_DPC_NIKON_FlashOpen 0xD1C0
#define PTP_DPC_NIKON_FlashCharged 0xD1C1
+#define PTP_DPC_NIKON_FlashMRepeatValue 0xD1D0
+#define PTP_DPC_NIKON_FlashMRepeatCount 0xD1D1
+#define PTP_DPC_NIKON_FlashMRepeatInterval 0xD1D2
+#define PTP_DPC_NIKON_FlashCommandChannel 0xD1D3
+#define PTP_DPC_NIKON_FlashCommandSelfMode 0xD1D4
+#define PTP_DPC_NIKON_FlashCommandSelfCompensation 0xD1D5
+#define PTP_DPC_NIKON_FlashCommandSelfValue 0xD1D6
+#define PTP_DPC_NIKON_FlashCommandAMode 0xD1D7
+#define PTP_DPC_NIKON_FlashCommandACompensation 0xD1D8
+#define PTP_DPC_NIKON_FlashCommandAValue 0xD1D9
+#define PTP_DPC_NIKON_FlashCommandBMode 0xD1DA
+#define PTP_DPC_NIKON_FlashCommandBCompensation 0xD1DB
+#define PTP_DPC_NIKON_FlashCommandBValue 0xD1DC
/* Microsoft/MTP specific */
#define PTP_DPC_MTP_SecureTime 0xD101
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|