Skip to content

Commit 787cccf

Browse files
authored
Merge pull request #250 from dji-sdk/release/v3.11.0
NEW: release DJI Payload-SDK version 3.11.0
2 parents a8dc2f5 + 9392afc commit 787cccf

File tree

18 files changed

+36
-12
lines changed

18 files changed

+36
-12
lines changed

README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# DJI Payload SDK (PSDK)
22

3-
![](https://img.shields.io/badge/version-V3.10.0-red.svg)
4-
![](https://img.shields.io/badge/platform-linux_|_rtos-blue.svg)
5-
![](https://img.shields.io/badge/license-MIT-purple.svg)
3+
![](https://img.shields.io/badge/version-V3.11.0-orange.svg)
4+
![](https://img.shields.io/badge/platform-linux_|_rtos-purple.svg)
5+
![](https://img.shields.io/badge/license-MIT-pink.svg)
66

77
## What is the DJI Payload SDK?
88

@@ -23,11 +23,10 @@ to get the latest version information.
2323

2424
## Latest Release
2525

26-
The latest release version of PSDK is 3.10.0. This version of Payload SDK mainly add some new features support and fixed some
26+
The latest release version of PSDK is 3.11.0. This version of Payload SDK mainly add some new features support and fixed some
2727
bugs. Please refer to the release notes for detailed changes list.
2828

29-
* Supports Matrice 4T/4E models
30-
* Supports DJI SDK Certified Chip (DJI SDK CC).
29+
* Supports Matrice 4TD/4D models
3130

3231
## License
3332

psdk_lib/include/dji_liveview.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ typedef enum {
7474
DJI_LIVEVIEW_CAMERA_SOURCE_M4E_VIS = 1,
7575
DJI_LIVEVIEW_CAMERA_SOURCE_M4T_VIS = 1,
7676
DJI_LIVEVIEW_CAMERA_SOURCE_M4T_IR = 2,
77+
DJI_LIVEVIEW_CAMERA_SOURCE_M4D_VIS = 1,
78+
DJI_LIVEVIEW_CAMERA_SOURCE_M4TD_VIS = 1,
79+
DJI_LIVEVIEW_CAMERA_SOURCE_M4TD_IR = 2,
7780
} E_DjiLiveViewCameraSource;
7881

7982
/**

psdk_lib/include/dji_typedef.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ typedef enum {
9898
DJI_AIRCRAFT_SERIES_M3D = 6,
9999
DJI_AIRCRAFT_SERIES_FC30 = 7,
100100
DJI_AIRCRAFT_SERIES_M4 = 8,
101+
DJI_AIRCRAFT_SERIES_M4D = 9,
101102
} E_DjiAircraftSeries;
102103

103104
typedef enum {
@@ -116,6 +117,8 @@ typedef enum {
116117
DJI_AIRCRAFT_TYPE_M3TD = 93, /*!< Aircraft type is Matrice 3TD. */
117118
DJI_AIRCRAFT_TYPE_M4T = 99, /*!< Aircraft type is Mavic 4T. */
118119
DJI_AIRCRAFT_TYPE_M4E = 990, /*!< Aircraft type is Mavic 4E. */
120+
DJI_AIRCRAFT_TYPE_M4TD = 100, /*!< Aircraft type is Matrice 4TD. */
121+
DJI_AIRCRAFT_TYPE_M4D = 1000, /*!< Aircraft type is Matrice 4D. */
119122
} E_DjiAircraftType;
120123

121124
/**
@@ -143,6 +146,8 @@ typedef enum {
143146
DJI_CAMERA_TYPE_H30T = 83, /*!< Camera type is H30T. */
144147
DJI_CAMERA_TYPE_M4T = 89, /*!< Camera type is M4T. */
145148
DJI_CAMERA_TYPE_M4E = 891, /*!< Camera type is M4E. */
149+
DJI_CAMERA_TYPE_M4TD = 90, /*!< Camera type is M4TD. */
150+
DJI_CAMERA_TYPE_M4D = 91, /*!< Camera type is M4D. */
146151
} E_DjiCameraType;
147152

148153
/**

psdk_lib/include/dji_version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ extern "C" {
3434

3535
/* Exported constants --------------------------------------------------------*/
3636
#define DJI_VERSION_MAJOR 3 /*!< DJI SDK major version num, when have incompatible API changes. Range from 0 to 99. */
37-
#define DJI_VERSION_MINOR 10 /*!< DJI SDK minor version num, when add functionality in a backwards compatible manner changes. Range from 0 to 99. */
37+
#define DJI_VERSION_MINOR 11 /*!< DJI SDK minor version num, when add functionality in a backwards compatible manner changes. Range from 0 to 99. */
3838
#define DJI_VERSION_MODIFY 0 /*!< DJI SDK modify version num, when have backwards compatible bug fixes changes. Range from 0 to 99. */
3939
#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. */
40-
#define DJI_VERSION_BUILD 2190 /*!< DJI SDK version build info, when jenkins trigger build changes. Range from 0 to 65535. */
40+
#define DJI_VERSION_BUILD 2204 /*!< DJI SDK version build info, when jenkins trigger build changes. Range from 0 to 65535. */
4141

4242
/* Exported types ------------------------------------------------------------*/
4343

16 Bytes
Binary file not shown.
20 Bytes
Binary file not shown.
12 Bytes
Binary file not shown.
8 Bytes
Binary file not shown.
32 Bytes
Binary file not shown.

samples/sample_c++/module_sample/liveview/test_liveview_entry.cpp

100644100755
File mode changed.

0 commit comments

Comments
 (0)