Skip to content

Commit

Permalink
GroundSdk release 7.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jenkins.onyxia committed Oct 7, 2022
1 parent 8885161 commit 56be562
Show file tree
Hide file tree
Showing 19 changed files with 344 additions and 250 deletions.
75 changes: 38 additions & 37 deletions SdkCore.framework/Headers/Arsdk.h
Original file line number Diff line number Diff line change
@@ -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 */
2 changes: 1 addition & 1 deletion SdkCore.framework/Headers/ArsdkBackendController.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 1 addition & 17 deletions SdkCore.framework/Headers/ArsdkCore.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,30 +76,14 @@ 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.
*/
@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
Expand Down
5 changes: 4 additions & 1 deletion SdkCore.framework/Headers/ArsdkFeatureAlarms.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
11 changes: 10 additions & 1 deletion SdkCore.framework/Headers/ArsdkFeatureArdrone3Pilotingstate.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
16 changes: 15 additions & 1 deletion SdkCore.framework/Headers/ArsdkFeatureBattery.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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

Expand Down
9 changes: 9 additions & 0 deletions SdkCore.framework/Headers/ArsdkFeatureControllerInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

8 changes: 8 additions & 0 deletions SdkCore.framework/Headers/ArsdkFeatureFlightPlan.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

5 changes: 4 additions & 1 deletion SdkCore.framework/Headers/ArsdkFeatureRth.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading

0 comments on commit 56be562

Please sign in to comment.