Skip to content

Commit 787cccf

Browse files
dji-devdji-dev
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

‎psdk_lib/lib/aarch64-linux-gnu-gcc/libpayloadsdk.a

16 Bytes
Binary file not shown.

‎psdk_lib/lib/arm-linux-gnueabi-gcc/libpayloadsdk.a

20 Bytes
Binary file not shown.

‎psdk_lib/lib/arm-linux-gnueabihf-gcc/libpayloadsdk.a

12 Bytes
Binary file not shown.

‎psdk_lib/lib/armcc_cortex-m4/libpayload.lib

8 Bytes
Binary file not shown.

‎psdk_lib/lib/x86_64-linux-gnu-gcc/libpayloadsdk.a

32 Bytes
Binary file not shown.

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

100644100755
File mode changed.

‎samples/sample_c++/platform/linux/manifold2/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,5 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${OpenCV_INCLUDE_DIRS})
137137
if (OpenCV_FOUND)
138138
target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS})
139139
endif ()
140+
141+
add_dependencies(${PROJECT_NAME} djisdk)

‎samples/sample_c/module_sample/camera_manager/test_camera_manager.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ static const T_DjiTestCameraTypeStr s_cameraTypeStrList[] = {
7676
{DJI_CAMERA_TYPE_H30T, "H30T Camera"},
7777
{DJI_CAMERA_TYPE_M4T, "M4T Camera"},
7878
{DJI_CAMERA_TYPE_M4E, "M4E Camera"},
79+
{DJI_CAMERA_TYPE_M4TD, "M4TD Camera"},
80+
{DJI_CAMERA_TYPE_M4D, "M4D Camera"},
7981
};
8082

8183
static FILE *s_downloadMediaFile = NULL;
@@ -855,6 +857,7 @@ T_DjiReturnCode DjiTest_CameraManagerRunSample(E_DjiMountPosition mountPosition,
855857
|| DJI_CAMERA_TYPE_M3D == cameraType || DJI_CAMERA_TYPE_M3TD == cameraType
856858
|| DJI_CAMERA_TYPE_M4T == cameraType || DJI_CAMERA_TYPE_M4E == cameraType
857859
|| DJI_CAMERA_TYPE_H30 == cameraType || DJI_CAMERA_TYPE_H30T == cameraType
860+
|| DJI_CAMERA_TYPE_M4TD == cameraType || DJI_CAMERA_TYPE_M4D == cameraType
858861
) {
859862
USER_LOG_INFO("Set mounted position %d camera's exposure mode to manual mode.",
860863
mountPosition);
@@ -898,6 +901,7 @@ T_DjiReturnCode DjiTest_CameraManagerRunSample(E_DjiMountPosition mountPosition,
898901
|| DJI_CAMERA_TYPE_M3D == cameraType || DJI_CAMERA_TYPE_M3TD == cameraType
899902
|| DJI_CAMERA_TYPE_M4T == cameraType || DJI_CAMERA_TYPE_M4E == cameraType
900903
|| DJI_CAMERA_TYPE_H30 == cameraType || DJI_CAMERA_TYPE_H30T == cameraType
904+
|| DJI_CAMERA_TYPE_M4TD == cameraType || DJI_CAMERA_TYPE_M4D == cameraType
901905
) {
902906
USER_LOG_INFO("Set mounted position %d camera's exposure mode to manual mode.",
903907
mountPosition);
@@ -1198,6 +1202,7 @@ T_DjiReturnCode DjiTest_CameraManagerRunSample(E_DjiMountPosition mountPosition,
11981202
|| DJI_CAMERA_TYPE_M3E == cameraType || DJI_CAMERA_TYPE_M3T == cameraType
11991203
|| DJI_CAMERA_TYPE_M3D == cameraType || DJI_CAMERA_TYPE_M3TD == cameraType
12001204
|| DJI_CAMERA_TYPE_M4T == cameraType || DJI_CAMERA_TYPE_M4E == cameraType
1205+
|| DJI_CAMERA_TYPE_M4TD == cameraType || DJI_CAMERA_TYPE_M4D == cameraType
12011206
) {
12021207
USER_LOG_INFO("Camera type %s does not support night scene mode!",
12031208
s_cameraTypeStrList[DjiTest_CameraManagerGetCameraTypeIndex(cameraType)].cameraTypeStr);
@@ -1933,7 +1938,7 @@ T_DjiReturnCode DjiTest_CameraManagerRunSample(E_DjiMountPosition mountPosition,
19331938
cameraType == DJI_CAMERA_TYPE_L1 || cameraType == DJI_CAMERA_TYPE_M30 ||
19341939
cameraType == DJI_CAMERA_TYPE_M3E || cameraType == DJI_CAMERA_TYPE_M3D ||
19351940
cameraType == DJI_CAMERA_TYPE_L2 || cameraType == DJI_CAMERA_TYPE_H30 ||
1936-
cameraType == DJI_CAMERA_TYPE_M4T) {
1941+
cameraType == DJI_CAMERA_TYPE_M4T || cameraType == DJI_CAMERA_TYPE_M4TD) {
19371942
USER_LOG_WARN("Camera type %s don't support FFC function.",
19381943
s_cameraTypeStrList[DjiTest_CameraManagerGetCameraTypeIndex(cameraType)].cameraTypeStr);
19391944
goto exitCameraModule;
@@ -1980,7 +1985,7 @@ T_DjiReturnCode DjiTest_CameraManagerRunSample(E_DjiMountPosition mountPosition,
19801985
cameraType == DJI_CAMERA_TYPE_L1 || cameraType == DJI_CAMERA_TYPE_M30 ||
19811986
cameraType == DJI_CAMERA_TYPE_M3E || cameraType == DJI_CAMERA_TYPE_M3D ||
19821987
cameraType == DJI_CAMERA_TYPE_L2 || cameraType == DJI_CAMERA_TYPE_H30 ||
1983-
cameraType == DJI_CAMERA_TYPE_M4T) {
1988+
cameraType == DJI_CAMERA_TYPE_M4T || cameraType == DJI_CAMERA_TYPE_M4TD) {
19841989
USER_LOG_WARN("Camera type %s don't support infrared function.",
19851990
s_cameraTypeStrList[DjiTest_CameraManagerGetCameraTypeIndex(cameraType)].cameraTypeStr);
19861991
goto exitCameraModule;

‎samples/sample_c/module_sample/data_transmission/test_data_transmission.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ T_DjiReturnCode DjiTest_DataTransmissionStartService(void)
8686
if (s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M30 ||
8787
s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M30T ||
8888
s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M3D ||
89-
s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M3TD) {
89+
s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M3TD ||
90+
s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M4D ||
91+
s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M4TD) {
9092
channelAddress = DJI_CHANNEL_ADDRESS_CLOUD_API;
9193
djiStat = DjiLowSpeedDataChannel_RegRecvDataCallback(channelAddress, ReceiveDataFromCloud);
9294
if (djiStat != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
@@ -211,7 +213,9 @@ static void *UserDataTransmission_Task(void *arg)
211213
if (s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M30 ||
212214
s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M30T ||
213215
s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M3D ||
214-
s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M3TD) {
216+
s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M3TD ||
217+
s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M4D ||
218+
s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M4TD ) {
215219
channelAddress = DJI_CHANNEL_ADDRESS_CLOUD_API;
216220
djiStat = DjiLowSpeedDataChannel_SendData(channelAddress, dataToBeSent, sizeof(dataToBeSent));
217221
if (djiStat != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS)

‎samples/sample_c/module_sample/flight_control/test_flight_control.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,6 +1306,8 @@ bool DjiTest_FlightControlGoHomeAndConfirmLanding(void)
13061306
|| DJI_AIRCRAFT_TYPE_M3D == aircraftInfoBaseInfo.aircraftType || DJI_AIRCRAFT_TYPE_M3TD == aircraftInfoBaseInfo.aircraftType
13071307
|| DJI_AIRCRAFT_TYPE_M4T == aircraftInfoBaseInfo.aircraftType
13081308
|| DJI_AIRCRAFT_TYPE_M4E == aircraftInfoBaseInfo.aircraftType
1309+
|| DJI_AIRCRAFT_TYPE_M4TD == aircraftInfoBaseInfo.aircraftType
1310+
|| DJI_AIRCRAFT_TYPE_M4D == aircraftInfoBaseInfo.aircraftType
13091311
) {
13101312
if ((dji_f64_t) 0.45 < heightFusion && heightFusion < (dji_f64_t) 0.55) {
13111313
break;

‎samples/sample_c/module_sample/gimbal_manager/test_gimbal_manager.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ T_DjiReturnCode DjiTest_GimbalManagerRunSample(E_DjiMountPosition mountPosition,
144144
|| DJI_AIRCRAFT_SERIES_M3 == aircraftSeries
145145
|| DJI_AIRCRAFT_SERIES_M3D == aircraftSeries
146146
|| DJI_AIRCRAFT_SERIES_M4 == aircraftSeries
147+
|| DJI_AIRCRAFT_SERIES_M4D == aircraftSeries
147148
) {
148149
if (s_rotationActionList[i].rotation.rotationMode == DJI_GIMBAL_ROTATION_MODE_ABSOLUTE_ANGLE) {
149150
T_DjiFcSubscriptionGimbalAngles gimbalAngles = {0};

‎samples/sample_c/module_sample/liveview/test_liveview.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ T_DjiReturnCode DjiTest_LiveviewRunSample(E_DjiMountPosition mountPosition)
149149
if (DJI_AIRCRAFT_TYPE_M3T == aircraftInfoBaseInfo.aircraftType
150150
|| DJI_AIRCRAFT_TYPE_M3TD == aircraftInfoBaseInfo.aircraftType
151151
|| DJI_AIRCRAFT_TYPE_M4T == aircraftInfoBaseInfo.aircraftType
152+
|| DJI_AIRCRAFT_TYPE_M4TD == aircraftInfoBaseInfo.aircraftType
152153
) {
153154
USER_LOG_INFO("--> Start h264 stream of the fpv and selected payload\r\n");
154155

‎samples/sample_c/module_sample/widget/test_widget_speaker.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,8 @@ static T_DjiReturnCode DjiTest_PlayTtsData(void)
325325
|| DJI_AIRCRAFT_TYPE_M3D == aircraftInfoBaseInfo.aircraftType || DJI_AIRCRAFT_TYPE_M3TD == aircraftInfoBaseInfo.aircraftType
326326
|| DJI_AIRCRAFT_TYPE_M4T == aircraftInfoBaseInfo.aircraftType
327327
|| DJI_AIRCRAFT_TYPE_M4E == aircraftInfoBaseInfo.aircraftType
328+
|| DJI_AIRCRAFT_TYPE_M4TD == aircraftInfoBaseInfo.aircraftType
329+
|| DJI_AIRCRAFT_TYPE_M4D == aircraftInfoBaseInfo.aircraftType
328330
) {
329331
return DjiTest_PlayAudioData();
330332
} else {

‎tools/file2c/file2c.exe

100644100755
File mode changed.

0 commit comments

Comments
 (0)