darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added AEB and DriveMode

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12202 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2009-07-09 20:32:44 +00:00
parent f42875afcd
commit dff60445ab
3 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
camlibs/ptp2/ChangeLog
View File

@@ -3,6 +3,7 @@
* 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-26 Marcus Meissner <marcus@jet.franken.de>

24
camlibs/ptp2/config.c
View File

@@ -1414,6 +1414,28 @@ static struct deviceproptableu16 canon_isospeed[] = {
};
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;
@@ -3341,6 +3363,8 @@ static struct submenu capture_settings_menu[] = {
{ 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 },

4
camlibs/ptp2/ptp-pack.c
View File

@@ -1322,11 +1322,9 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize,
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 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize,
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: