diff --git a/SdkCore.framework/Headers/Arsdk.h b/SdkCore.framework/Headers/Arsdk.h index cf425f2..822a203 100644 --- a/SdkCore.framework/Headers/Arsdk.h +++ b/SdkCore.framework/Headers/Arsdk.h @@ -1,51 +1,52 @@ #ifndef Arsdk_h #define Arsdk_h -#include "ArsdkBackendType.h" -#include "ArsdkApiCapabilities.h" -#include "ArsdkCore.h" -#include "ArsdkCore+Devices.h" -#include "ArsdkCore+Stream.h" -#include "ArsdkCore+Source.h" -#include "ArsdkCore+Frame.h" -#include "ArsdkCore+Media.h" -#include "ArsdkCore+Update.h" -#include "ArsdkCore+FtpRequest.h" -#include "ArsdkCore+Crashml.h" -#include "ArsdkCore+FlightLog.h" -#include "ArsdkCore+RcBlackBox.h" -#include "ArsdkCommand.h" -#include "ArsdkFeatures.h" +#import "ArsdkBackendType.h" +#import "ArsdkApiCapabilities.h" +#import "ArsdkCore.h" +#import "ArsdkCore+Devices.h" +#import "ArsdkCore+Stream.h" +#import "ArsdkCore+Source.h" +#import "ArsdkCore+Frame.h" +#import "ArsdkCore+Media.h" +#import "ArsdkCore+Update.h" +#import "ArsdkCore+FtpRequest.h" +#import "ArsdkCore+Crashml.h" +#import "ArsdkCore+FlightLog.h" +#import "ArsdkCore+RcBlackBox.h" +#import "ArsdkCommand.h" +#import "ArsdkFeatures.h" #import "ArsdkFirmwareInfo.h" -#include "ArsdkBackendController.h" -#include "ArsdkWifiBackendController.h" -#include "ArsdkMuxEaBackendController.h" +#import "ArsdkBackendController.h" +#import "ArsdkWifiBackendController.h" +#import "ArsdkMuxEaBackendController.h" -#include "PompLoopUtil.h" -#include "Logger.h" -#include "LogBinRecorderConfig.h" -#include "LogTxtRecorderConfig.h" +#import "PompLoopUtil.h" +#import "Logger.h" +#import "LogBinRecorderConfig.h" +#import "LogTxtRecorderConfig.h" -#include "NSData+zlib.h" -#include "NSData+Crypto.h" +#import "NSData+zlib.h" +#import "NSData+Crypto.h" -#include "FileConverterAPI.h" -#include "NoAckStorage.h" -#include "Anonymizer.h" +#import "FileConverterAPI.h" +#import "NoAckStorage.h" +#import "Anonymizer.h" -#include "SdkCore+EventLogger.h" -#include "SdkCoreFileSource.h" -#include "SdkCoreMediaInfo.h" -#include "SdkCoreRenderer.h" +#import "SdkCore+EventLogger.h" +#import "SdkCoreFileSource.h" +#import "SdkCoreMediaInfo.h" +#import "SdkCoreRenderer.h" +#import "SdkCoreLic.h" -#include "GLError.h" +#import "GLError.h" -#include "ThermalProc.h" -#include "ThermalProcVideo.h" -#include "ThermalProcPicture.h" -#include "ThermalProcPictureData.h" -#include "ThermalProcPaletteFactory.h" +#import "ThermalProc.h" +#import "ThermalProcVideo.h" +#import "ThermalProcPicture.h" +#import "ThermalProcPictureData.h" +#import "ThermalProcPaletteFactory.h" #endif /* Arsdk_h */ diff --git a/SdkCore.framework/Headers/ArsdkBackendController.h b/SdkCore.framework/Headers/ArsdkBackendController.h index 82cd876..dc5b7fc 100644 --- a/SdkCore.framework/Headers/ArsdkBackendController.h +++ b/SdkCore.framework/Headers/ArsdkBackendController.h @@ -39,7 +39,7 @@ @interface ArsdkBackendController : NSObject /** Arsdk controller instance */ -@property (nonatomic, strong, readonly, nonnull) ArsdkCore *arsdkCore; +@property (nonatomic, strong, readonly, nullable) ArsdkCore *arsdkCore; /** Start the backend controller diff --git a/SdkCore.framework/Headers/ArsdkCore.h b/SdkCore.framework/Headers/ArsdkCore.h index a65edd8..f528a73 100644 --- a/SdkCore.framework/Headers/ArsdkCore.h +++ b/SdkCore.framework/Headers/ArsdkCore.h @@ -76,22 +76,6 @@ struct arsdk_cmd; @end -/** Command logging level */ -typedef NS_ENUM(NSInteger, ArsdkCmdLog) { - /** Don't log any commands */ - ArsdkCmdLogNone = 0, - /** - Only log acknowledged commands which are not the frequent ones (like mass storage info or number of satellites) - */ - ArsdkCmdLogAcknowledgedOnlyWithoutFrequent = 1, - /** Only log acknowledged commands */ - ArsdkCmdLogAcknowledgedOnly = 2, - /** Log all commands */ - ArsdkCmdLogAll = 3, -}; - -extern ArsdkCmdLog arsdkCoreCmdLogLevel; - /** Arsdk Controller Wrapper around arsdk-ng. @@ -99,7 +83,7 @@ extern ArsdkCmdLog arsdkCoreCmdLogLevel; @interface ArsdkCore : NSObject /** Native arsdk manager */ -@property (nonatomic, assign, readonly, nonnull) struct arsdk_ctrl *ctrl; +@property (nonatomic, assign, readonly, nonnull) struct arsdk_ctrl *ctrl NS_RETURNS_INNER_POINTER; /** Constructor diff --git a/SdkCore.framework/Headers/ArsdkFeatureAlarms.h b/SdkCore.framework/Headers/ArsdkFeatureAlarms.h index 5cda912..a015fe8 100644 --- a/SdkCore.framework/Headers/ArsdkFeatureAlarms.h +++ b/SdkCore.framework/Headers/ArsdkFeatureAlarms.h @@ -105,8 +105,11 @@ typedef NS_ENUM(NSInteger, ArsdkFeatureAlarmsTakeoffChecklistType) { /** Magneto calibration check. */ ArsdkFeatureAlarmsTakeoffChecklistTypeMagnetoCalibration = 16, + /** Battery lost comm. */ + ArsdkFeatureAlarmsTakeoffChecklistTypeBatteryLostComm = 17, + }; -#define ArsdkFeatureAlarmsTakeoffChecklistTypeCnt 17 +#define ArsdkFeatureAlarmsTakeoffChecklistTypeCnt 18 /** Alarm state. */ typedef NS_ENUM(NSInteger, ArsdkFeatureAlarmsState) { diff --git a/SdkCore.framework/Headers/ArsdkFeatureArdrone3Pilotingstate.h b/SdkCore.framework/Headers/ArsdkFeatureArdrone3Pilotingstate.h index f0e3810..b52d0b4 100644 --- a/SdkCore.framework/Headers/ArsdkFeatureArdrone3Pilotingstate.h +++ b/SdkCore.framework/Headers/ArsdkFeatureArdrone3Pilotingstate.h @@ -368,8 +368,17 @@ typedef NS_ENUM(NSInteger, ArsdkFeatureArdrone3PilotingstateForcedlandingautotri /** Battery will soon be critical, so forced landing auto trigger is planned. */ ArsdkFeatureArdrone3PilotingstateForcedlandingautotriggerReasonBatteryCriticalSoon = 1, + /** Propellers are critically iced, so forced landing auto trigger is planned. */ + ArsdkFeatureArdrone3PilotingstateForcedlandingautotriggerReasonPropellerIcingCritical = 2, + + /** Battery is too cold, so forced landing auto trigger is planned. */ + ArsdkFeatureArdrone3PilotingstateForcedlandingautotriggerReasonBatteryTooCold = 3, + + /** Battery is too hot, so forced landing auto trigger is planned. */ + ArsdkFeatureArdrone3PilotingstateForcedlandingautotriggerReasonBatteryTooHot = 4, + }; -#define ArsdkFeatureArdrone3PilotingstateForcedlandingautotriggerReasonCnt 2 +#define ArsdkFeatureArdrone3PilotingstateForcedlandingautotriggerReasonCnt 5 /** Drone wind state */ typedef NS_ENUM(NSInteger, ArsdkFeatureArdrone3PilotingstateWindstatechangedState) { diff --git a/SdkCore.framework/Headers/ArsdkFeatureBattery.h b/SdkCore.framework/Headers/ArsdkFeatureBattery.h index 5c57611..be573ac 100644 --- a/SdkCore.framework/Headers/ArsdkFeatureBattery.h +++ b/SdkCore.framework/Headers/ArsdkFeatureBattery.h @@ -30,8 +30,11 @@ typedef NS_ENUM(NSInteger, ArsdkFeatureBatteryAlert) { /** Authentication has failed. */ ArsdkFeatureBatteryAlertAuthenticationFailure = 4, + /** Lost comm with battery. */ + ArsdkFeatureBatteryAlertLostComm = 5, + }; -#define ArsdkFeatureBatteryAlertCnt 5 +#define ArsdkFeatureBatteryAlertCnt 6 /** Alert level. */ typedef NS_ENUM(NSInteger, ArsdkFeatureBatteryAlertLevel) { @@ -139,6 +142,17 @@ NS_SWIFT_NAME(onCapacity(fullCharge:remaining:)); - (void)onCellVoltage:(NSUInteger)index cellVoltage:(NSUInteger)cellVoltage NS_SWIFT_NAME(onCellVoltage(index:cellVoltage:)); +/** + Version of the components of the battery. + + - parameter hw_revision: Battery Hardware Revision + - parameter fw_version: Battery Firmware Version + - parameter gauge_version: Battery Gauge Version + - parameter usb_version: Battery USB Version +*/ +- (void)onVersion:(NSUInteger)hwRevision fwVersion:(NSString *)fwVersion gaugeVersion:(NSString *)gaugeVersion usbVersion:(NSString *)usbVersion +NS_SWIFT_NAME(onVersion(hwRevision:fwVersion:gaugeVersion:usbVersion:)); + @end diff --git a/SdkCore.framework/Headers/ArsdkFeatureControllerInfo.h b/SdkCore.framework/Headers/ArsdkFeatureControllerInfo.h index 7116c58..d4f7338 100644 --- a/SdkCore.framework/Headers/ArsdkFeatureControllerInfo.h +++ b/SdkCore.framework/Headers/ArsdkFeatureControllerInfo.h @@ -185,5 +185,14 @@ clock) + (int (^)(struct arsdk_cmd *))gpsV2Encoder:(ArsdkFeatureControllerInfoSource)source latitude:(double)latitude longitude:(double)longitude amslAltitude:(float)amslAltitude wgs84Altitude:(float)wgs84Altitude latitudeAccuracy:(float)latitudeAccuracy longitudeAccuracy:(float)longitudeAccuracy altitudeAccuracy:(float)altitudeAccuracy northVelocity:(float)northVelocity eastVelocity:(float)eastVelocity upVelocity:(float)upVelocity velocityAccuracy:(float)velocityAccuracy numberOfSatellites:(NSUInteger)numberOfSatellites timestamp:(uint64_t)timestamp NS_SWIFT_NAME(gpsV2Encoder(source:latitude:longitude:amslAltitude:wgs84Altitude:latitudeAccuracy:longitudeAccuracy:altitudeAccuracy:northVelocity:eastVelocity:upVelocity:velocityAccuracy:numberOfSatellites:timestamp:)); +/** + SkyController Magneto temperature in Kelvin. + + - parameter temp: SkyController magnetometer temperature + - returns: a block that encodes the command +*/ ++ (int (^)(struct arsdk_cmd *))magnetoTemperatureEncoder:(float)temp +NS_SWIFT_NAME(magnetoTemperatureEncoder(temp:)); + @end diff --git a/SdkCore.framework/Headers/ArsdkFeatureFlightPlan.h b/SdkCore.framework/Headers/ArsdkFeatureFlightPlan.h index 43f9ede..acc05a7 100644 --- a/SdkCore.framework/Headers/ArsdkFeatureFlightPlan.h +++ b/SdkCore.framework/Headers/ArsdkFeatureFlightPlan.h @@ -214,5 +214,13 @@ This is the index of the mission item in the mission's items list, starting from + (int (^)(struct arsdk_cmd *))startAtV2Encoder:(NSString *)flightplanId customId:(NSString *)customId type:(ArsdkFeatureFlightPlanMavlinkType)type item:(NSUInteger)item continueOnDisconnect:(NSUInteger)continueOnDisconnect NS_SWIFT_NAME(startAtV2Encoder(flightplanId:customId:type:item:continueOnDisconnect:)); +/** + Start flightplan pre-configuration + + - returns: a block that encodes the command +*/ ++ (int (^)(struct arsdk_cmd *))preConfigEncoder +NS_SWIFT_NAME(preConfigEncoder()); + @end diff --git a/SdkCore.framework/Headers/ArsdkFeatureRth.h b/SdkCore.framework/Headers/ArsdkFeatureRth.h index e8a2953..75e0c24 100644 --- a/SdkCore.framework/Headers/ArsdkFeatureRth.h +++ b/SdkCore.framework/Headers/ArsdkFeatureRth.h @@ -104,8 +104,11 @@ typedef NS_ENUM(NSInteger, ArsdkFeatureRthStateReason) { /** Return to home triggered by propeller icing event (available->in_progress) */ ArsdkFeatureRthStateReasonIcing = 9, + /** Return to home triggered by battery lost comm event (available->in_progress) */ + ArsdkFeatureRthStateReasonBatteryLostComm = 10, + }; -#define ArsdkFeatureRthStateReasonCnt 10 +#define ArsdkFeatureRthStateReasonCnt 11 /** Home reachability */ typedef NS_ENUM(NSInteger, ArsdkFeatureRthHomeReachability) { diff --git a/SdkCore.framework/Headers/ArsdkFeatures.h b/SdkCore.framework/Headers/ArsdkFeatures.h index 5726fc1..ea3da5c 100644 --- a/SdkCore.framework/Headers/ArsdkFeatures.h +++ b/SdkCore.framework/Headers/ArsdkFeatures.h @@ -1,153 +1,153 @@ /** Generated, do not edit ! */ -#include "ArsdkFeatureCommonNetwork.h" -#include "ArsdkFeatureCommonNetworkevent.h" -#include "ArsdkFeatureCommonSettings.h" -#include "ArsdkFeatureCommonSettingsstate.h" -#include "ArsdkFeatureCommonCommon.h" -#include "ArsdkFeatureCommonCommonstate.h" -#include "ArsdkFeatureCommonOverheat.h" -#include "ArsdkFeatureCommonOverheatstate.h" -#include "ArsdkFeatureCommonController.h" -#include "ArsdkFeatureCommonWifisettings.h" -#include "ArsdkFeatureCommonWifisettingsstate.h" -#include "ArsdkFeatureCommonMavlink.h" -#include "ArsdkFeatureCommonMavlinkstate.h" -#include "ArsdkFeatureCommonCalibration.h" -#include "ArsdkFeatureCommonCalibrationstate.h" -#include "ArsdkFeatureCommonCamerasettingsstate.h" -#include "ArsdkFeatureCommonGps.h" -#include "ArsdkFeatureCommonFlightplanstate.h" -#include "ArsdkFeatureCommonArlibsversionsstate.h" -#include "ArsdkFeatureCommonFlightplanevent.h" -#include "ArsdkFeatureCommonAudio.h" -#include "ArsdkFeatureCommonAudiostate.h" -#include "ArsdkFeatureCommonHeadlights.h" -#include "ArsdkFeatureCommonHeadlightsstate.h" -#include "ArsdkFeatureCommonAnimations.h" -#include "ArsdkFeatureCommonAnimationsstate.h" -#include "ArsdkFeatureCommonAccessory.h" -#include "ArsdkFeatureCommonAccessorystate.h" -#include "ArsdkFeatureCommonCharger.h" -#include "ArsdkFeatureCommonChargerstate.h" -#include "ArsdkFeatureCommonRunstate.h" -#include "ArsdkFeatureCommonFactory.h" -#include "ArsdkFeatureCommonFlightplansettings.h" -#include "ArsdkFeatureCommonFlightplansettingsstate.h" -#include "ArsdkFeatureCommonUpdatestate.h" -#include "ArsdkFeatureArdrone3Piloting.h" -#include "ArsdkFeatureArdrone3Camera.h" -#include "ArsdkFeatureArdrone3Pilotingsettings.h" -#include "ArsdkFeatureArdrone3Mediarecordevent.h" -#include "ArsdkFeatureArdrone3Pilotingstate.h" -#include "ArsdkFeatureArdrone3Animations.h" -#include "ArsdkFeatureArdrone3Pilotingsettingsstate.h" -#include "ArsdkFeatureArdrone3Mediarecord.h" -#include "ArsdkFeatureArdrone3Mediarecordstate.h" -#include "ArsdkFeatureArdrone3Networksettings.h" -#include "ArsdkFeatureArdrone3Networksettingsstate.h" -#include "ArsdkFeatureArdrone3Speedsettings.h" -#include "ArsdkFeatureArdrone3Speedsettingsstate.h" -#include "ArsdkFeatureArdrone3Network.h" -#include "ArsdkFeatureArdrone3Networkstate.h" -#include "ArsdkFeatureArdrone3Settingsstate.h" -#include "ArsdkFeatureArdrone3Picturesettings.h" -#include "ArsdkFeatureArdrone3Picturesettingsstate.h" -#include "ArsdkFeatureArdrone3Mediastreaming.h" -#include "ArsdkFeatureArdrone3Mediastreamingstate.h" -#include "ArsdkFeatureArdrone3Gpssettings.h" -#include "ArsdkFeatureArdrone3Gpssettingsstate.h" -#include "ArsdkFeatureArdrone3Camerastate.h" -#include "ArsdkFeatureArdrone3Antiflickering.h" -#include "ArsdkFeatureArdrone3Antiflickeringstate.h" -#include "ArsdkFeatureArdrone3Gpsstate.h" -#include "ArsdkFeatureArdrone3Prostate.h" -#include "ArsdkFeatureArdrone3Accessorystate.h" -#include "ArsdkFeatureArdrone3Pilotingevent.h" -#include "ArsdkFeatureArdrone3Sound.h" -#include "ArsdkFeatureArdrone3Soundstate.h" -#include "ArsdkFeatureSkyctrlWifistate.h" -#include "ArsdkFeatureSkyctrlWifi.h" -#include "ArsdkFeatureSkyctrlDevice.h" -#include "ArsdkFeatureSkyctrlDevicestate.h" -#include "ArsdkFeatureSkyctrlSettings.h" -#include "ArsdkFeatureSkyctrlSettingsstate.h" -#include "ArsdkFeatureSkyctrlCommon.h" -#include "ArsdkFeatureSkyctrlCommonstate.h" -#include "ArsdkFeatureSkyctrlSkycontrollerstate.h" -#include "ArsdkFeatureSkyctrlAccesspointsettings.h" -#include "ArsdkFeatureSkyctrlAccesspointsettingsstate.h" -#include "ArsdkFeatureSkyctrlCamera.h" -#include "ArsdkFeatureSkyctrlButtonmappings.h" -#include "ArsdkFeatureSkyctrlButtonmappingsstate.h" -#include "ArsdkFeatureSkyctrlAxismappings.h" -#include "ArsdkFeatureSkyctrlAxismappingsstate.h" -#include "ArsdkFeatureSkyctrlAxisfilters.h" -#include "ArsdkFeatureSkyctrlAxisfiltersstate.h" -#include "ArsdkFeatureSkyctrlGamepadinfos.h" -#include "ArsdkFeatureSkyctrlGamepadinfosstate.h" -#include "ArsdkFeatureSkyctrlCopiloting.h" -#include "ArsdkFeatureSkyctrlCopilotingstate.h" -#include "ArsdkFeatureSkyctrlCalibration.h" -#include "ArsdkFeatureSkyctrlCalibrationstate.h" -#include "ArsdkFeatureSkyctrlButtonevents.h" -#include "ArsdkFeatureSkyctrlFactory.h" -#include "ArsdkFeatureSkyctrlCommoneventstate.h" -#include "ArsdkFeaturePowerupPiloting.h" -#include "ArsdkFeaturePowerupPilotingstate.h" -#include "ArsdkFeaturePowerupPilotingsettings.h" -#include "ArsdkFeaturePowerupPilotingsettingsstate.h" -#include "ArsdkFeaturePowerupMediarecord.h" -#include "ArsdkFeaturePowerupMediarecordstate.h" -#include "ArsdkFeaturePowerupMediarecordevent.h" -#include "ArsdkFeaturePowerupNetworksettings.h" -#include "ArsdkFeaturePowerupNetworksettingsstate.h" -#include "ArsdkFeaturePowerupNetwork.h" -#include "ArsdkFeaturePowerupNetworkstate.h" -#include "ArsdkFeaturePowerupMediastreaming.h" -#include "ArsdkFeaturePowerupMediastreamingstate.h" -#include "ArsdkFeaturePowerupVideosettings.h" -#include "ArsdkFeaturePowerupVideosettingsstate.h" -#include "ArsdkFeaturePowerupSounds.h" -#include "ArsdkFeaturePowerupSoundsstate.h" -#include "ArsdkFeatureGeneric.h" -#include "ArsdkFeatureFollowMe.h" -#include "ArsdkFeatureWifi.h" -#include "ArsdkFeatureRc.h" -#include "ArsdkFeatureDroneManager.h" -#include "ArsdkFeatureMapper.h" -#include "ArsdkFeatureDebug.h" -#include "ArsdkFeatureControllerInfo.h" -#include "ArsdkFeatureMapperMini.h" -#include "ArsdkFeatureThermalCam.h" -#include "ArsdkFeatureCamera.h" -#include "ArsdkFeatureAnimation.h" -#include "ArsdkFeatureUserStorage.h" -#include "ArsdkFeatureRth.h" -#include "ArsdkFeatureSequoiaCam.h" -#include "ArsdkFeatureGimbal.h" -#include "ArsdkFeatureBattery.h" -#include "ArsdkFeatureMediastore.h" -#include "ArsdkFeaturePreciseHome.h" -#include "ArsdkFeatureThermal.h" -#include "ArsdkFeatureLeds.h" -#include "ArsdkFeaturePilotingStyle.h" -#include "ArsdkFeatureRcTransport.h" -#include "ArsdkFeatureOnboardTracker.h" -#include "ArsdkFeatureStereoVisionSensor.h" -#include "ArsdkFeatureGaugeFwUpdater.h" -#include "ArsdkFeatureHandLand.h" -#include "ArsdkFeatureAutoLookAt.h" -#include "ArsdkFeatureDri.h" -#include "ArsdkFeatureMission.h" -#include "ArsdkFeatureUserStorageV2.h" -#include "ArsdkFeatureFlightPlan.h" -#include "ArsdkFeaturePoi.h" -#include "ArsdkFeatureSecurityEdition.h" -#include "ArsdkFeatureMove.h" -#include "ArsdkFeatureCellular.h" -#include "ArsdkFeatureObstacleAvoidance.h" -#include "ArsdkFeatureMotors.h" -#include "ArsdkFeatureFcr.h" -#include "ArsdkFeatureAlarms.h" -#include "ArsdkFeatureTerrain.h" +#import "ArsdkFeatureCommonNetwork.h" +#import "ArsdkFeatureCommonNetworkevent.h" +#import "ArsdkFeatureCommonSettings.h" +#import "ArsdkFeatureCommonSettingsstate.h" +#import "ArsdkFeatureCommonCommon.h" +#import "ArsdkFeatureCommonCommonstate.h" +#import "ArsdkFeatureCommonOverheat.h" +#import "ArsdkFeatureCommonOverheatstate.h" +#import "ArsdkFeatureCommonController.h" +#import "ArsdkFeatureCommonWifisettings.h" +#import "ArsdkFeatureCommonWifisettingsstate.h" +#import "ArsdkFeatureCommonMavlink.h" +#import "ArsdkFeatureCommonMavlinkstate.h" +#import "ArsdkFeatureCommonCalibration.h" +#import "ArsdkFeatureCommonCalibrationstate.h" +#import "ArsdkFeatureCommonCamerasettingsstate.h" +#import "ArsdkFeatureCommonGps.h" +#import "ArsdkFeatureCommonFlightplanstate.h" +#import "ArsdkFeatureCommonArlibsversionsstate.h" +#import "ArsdkFeatureCommonFlightplanevent.h" +#import "ArsdkFeatureCommonAudio.h" +#import "ArsdkFeatureCommonAudiostate.h" +#import "ArsdkFeatureCommonHeadlights.h" +#import "ArsdkFeatureCommonHeadlightsstate.h" +#import "ArsdkFeatureCommonAnimations.h" +#import "ArsdkFeatureCommonAnimationsstate.h" +#import "ArsdkFeatureCommonAccessory.h" +#import "ArsdkFeatureCommonAccessorystate.h" +#import "ArsdkFeatureCommonCharger.h" +#import "ArsdkFeatureCommonChargerstate.h" +#import "ArsdkFeatureCommonRunstate.h" +#import "ArsdkFeatureCommonFactory.h" +#import "ArsdkFeatureCommonFlightplansettings.h" +#import "ArsdkFeatureCommonFlightplansettingsstate.h" +#import "ArsdkFeatureCommonUpdatestate.h" +#import "ArsdkFeatureArdrone3Piloting.h" +#import "ArsdkFeatureArdrone3Camera.h" +#import "ArsdkFeatureArdrone3Pilotingsettings.h" +#import "ArsdkFeatureArdrone3Mediarecordevent.h" +#import "ArsdkFeatureArdrone3Pilotingstate.h" +#import "ArsdkFeatureArdrone3Animations.h" +#import "ArsdkFeatureArdrone3Pilotingsettingsstate.h" +#import "ArsdkFeatureArdrone3Mediarecord.h" +#import "ArsdkFeatureArdrone3Mediarecordstate.h" +#import "ArsdkFeatureArdrone3Networksettings.h" +#import "ArsdkFeatureArdrone3Networksettingsstate.h" +#import "ArsdkFeatureArdrone3Speedsettings.h" +#import "ArsdkFeatureArdrone3Speedsettingsstate.h" +#import "ArsdkFeatureArdrone3Network.h" +#import "ArsdkFeatureArdrone3Networkstate.h" +#import "ArsdkFeatureArdrone3Settingsstate.h" +#import "ArsdkFeatureArdrone3Picturesettings.h" +#import "ArsdkFeatureArdrone3Picturesettingsstate.h" +#import "ArsdkFeatureArdrone3Mediastreaming.h" +#import "ArsdkFeatureArdrone3Mediastreamingstate.h" +#import "ArsdkFeatureArdrone3Gpssettings.h" +#import "ArsdkFeatureArdrone3Gpssettingsstate.h" +#import "ArsdkFeatureArdrone3Camerastate.h" +#import "ArsdkFeatureArdrone3Antiflickering.h" +#import "ArsdkFeatureArdrone3Antiflickeringstate.h" +#import "ArsdkFeatureArdrone3Gpsstate.h" +#import "ArsdkFeatureArdrone3Prostate.h" +#import "ArsdkFeatureArdrone3Accessorystate.h" +#import "ArsdkFeatureArdrone3Pilotingevent.h" +#import "ArsdkFeatureArdrone3Sound.h" +#import "ArsdkFeatureArdrone3Soundstate.h" +#import "ArsdkFeatureSkyctrlWifistate.h" +#import "ArsdkFeatureSkyctrlWifi.h" +#import "ArsdkFeatureSkyctrlDevice.h" +#import "ArsdkFeatureSkyctrlDevicestate.h" +#import "ArsdkFeatureSkyctrlSettings.h" +#import "ArsdkFeatureSkyctrlSettingsstate.h" +#import "ArsdkFeatureSkyctrlCommon.h" +#import "ArsdkFeatureSkyctrlCommonstate.h" +#import "ArsdkFeatureSkyctrlSkycontrollerstate.h" +#import "ArsdkFeatureSkyctrlAccesspointsettings.h" +#import "ArsdkFeatureSkyctrlAccesspointsettingsstate.h" +#import "ArsdkFeatureSkyctrlCamera.h" +#import "ArsdkFeatureSkyctrlButtonmappings.h" +#import "ArsdkFeatureSkyctrlButtonmappingsstate.h" +#import "ArsdkFeatureSkyctrlAxismappings.h" +#import "ArsdkFeatureSkyctrlAxismappingsstate.h" +#import "ArsdkFeatureSkyctrlAxisfilters.h" +#import "ArsdkFeatureSkyctrlAxisfiltersstate.h" +#import "ArsdkFeatureSkyctrlGamepadinfos.h" +#import "ArsdkFeatureSkyctrlGamepadinfosstate.h" +#import "ArsdkFeatureSkyctrlCopiloting.h" +#import "ArsdkFeatureSkyctrlCopilotingstate.h" +#import "ArsdkFeatureSkyctrlCalibration.h" +#import "ArsdkFeatureSkyctrlCalibrationstate.h" +#import "ArsdkFeatureSkyctrlButtonevents.h" +#import "ArsdkFeatureSkyctrlFactory.h" +#import "ArsdkFeatureSkyctrlCommoneventstate.h" +#import "ArsdkFeaturePowerupPiloting.h" +#import "ArsdkFeaturePowerupPilotingstate.h" +#import "ArsdkFeaturePowerupPilotingsettings.h" +#import "ArsdkFeaturePowerupPilotingsettingsstate.h" +#import "ArsdkFeaturePowerupMediarecord.h" +#import "ArsdkFeaturePowerupMediarecordstate.h" +#import "ArsdkFeaturePowerupMediarecordevent.h" +#import "ArsdkFeaturePowerupNetworksettings.h" +#import "ArsdkFeaturePowerupNetworksettingsstate.h" +#import "ArsdkFeaturePowerupNetwork.h" +#import "ArsdkFeaturePowerupNetworkstate.h" +#import "ArsdkFeaturePowerupMediastreaming.h" +#import "ArsdkFeaturePowerupMediastreamingstate.h" +#import "ArsdkFeaturePowerupVideosettings.h" +#import "ArsdkFeaturePowerupVideosettingsstate.h" +#import "ArsdkFeaturePowerupSounds.h" +#import "ArsdkFeaturePowerupSoundsstate.h" +#import "ArsdkFeatureGeneric.h" +#import "ArsdkFeatureFollowMe.h" +#import "ArsdkFeatureWifi.h" +#import "ArsdkFeatureRc.h" +#import "ArsdkFeatureDroneManager.h" +#import "ArsdkFeatureMapper.h" +#import "ArsdkFeatureDebug.h" +#import "ArsdkFeatureControllerInfo.h" +#import "ArsdkFeatureMapperMini.h" +#import "ArsdkFeatureThermalCam.h" +#import "ArsdkFeatureCamera.h" +#import "ArsdkFeatureAnimation.h" +#import "ArsdkFeatureUserStorage.h" +#import "ArsdkFeatureRth.h" +#import "ArsdkFeatureSequoiaCam.h" +#import "ArsdkFeatureGimbal.h" +#import "ArsdkFeatureBattery.h" +#import "ArsdkFeatureMediastore.h" +#import "ArsdkFeaturePreciseHome.h" +#import "ArsdkFeatureThermal.h" +#import "ArsdkFeatureLeds.h" +#import "ArsdkFeaturePilotingStyle.h" +#import "ArsdkFeatureRcTransport.h" +#import "ArsdkFeatureOnboardTracker.h" +#import "ArsdkFeatureStereoVisionSensor.h" +#import "ArsdkFeatureGaugeFwUpdater.h" +#import "ArsdkFeatureHandLand.h" +#import "ArsdkFeatureAutoLookAt.h" +#import "ArsdkFeatureDri.h" +#import "ArsdkFeatureMission.h" +#import "ArsdkFeatureUserStorageV2.h" +#import "ArsdkFeatureFlightPlan.h" +#import "ArsdkFeaturePoi.h" +#import "ArsdkFeatureSecurityEdition.h" +#import "ArsdkFeatureMove.h" +#import "ArsdkFeatureCellular.h" +#import "ArsdkFeatureObstacleAvoidance.h" +#import "ArsdkFeatureMotors.h" +#import "ArsdkFeatureFcr.h" +#import "ArsdkFeatureAlarms.h" +#import "ArsdkFeatureTerrain.h" diff --git a/SdkCore.framework/Headers/Logger.h b/SdkCore.framework/Headers/Logger.h index be484fa..c09171f 100644 --- a/SdkCore.framework/Headers/Logger.h +++ b/SdkCore.framework/Headers/Logger.h @@ -76,6 +76,9 @@ typedef NS_ENUM(NSInteger, Level) { /** Common logger based on ulog, using. */ @interface ULog : NSObject +/** Tag used to log commands as text. */ +@property (class, nonatomic, readonly, nonnull) ULogTag *cmdTag; + /** Enables redirecting log messages to binary file `.bin` recorder. diff --git a/SdkCore.framework/Headers/PompLoopUtil.h b/SdkCore.framework/Headers/PompLoopUtil.h index 5df35f8..d0cf4df 100644 --- a/SdkCore.framework/Headers/PompLoopUtil.h +++ b/SdkCore.framework/Headers/PompLoopUtil.h @@ -70,6 +70,6 @@ The caller must be in the same thread as the one used during the init /** Retrieves the internal pomp loop */ -@property (nonatomic, readonly, nonnull) struct pomp_loop *internalPompLoop; +@property (nonatomic, readonly, nonnull) struct pomp_loop *internalPompLoop NS_RETURNS_INNER_POINTER; @end diff --git a/SdkCore.framework/Headers/SdkCore.h b/SdkCore.framework/Headers/SdkCore.h index a3b8b29..508dbf2 100644 --- a/SdkCore.framework/Headers/SdkCore.h +++ b/SdkCore.framework/Headers/SdkCore.h @@ -7,7 +7,7 @@ FOUNDATION_EXPORT double SdkCoreVersionNumber; FOUNDATION_EXPORT const unsigned char SdkCoreVersionString[]; // Import components -#include "Arsdk.h" +#import "Arsdk.h" // Mavlink #pragma clang diagnostic push diff --git a/SdkCore.framework/Headers/SdkCoreFrame.h b/SdkCore.framework/Headers/SdkCoreFrame.h index e1847db..e8492ed 100644 --- a/SdkCore.framework/Headers/SdkCoreFrame.h +++ b/SdkCore.framework/Headers/SdkCoreFrame.h @@ -32,21 +32,6 @@ #import #import -/* Position in frame */ -struct vmeta_position_in_frame { - /* Horizontal coordinate in the image, in range [0, 1] */ - CGFloat x; - - /* Vertical coordinate in the image, in range [0, 1] */ - CGFloat y; - - /* Distance between the drone and the location in meters */ - CGFloat distance; - - /* Horizontal distance between the drone and the location in meters */ - CGFloat horizontal_distance; -}; - /** Video frame. */ @interface SdkCoreFrame: NSObject @@ -63,25 +48,6 @@ struct vmeta_position_in_frame { @param src: pointer to frame to copy, (struct mbuf_raw_video_frame *) */ -- (nullable instancetype)initWithCopy:(nonnull void *)src; - -/** Position from location. - - @param location: the location - @return the position in the frame, all values will be 0 if an error occurred and the point can not be - retrieved. - */ -- (struct vmeta_position_in_frame)positionFromLocation:(nonnull CLLocation *)location; - -/** Location from position. - - @param position: new position in frame - @param currentLocation: current location in frame - @param considerFlatGround: `YES` if flat ground hypothesis is used to compute the new location. - @return the new location or `nil` if an error occured and the location could not be retrieved. - */ -- (nullable CLLocation *)locationFromPosition:(CGPoint)position - forLocation:(nonnull CLLocation *)currentLocation - considerFlatGround:(BOOL)flatGround; +- (nullable instancetype)initWithFrame:(nonnull void *)src; @end diff --git a/SdkCore.framework/Headers/SdkCoreLic.h b/SdkCore.framework/Headers/SdkCoreLic.h new file mode 100644 index 0000000..7021507 --- /dev/null +++ b/SdkCore.framework/Headers/SdkCoreLic.h @@ -0,0 +1,94 @@ +// Copyright (C) 2022 Parrot Drones SAS +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in +// the documentation and/or other materials provided with the +// distribution. +// * Neither the name of the Parrot Company nor the names +// of its contributors may be used to endorse or promote products +// derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// PARROT COMPANY BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +// SUCH DAMAGE. + +#import +#import "ArsdkCore.h" +#import +#import + +/** Position in frame */ +@interface LicPosition: NSObject + +/** Horizontal coordinate in the image, in range [0, 1] */ +@property(nonatomic, readonly) CGFloat x; + +/** Vertical coordinate in the image, in range [0, 1] */ +@property(nonatomic, readonly) CGFloat y; + +/** Distance between the drone and the location in meters */ +@property(nonatomic, readonly) CGFloat distance; + +/** Horizontal distance between the drone and the location in meters */ +@property(nonatomic, readonly) CGFloat horizontalDistance; + +@end + +/** Location from image coordinates context. */ +@interface SdkCoreLic: NSObject + +/** Updates frame info. + + @param mediaInfoHandle: media info handle + @param metadata: frame metadata Handle + */ +- (void)updateMediaInfo:(nullable const void *)mediaInfoHandle metadata:(nullable const void *)metadataHandle +NS_SWIFT_NAME(update(mediaInfo:metadata:)); + +/** Position from location. + + @param location: the location + @return the position in the frame or `nil` if an error occured and the position could not be retrieved. + */ +- (nullable LicPosition *)positionFromLocation:(nonnull CLLocation *)location; + +/** Location from position. + + @param position: new position in frame + @param currentLocation: current location in frame + @return the new location or `nil` if an error occured and the location could not be retrieved. + */ +- (nullable CLLocation *)locationFromPosition:(CGPoint)position forLocation:(nonnull CLLocation *)currentLocation; + + +/** Location from position with a fixed altitude. + + @param position: new position in frame + @param altitude: altitude to apply + @return the new location or `nil` if an error occured and the location could not be retrieved. + */ +- (nullable CLLocation *)locationFromPosition:(CGPoint)position forAltitude: (float)altitude; + +/** Location from position with a fixed distance. + + @param position: new position in frame + @param distance: new location distance + @return the new location or `nil` if an error occured and the location could not be retrieved. + */ +- (nullable CLLocation *)locationFromPosition:(CGPoint)position forDistance: (float)distance; +@end diff --git a/SdkCore.framework/Headers/SdkCoreRenderer.h b/SdkCore.framework/Headers/SdkCoreRenderer.h index b5d4dd4..45bf1a8 100644 --- a/SdkCore.framework/Headers/SdkCoreRenderer.h +++ b/SdkCore.framework/Headers/SdkCoreRenderer.h @@ -145,7 +145,7 @@ typedef NS_ENUM(NSInteger, SdkCoreStreamRenderingFillMode) { @property (nonatomic, readonly, nonnull) const void *mediaInfoHandle; /** Frame metadata handle; pointer to const struct vmeta_frame. */ -@property (nonatomic, readonly, nullable) const void * frameMetadataHandle; +@property (nonatomic, readonly, nullable) const void *frameMetadataHandle; /** Histogram. */ @property (nonatomic, strong, readonly, nonnull) SdkCoreHistogram *histogram; diff --git a/SdkCore.framework/SdkCore b/SdkCore.framework/SdkCore index d95a9b0..276465b 100755 Binary files a/SdkCore.framework/SdkCore and b/SdkCore.framework/SdkCore differ diff --git a/SdkCore.framework/cmd-res.tar.gz b/SdkCore.framework/cmd-res.tar.gz new file mode 100644 index 0000000..a8fe239 Binary files /dev/null and b/SdkCore.framework/cmd-res.tar.gz differ diff --git a/SdkCore.podspec b/SdkCore.podspec index 5f08e8e..10450e9 100644 --- a/SdkCore.podspec +++ b/SdkCore.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| s.name = "SdkCore" - s.version = "7.3.0" + s.version = "7.4.0" s.summary = "Parrot Drone SDK, low level implementation" s.homepage = "https://developer.parrot.com" s.license = "{ :type => 'BSD 3-Clause License', :file => 'LICENSE' }" s.author = "Parrot Drone SAS" - s.source = { :git => 'https://github.com/Parrot-Developers/pod_sdkcore.git', :tag => "7.3.0" } + s.source = { :git => 'https://github.com/Parrot-Developers/pod_sdkcore.git', :tag => "7.4.0" } s.platform = :ios s.ios.deployment_target = '12.0' s.vendored_frameworks = 'SdkCore.framework'