From: <mar...@us...> - 2009-07-09 20:27:48
|
Revision: 12201 http://gphoto.svn.sourceforge.net/gphoto/?rev=12201&view=rev Author: marcusmeissner Date: 2009-07-09 20:27:44 +0000 (Thu, 09 Jul 2009) Log Message: ----------- added AEB and DriveMode (after changing to 16bit) 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/ptp-pack.c Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ChangeLog =================================================================== --- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ChangeLog 2009-07-09 16:58:38 UTC (rev 12200) +++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ChangeLog 2009-07-09 20:27:44 UTC (rev 12201) @@ -1,8 +1,9 @@ 009-07-09 Axel Waggershauser <aw...@we...> - * ptp.c: Some sprintf format adjustments. - * ptp.h: EOS_RemoteRelease doc comments. - * config.c: More Canon ISO and FStop values for the Canon 5D Mark II. - * ptp-pack.c,library.c: More EOS debugging output. + * ptp.c: Some sprintf format adjustments. + * ptp.h: EOS_RemoteRelease doc comments. + * config.c: More Canon ISO and FStop values for the Canon 5D Mark II. + * ptp-pack.c,library.c: More EOS debugging output. + * config.c: Added AEB and DriveMode configuration. 2009-05-17 Marcus Meissner <ma...@je...> Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c =================================================================== --- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c 2009-07-09 16:58:38 UTC (rev 12200) +++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/config.c 2009-07-09 20:27:44 UTC (rev 12201) @@ -1382,6 +1382,28 @@ }; GENERIC16TABLE(Canon_ISO,canon_isospeed) +static struct deviceproptableu16 canon_eos_aeb[] = { + { N_("off"), 0x0000, 0 }, + { "+/- 1/3", 0x0003, 0 }, + { "+/- 1/2", 0x0004, 0 }, + { "+/- 2/3", 0x0005, 0 }, + { "+/- 1", 0x0008, 0 }, + { "+/- 1 1/3", 0x000b, 0 }, + { "+/- 1 1/2", 0x000c, 0 }, + { "+/- 1 2/3", 0x000d, 0 }, + { "+/- 2", 0x0010, 0 }, + { "+/- 3", 0x0018, 0 }, +}; +GENERIC16TABLE(Canon_EOS_AEB,canon_eos_aeb) + +static struct deviceproptableu16 canon_eos_drive_mode[] = { + { N_("Single"), 0x0000, 0 }, + { N_("Continuous"), 0x0001, 0 }, + { N_("Timer 2 sec"), 0x0010, 0 }, + { N_("Timer 10 sec"), 0x0011, 0 }, +}; +GENERIC16TABLE(Canon_EOS_DriveMode,canon_eos_drive_mode) + static int _get_ISO(CONFIG_GET_ARGS) { int i; @@ -3283,6 +3305,8 @@ { N_("Tone Compensation"), "tonecompensation", PTP_DPC_NIKON_ToneCompensation, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_ToneCompensation, _put_Nikon_ToneCompensation }, { N_("Saturation"), "saturation", PTP_DPC_NIKON_Saturation, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_Saturation, _put_Nikon_Saturation }, { N_("Hue Adjustment"), "hueadjustment", PTP_DPC_NIKON_HueAdjustment, PTP_VENDOR_NIKON, PTP_DTC_INT8, _get_Nikon_HueAdjustment, _put_Nikon_HueAdjustment }, + { N_("Auto Exposure Bracketing"), "aeb", PTP_DPC_CANON_EOS_AEB, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_EOS_AEB, _put_Canon_EOS_AEB}, + { N_("Drive Mode"), "drivemode", PTP_DPC_CANON_EOS_DriveMode, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_EOS_DriveMode, _put_Canon_EOS_DriveMode}, { N_("Low Light"), "lowlight", PTP_DPC_NIKON_ExposureDisplayStatus, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_LowLight, _put_None }, { N_("Light Meter"), "lightmeter", PTP_DPC_NIKON_LightMeter, PTP_VENDOR_NIKON, PTP_DTC_INT8, _get_Nikon_LightMeter, _put_None }, Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ptp-pack.c =================================================================== --- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ptp-pack.c 2009-07-09 16:58:38 UTC (rev 12200) +++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/ptp-pack.c 2009-07-09 20:27:44 UTC (rev 12201) @@ -1322,11 +1322,9 @@ case PTP_DPC_CANON_EOS_CameraTime: case PTP_DPC_CANON_EOS_EVFOutputDevice: case PTP_DPC_CANON_EOS_AvailableShots: - case PTP_DPC_CANON_EOS_DriveMode: case PTP_DPC_CANON_EOS_CaptureDestination: case PTP_DPC_CANON_EOS_WhiteBalanceXA: case PTP_DPC_CANON_EOS_WhiteBalanceXB: - case PTP_DPC_CANON_EOS_AEB: case PTP_DPC_CANON_EOS_QuickReviewTime: case PTP_DPC_CANON_EOS_CurrentStorage: case PTP_DPC_CANON_EOS_CurrentFolder: @@ -1344,6 +1342,8 @@ case PTP_DPC_CANON_EOS_ColorSpace: case PTP_DPC_CANON_EOS_BatteryPower: case PTP_DPC_CANON_EOS_PTPExtensionVersion: + case PTP_DPC_CANON_EOS_DriveMode: + case PTP_DPC_CANON_EOS_AEB: dpd->DataType = PTP_DTC_UINT16; break; case PTP_DPC_CANON_EOS_PictureStyle: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |