diff --git a/camlibs/ptp2/ChangeLog b/camlibs/ptp2/ChangeLog index 542863371..4bace60fe 100644 --- a/camlibs/ptp2/ChangeLog +++ b/camlibs/ptp2/ChangeLog @@ -4,6 +4,11 @@ * 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. + * ptp.c,ptp.h: Added ptp_canon_eos_requestdevicepropvalue() + * config.c: request some string types, handle owner, artist, + copyright, lensname, serialnr, shuttercount, availableshots + * ptp.c: decode EOS strings better + * ptp-pack.c: dpd.GetSet adjustments. 2009-05-26 Marcus Meissner diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index b38890945..ce35207c6 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -179,6 +179,22 @@ camera_prepare_canon_eos_capture(Camera *camera, GPContext *context) { gp_log (GP_LOG_ERROR,"ptp2_prepare_eos_capture", "seteventmode 1 failed!"); return GP_ERROR; } + + if (ptp_operation_issupported(params, PTP_OC_CANON_EOS_RequestDevicePropValue)) { + /* request additional properties */ + ret = ptp_canon_eos_requestdevicepropvalue (params, PTP_DPC_CANON_EOS_Owner); + ret = ptp_canon_eos_requestdevicepropvalue (params, PTP_DPC_CANON_EOS_Artist); + ret = ptp_canon_eos_requestdevicepropvalue (params, PTP_DPC_CANON_EOS_Copyright); + ret = ptp_canon_eos_requestdevicepropvalue (params, PTP_DPC_CANON_EOS_SerialNumber); + +/* ret = ptp_canon_eos_requestdevicepropvalue (params, PTP_DPC_CANON_EOS_DPOFVersion); */ +/* ret = ptp_canon_eos_requestdevicepropvalue (params, PTP_DPC_CANON_EOS_MyMenuList); */ +/* ret = ptp_canon_eos_requestdevicepropvalue (params, PTP_DPC_CANON_EOS_LensAdjustParams); */ + + if (ret != PTP_RC_OK) + gp_log (GP_LOG_ERROR,"ptp2_prepare_eos_capture", "requesting additional properties (owner/artist/etc.) failed"); + } + /* Get the initial bulk set of event data */ while (1) { ret = ptp_canon_eos_getevent (params, &entries, &nrofentries); @@ -784,6 +800,28 @@ _put_Range_INT8(CONFIG_PUT_ARGS) { return (GP_OK); } +/* generic int getter */ +static int +_get_INT(CONFIG_GET_ARGS) { + char value[64]; + + switch (dpd->DataType) { + case PTP_DTC_UINT32: + sprintf (value, "%u", dpd->CurrentValue.u32 ); + break; + case PTP_DTC_UINT16: + sprintf (value, "%u", dpd->CurrentValue.u16 ); + break; + default: + sprintf (value,_("unexpected datatype %i"),dpd->DataType); + return GP_ERROR; + } + gp_widget_new (GP_WIDGET_TEXT, _(menu->label), widget); + gp_widget_set_name (*widget, menu->name); + gp_widget_set_value (*widget,value); + return (GP_OK); +} + static int _get_Nikon_OnOff_UINT8(CONFIG_GET_ARGS) { if (dpd->FormFlag != PTP_DPFF_Range) @@ -3235,6 +3273,13 @@ static struct submenu camera_settings_menu[] = { { N_("Flash Open"), "flashopen", PTP_DPC_NIKON_FlashOpen, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OnOff_UINT8, _put_None }, { N_("Flash Charged"), "flashcharged", PTP_DPC_NIKON_FlashCharged, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OnOff_UINT8, _put_None }, { N_("Lens ID"), "lensid", PTP_DPC_NIKON_LensID, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_LensID, _put_None }, + { N_("Owner"), "owner", PTP_DPC_CANON_EOS_Owner, PTP_VENDOR_CANON, PTP_DTC_STR, _get_STR, _put_STR}, + { N_("Artist"), "artist", PTP_DPC_CANON_EOS_Artist, PTP_VENDOR_CANON, PTP_DTC_STR, _get_STR, _put_STR}, + { N_("Copyright"), "copyright", PTP_DPC_CANON_EOS_Copyright, PTP_VENDOR_CANON, PTP_DTC_STR, _get_STR, _put_STR}, + { N_("Lens Name"), "lensname", PTP_DPC_CANON_EOS_LensName, PTP_VENDOR_CANON, PTP_DTC_STR, _get_STR, _put_None}, + { N_("Serial Number"), "serialnumber", PTP_DPC_CANON_EOS_SerialNumber, PTP_VENDOR_CANON, PTP_DTC_STR, _get_STR, _put_None}, + { N_("Shutter Counter"), "shuttercounter", PTP_DPC_CANON_EOS_ShutterCounter, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_INT, _put_None}, + { N_("Available Shots"), "availableshots", PTP_DPC_CANON_EOS_AvailableShots, PTP_VENDOR_CANON, PTP_DTC_UINT32, _get_INT, _put_None}, /* virtual */ { N_("Fast Filesystem"), "fastfs", 0, PTP_VENDOR_NIKON, 0, _get_Nikon_FastFS, _put_Nikon_FastFS }, diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c index a2f3f8a2f..b9669f85e 100644 --- a/camlibs/ptp2/ptp-pack.c +++ b/camlibs/ptp2/ptp-pack.c @@ -1318,6 +1318,44 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, params->nrofcanon_props = j+1; } dpd = ¶ms->canon_props[j].dpd; + + /* fix GetSet value */ + switch (proptype) { +#define XX(x) case PTP_DPC_CANON_##x: + XX(EOS_FocusMode) + XX(EOS_BatteryPower) + XX(EOS_BatterySelect) + XX(EOS_ModelID) + XX(EOS_PTPExtensionVersion) + XX(EOS_DPOFVersion) + XX(EOS_AvailableShots) + XX(EOS_CurrentStorage) + XX(EOS_CurrentFolder) + XX(EOS_MyMenu) + XX(EOS_MyMenuList) + XX(EOS_HDDirectoryStructure) + XX(EOS_BatteryInfo) + XX(EOS_AdapterInfo) + XX(EOS_LensStatus) + XX(EOS_CardExtension) + XX(EOS_TempStatus) + XX(EOS_ShutterCounter) + XX(EOS_SerialNumber) + XX(EOS_DepthOfFieldPreview) + XX(EOS_EVFRecordStatus) + XX(EOS_LvAfSystem) + XX(EOS_FocusInfoEx) + XX(EOS_DepthOfField) + XX(EOS_Brightness) + XX(EOS_EFComp) + XX(EOS_LensName) + XX(EOS_LensID) +#undef XX + dpd->GetSet = PTP_DPGS_Get; + break; + } + + /* set DataType */ switch (proptype) { case PTP_DPC_CANON_EOS_CameraTime: case PTP_DPC_CANON_EOS_EVFOutputDevice: @@ -1353,6 +1391,10 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, dpd->DataType = PTP_DTC_UINT8; break; case PTP_DPC_CANON_EOS_Owner: + case PTP_DPC_CANON_EOS_Artist: + case PTP_DPC_CANON_EOS_Copyright: + case PTP_DPC_CANON_EOS_SerialNumber: + case PTP_DPC_CANON_EOS_LensName: dpd->DataType = PTP_DTC_STR; break; case PTP_DPC_CANON_EOS_WhiteBalanceAdjustA: @@ -1441,9 +1483,14 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, ptp_debug (params,"event %d: currentvalue of %x is %x", i, proptype, dpd->CurrentValue.u8); break; case PTP_DTC_STR: { +#if 0 /* 5D MII and 400D aktually store plain ASCII in their string properties */ uint8_t len = 0; dpd->FactoryDefaultValue.str = ptp_unpack_string(params, data, 0, &len); dpd->CurrentValue.str = ptp_unpack_string(params, data, 0, &len); +#else + dpd->FactoryDefaultValue.str = strdup( (char*)data ); + dpd->CurrentValue.str = strdup( (char*)data ); +#endif ptp_debug (params,"event %d: currentvalue of %x is %s", i, proptype, dpd->CurrentValue.str); break; } diff --git a/camlibs/ptp2/ptp.c b/camlibs/ptp2/ptp.c index e7843b0c7..da549357d 100644 --- a/camlibs/ptp2/ptp.c +++ b/camlibs/ptp2/ptp.c @@ -1879,6 +1879,28 @@ ptp_canon_eos_keepdeviceon (PTPParams* params) return ptp_transaction(params, &ptp, PTP_DP_NODATA, 0, NULL, NULL); } +/** + * ptp_canon_eos_requestdevicepropvalue: + * + * This operation sends a "ping" style message to the camera. + * + * params: PTPParams* + * + * Return values: Some PTP_RC_* code. + * + **/ +uint16_t +ptp_canon_eos_requestdevicepropvalue (PTPParams* params, uint16_t prop) +{ + PTPContainer ptp; + + PTP_CNT_INIT(ptp); + ptp.Code=PTP_OC_CANON_EOS_RequestDevicePropValue; + ptp.Nparam=1; + ptp.Param1=prop; + return ptp_transaction(params, &ptp, PTP_DP_NODATA, 0, NULL, NULL); +} + /** * ptp_canon_initiatecaptureinmemory: * @@ -1980,8 +2002,12 @@ ptp_canon_eos_getdevicepropdesc (PTPParams* params, uint16_t propcode, params->canon_props[i].dpd.FORM.Enum.SupportedValue, sizeof (PTPPropertyValue)*dpd->FORM.Enum.NumberOfValues ); - /* FIXME: duplicate strings if type is STR. */ } + if (dpd->DataType == PTP_DTC_STR) { + dpd->FactoryDefaultValue.str = strdup( params->canon_props[i].dpd.FactoryDefaultValue.str ); + dpd->CurrentValue.str = strdup( params->canon_props[i].dpd.CurrentValue.str ); + } + return PTP_RC_OK; } @@ -2108,8 +2134,8 @@ ptp_canon_eos_setdevicepropvalue (PTPParams* params, data = calloc(sizeof(uint32_t),3); size = sizeof(uint32_t)*3; } else { - /* FIXME! */ - return PTP_RC_Undefined; + size = strlen(value->str) + 1 + 8; + data = calloc(sizeof(char),size); } htod32a(&data[0], size); htod32a(&data[4], propcode); @@ -2129,6 +2155,11 @@ ptp_canon_eos_setdevicepropvalue (PTPParams* params, htod32a(&data[8], value->u32); params->canon_props[i].dpd.CurrentValue.u32 = value->u32; break; + case PTP_DTC_STR: + strcpy((char*)data + 8, value->str); + free (params->canon_props[i].dpd.CurrentValue.str); + params->canon_props[i].dpd.CurrentValue.str = strdup(value->str); + break; } ret = ptp_transaction(params, &ptp, PTP_DP_SENDDATA, size, &data, NULL); free (data); diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h index 708d72ba9..9e1528854 100644 --- a/camlibs/ptp2/ptp.h +++ b/camlibs/ptp2/ptp.h @@ -2104,6 +2104,7 @@ uint16_t ptp_canon_focusunlock (PTPParams* params); uint16_t ptp_canon_keepdeviceon (PTPParams* params); uint16_t ptp_canon_eos_keepdeviceon (PTPParams* params); uint16_t ptp_canon_initiatecaptureinmemory (PTPParams* params); +uint16_t ptp_canon_eos_requestdevicepropvalue (PTPParams* params, uint16_t prop); uint16_t ptp_canon_eos_capture (PTPParams* params); uint16_t ptp_canon_eos_getevent (PTPParams* params, PTPCanon_changes_entry **entries, int *nrofentries); uint16_t ptp_canon_getpartialobject (PTPParams* params, uint32_t handle,