tangchao0503/Payload-SDK
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

NEW: release DJI Payload-SDK version 3.5

Browse Source 
Signed-off-by: DJI-Martin <DJI-Martin@dji.com>
This commit is contained in:
DJI-Martin
2023-05-18 21:30:44 +08:00
parent cae3123cda
commit caa15133cd
81 changed files with 558 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
psdk_lib/include/dji_camera_manager.h
View File

@ -442,6 +442,12 @@ typedef enum {
DJI_CAMERA_MANAGER_RECORDING_CONTROL_RESUME = 3,
} E_DjiCameraManagerRecordingControl;
typedef enum {
DJI_CAMERA_MANAGER_FILE_LIST_COUNT_60_PER_SLICE = 60,
DJI_CAMERA_MANAGER_FILE_LIST_COUNT_120_PER_SLICE = 120,
DJI_CAMERA_MANAGER_FILE_LIST_COUNT_ALL_PER_SLICE = 0xFFFF,
} E_DjiCameraManagerFileListCountPerSlice;
typedef struct {
uint8_t firmware_version[4];
} T_DjiCameraManagerFirmwareVersion;
@ -500,6 +506,11 @@ typedef struct {
T_DjiCameraManagerFileListInfo *fileListInfo;
} T_DjiCameraManagerFileList;
typedef struct {
uint16_t sliceStartIndex;
E_DjiCameraManagerFileListCountPerSlice countPerSlice;
} T_DjiCameraManagerSliceConfig;
typedef enum {
DJI_DOWNLOAD_FILE_EVENT_START,
DJI_DOWNLOAD_FILE_EVENT_TRANSFER,
@ -1011,6 +1022,18 @@ T_DjiReturnCode DjiCameraManager_StopRecordVideo(E_DjiMountPosition position);
*/
T_DjiReturnCode DjiCameraManager_DownloadFileList(E_DjiMountPosition position, T_DjiCameraManagerFileList *fileList);
/**
* @brief Download selected camera media file list by slices.
* @note The interface is a synchronous interface, which occupies more CPU resources when using it.
* If the download file fails, the timeout time is 3S.
* @param position: the mount position of the camera
* @param sliceConfig: the slices config for downloading file list
* @param fileList: the pointer to the downloaded camera file list
* @return Execution result.
*/
T_DjiReturnCode DjiCameraManager_DownloadFileListBySlices(E_DjiMountPosition position,
T_DjiCameraManagerSliceConfig sliceConfig,
T_DjiCameraManagerFileList *fileList);
/**
* @brief Regsiter selected camera download file data callback,
* @param position: the mount position of the camera

16
psdk_lib/include/dji_fc_subscription.h
View File

@ -361,8 +361,8 @@ typedef enum {
DJI_FC_SUBSCRIPTION_TOPIC_STATUS_MOTOR_START_ERROR = DJI_DATA_SUBSCRIPTION_TOPIC(DJI_DATA_SUBSCRIPTION_MODULE_FC,
31),
/*!
* @brief Battery information topic name. Please refer to ::T_DjiFcSubscriptionBatteryInfo for information about data structure.
* @datastruct \ref T_DjiFcSubscriptionBatteryInfo
* @brief Battery information topic name. Please refer to ::T_DjiFcSubscriptionWholeBatteryInfo for information about data structure.
* @datastruct \ref T_DjiFcSubscriptionWholeBatteryInfo
*/
DJI_FC_SUBSCRIPTION_TOPIC_BATTERY_INFO = DJI_DATA_SUBSCRIPTION_TOPIC(DJI_DATA_SUBSCRIPTION_MODULE_FC, 32),
/*!
@ -977,13 +977,13 @@ typedef struct BatteryWholeInfo {
typedef struct BatterySingleInfo {
uint8_t reserve;
uint8_t batteryIndex;
int32_t currentVoltage; /*!< uint:mV. */
int32_t currentElectric; /*!< uint:mA. */
uint32_t fullCapacity; /*!< uint:mAh. */
uint32_t remainedCapacity; /*!< uint:mAh. */
int16_t batteryTemperature; /*!< uint:℃. */
int32_t currentVoltage; /*!< uint: mV. */
int32_t currentElectric; /*!< uint: mA. */
uint32_t fullCapacity; /*!< uint: mAh. */
uint32_t remainedCapacity; /*!< uint: mAh. */
int16_t batteryTemperature; /*!< uint: 0.1℃. */
uint8_t cellCount;
uint8_t batteryCapacityPercent; /*!< uint:%. */
uint8_t batteryCapacityPercent; /*!< uint: %. */
T_DjiFcSubscriptionSingleBatteryState batteryState;
uint8_t reserve1;
uint8_t reserve2;

1
psdk_lib/include/dji_flight_controller.h
View File

@ -76,7 +76,6 @@ typedef enum {
*/
typedef enum {
DJI_FLIGHT_CONTROLLER_ENABLE_EMERGENCY_STOP_MOTOR = 0x01, /*!< Execute emergency-stop-motor action */
DJI_FLIGHT_CONTROLLER_DISABLE_EMERGENCY_STOP_MOTOR = 0x02 /*!< Cancel emergency-stop-motor status */
} E_DjiFlightControllerEmergencyStopMotor;
/**

7
psdk_lib/include/dji_platform.h
View File

@ -89,11 +89,14 @@ typedef enum {
* Baud rate support list on M300 RTK Extension Port: 115200, 230400, 460800, 921600, 1000000.
* Baud rate support list on M30/M30T: 115200, 230400, 460800, 921600, 1000000.
* Baud rate support list on M3E/M3T: 921600.
* Baud rate support list on M350 RTK Payload Port: 115200, 230400, 460800, 921600.
* Baud rate support list on M350 RTK Extension Port: 115200, 230400, 460800, 921600, 1000000.
* */
DJI_HAL_UART_NUM_0,
/**
* Only support on M300 RTK Extension Port by USB virtual serial port, such as /dev/ttyACM0.
* Only support on M300/M350 RTK Extension Port by USB virtual serial port, such as /dev/ttyACM0.
* Baud rate support list on M300 RTK Extension Port: 921600.
* Baud rate support list on M350 RTK Extension Port: 921600.
* */
DJI_HAL_UART_NUM_1,
} E_DjiHalUartNum;
@ -221,6 +224,8 @@ typedef struct {
T_DjiReturnCode (*GetTimeUs)(uint64_t *us);
T_DjiReturnCode (*GetRandomNum)(uint16_t *randomNum);
void *(*Malloc)(uint32_t size);
void (*Free)(void *ptr);

6
psdk_lib/include/dji_power_management.h
View File

@ -71,6 +71,12 @@ typedef T_DjiReturnCode (*DjiPowerOffNotificationCallback)(bool *powerOffPrepara
*/
T_DjiReturnCode DjiPowerManagement_Init(void);
/**
* @brief DeInitialise power management module, and user should call this function before using power management features.
* @return Execution result.
*/
T_DjiReturnCode DjiPowerManagement_DeInit(void);
/**
* @brief Apply high power from aircraft in blocking mode.
* @details Before applying, user should register callback function used to set level state of high power application

4
psdk_lib/include/dji_typedef.h
View File

@ -83,7 +83,7 @@ typedef enum {
DJI_MOUNT_POSITION_PAYLOAD_PORT_NO1 = 1,
DJI_MOUNT_POSITION_PAYLOAD_PORT_NO2 = 2,
DJI_MOUNT_POSITION_PAYLOAD_PORT_NO3 = 3,
DJI_MOUNT_POSITION_EXTENSION_PORT = 4
DJI_MOUNT_POSITION_EXTENSION_PORT = 4,
} E_DjiMountPosition;
typedef enum {
@ -92,6 +92,7 @@ typedef enum {
DJI_AIRCRAFT_SERIES_M300 = 2,
DJI_AIRCRAFT_SERIES_M30 = 3,
DJI_AIRCRAFT_SERIES_M3 = 4,
DJI_AIRCRAFT_SERIES_M350 = 5,
} E_DjiAircraftSeries;
typedef enum {
@ -104,6 +105,7 @@ typedef enum {
DJI_AIRCRAFT_TYPE_M30T = 68, /*!< Aircraft type is Matrice 30T. */
DJI_AIRCRAFT_TYPE_M3E = 77, /*!< Aircraft type is Mavic 3E. */
DJI_AIRCRAFT_TYPE_M3T = 79, /*!< Aircraft type is Mavic 3T. */
DJI_AIRCRAFT_TYPE_M350_RTK = 89, /*!< Aircraft type is Matrice 350 RTK. */
} E_DjiAircraftType;
/**

4
psdk_lib/include/dji_version.h
View File

@ -34,10 +34,10 @@ extern "C" {
/* Exported constants --------------------------------------------------------*/
#define DJI_VERSION_MAJOR 3 /*!< DJI SDK major version num, when have incompatible API changes. Range from 0 to 99. */
#define DJI_VERSION_MINOR 4 /*!< DJI SDK minor version num, when add functionality in a backwards compatible manner changes. Range from 0 to 99. */
#define DJI_VERSION_MINOR 5 /*!< DJI SDK minor version num, when add functionality in a backwards compatible manner changes. Range from 0 to 99. */
#define DJI_VERSION_MODIFY 0 /*!< DJI SDK modify version num, when have backwards compatible bug fixes changes. Range from 0 to 99. */
#define DJI_VERSION_BETA 0 /*!< DJI SDK version beta info, release version will be 0, when beta version release changes. Range from 0 to 255. */
#define DJI_VERSION_BUILD 1749 /*!< DJI SDK version build info, when jenkins trigger build changes. Range from 0 to 65535. */
#define DJI_VERSION_BUILD 1764 /*!< DJI SDK version build info, when jenkins trigger build changes. Range from 0 to 65535. */
/* Exported types ------------------------------------------------------------*/