[gphoto-cvs] SF.net SVN: gphoto: [8708] trunk/libgphoto2/camlibs/ptp2

[<mar...@us...>]

Revision: 8708
Author:   marcusmeissner
Date:     2006-04-02 10:39:36 -0700 (Sun, 02 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/gphoto/?rev=8708&view=rev

Log Message:
-----------
bracket order and bracket set

Modified Paths:
--------------
    trunk/libgphoto2/camlibs/ptp2/cameras/nikon-d70s.txt
    trunk/libgphoto2/camlibs/ptp2/library.c
Modified: trunk/libgphoto2/camlibs/ptp2/cameras/nikon-d70s.txt
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/cameras/nikon-d70s.txt	2006-04-02 17:04:54 UTC (rev 8707)
+++ trunk/libgphoto2/camlibs/ptp2/cameras/nikon-d70s.txt	2006-04-02 17:39:36 UTC (rev 8708)
@@ -228,8 +228,8 @@
 	Long Exposure Noise Reduction(0xd06b):(readwrite) (type=0x2) Range [0 - 1, step 1] value: Off (0)
 	File Number Sequencing(0xd06c):(readwrite) (type=0x2) Range [0 - 2, step 1] value: Off (0)
 Flash Shutter Speed(0xd075):(readwrite) (type=0x2) Range [0 - 11, step 1] value: 0
-Bracket Set(0xd078):(readwrite) (type=0x2) Range [0 - 3, step 1] value: 0
-Bracket Order(0xd07a):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
+	Bracket Set(0xd078):(readwrite) (type=0x2) Range [0 - 3, step 1] value: 0
+	Bracket Order(0xd07a):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
 Reverse Command Dial(0xd086):(readwrite) (type=0x2) Range [0 - 1, step 1] value: Off (0)
 No CF Card Release(0xd08a):(readwrite) (type=0x2) Range [0 - 1, step 1] value: Off (1)
 Image Comment String(0xd090):(readwrite) (type=0xffff) '                                    '
@@ -265,7 +265,7 @@
 	Property 0xd122:(read only) (type=0x2) Range [0 - 1, step 1] value: 0
 	Property 0xd124:(read only) (type=0x1) Range [-18 - 18, step 1] value: 0
 	Property 0xd125:(read only) (type=0x2) Range [0 - 7, step 1] value: 1
-Flash Exposure Compensation(0xd126):(readwrite) (type=0x1) Range [-18 - 6, step 2] value: 0.0 stops (0)
+	Flash Exposure Compensation(0xd126):(readwrite) (type=0x1) Range [-18 - 6, step 2] value: 0.0 stops (0)
 Property 0xd140:(readwrite) (type=0x2) Range [0 - 7, step 1] value: 0
 Property 0xd142:(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
 	AF Beep Mode(0xd160):(readwrite) (type=0x2) Range [0 - 1, step 1] value: Off (1)

Modified: trunk/libgphoto2/camlibs/ptp2/library.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/library.c	2006-04-02 17:04:54 UTC (rev 8707)
+++ trunk/libgphoto2/camlibs/ptp2/library.c	2006-04-02 17:39:36 UTC (rev 8708)
@@ -3126,6 +3126,22 @@
 GENERIC16TABLE(Canon_Aperture,canon_aperture)
 
 
+static struct deviceproptableu8 nikon_bracketset[] = {
+      { N_("AE & Flash"),	0, 0 },
+      { N_("AE only"),		1, 0 },
+      { N_("Flash only"),	2, 0 },
+      { N_("WB bracketing"),	3, 0 },
+};
+GENERIC8TABLE(Nikon_BracketSet,nikon_bracketset)
+
+
+static struct deviceproptableu8 nikon_bracketorder[] = {
+      { N_("MTR > Under"),	0, 0 },
+      { N_("Under > MTR"),	1, 0 },
+};
+GENERIC8TABLE(Nikon_BracketOrder,nikon_bracketorder)
+
+
 static int
 _get_UINT32_as_time(CONFIG_GET_ARGS) {
 	time_t	camtime;
@@ -3401,6 +3417,8 @@
 	{ N_("Flash Mode Manual Power"), "flashmodemanualpower", PTP_DPC_NIKON_FlashModeManualPower, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_FlashModeManualPower, _put_Nikon_FlashModeManualPower},
 	{ N_("Auto Focus Area Power"), "autofocusarea", PTP_DPC_NIKON_AutofocusArea, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_AutofocusArea, _put_Nikon_AutofocusArea},
 	{ N_("Flash Exposure Compensation"), "flashexposurecompensation", PTP_DPC_NIKON_FlashExposureCompensation, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_FlashExposureCompensation, _put_Nikon_FlashExposureCompensation},
+	{ N_("Bracket Set"), "bracketset", PTP_DPC_NIKON_BracketSet, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_BracketSet, _put_Nikon_BracketSet},
+	{ N_("Bracket Order"), "bracketorder", PTP_DPC_NIKON_BracketOrder, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_BracketOrder, _put_Nikon_BracketOrder},
 	/* { N_("Viewfinder Mode"), "viewfinder", PTP_DPC_CANON_ViewFinderMode, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_Canon_ViewFinderMode, _put_Canon_ViewFinderMode}, */
 	{ NULL },
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.