Merge pull request #221 from dji-sdk/release/V3.9.2

NEW: release DJI Payload-SDK version 3.9.2

README.md

@@ -1,8 +1,8 @@
 # DJI Payload SDK (PSDK)
 
-![](https://img.shields.io/badge/version-V3.9.1-red.svg)
-![](https://img.shields.io/badge/platform-linux_|_rtos-blue.svg)
-![](https://img.shields.io/badge/license-MIT-purple.svg)
+![](https://img.shields.io/badge/version-V3.9.2-orange.svg)
+![](https://img.shields.io/badge/platform-linux_|_rtos-purple.svg)
+![](https://img.shields.io/badge/license-MIT-pink.svg)
 
 ## What is the DJI Payload SDK?
 
@@ -23,16 +23,15 @@ to get the latest version information.
 
 ## Latest Release
 
-The latest release version of PSDK is 3.9.1. This version of Payload SDK mainly add some new features support and fixed some
+The latest release version of PSDK is 3.9.2. This version of Payload SDK mainly add some new features support and fixed some
 bugs. Please refer to the release notes for detailed changes list.
 
-* GEO Caging feature supported for the M3D series models.
-* Flight control function and waypoint mission supported for the FlyCart 30 model.
-* Fixed an issue with subscribing to the flight control topics for M300 RTK and M350 RTK models.
-* Resolved a problem with DJI Smart Controller Enterprise not recognizing PSDK payload devices on M300 RTK.
-* Fixed an issue with acquiring the camera stream without I-frames on M3D series models.
-* Added the MOP 49154 channel as an alternative to the 49152 channel for subscribing to the L2 camera's real-time 3D point cloud. This enhancement avoids conflicts when subscribing to point cloud data concurrently with Pilot2 and improves the quality of the point cloud data.
-> Note: When using M300 RTK with the DJI Smart Controller Enterprise to activate payloads via the OSDK interface, the remote controller will not recognize the payload device if the virtual serial port is not utilized.
+* Added support for cloud-based custom small data transmission on Matrice 3D/3TD models.
+* Fixed an issue with acquiring disordered sequence numbers of the RTCM data packet.
+> Note: When transmitting the video stream from the payload camera, only the stream in DJI-H264 format is supported. The
+CUSTOM-H264 stream is not supported. Use the latest PSDK community version to transmit the stream in the CUSTOM-H264 format.
+> Note: Non-RC flight is not supported by default. Call the DjiFlightController_SetRCLostActionEnableStatus interface to enable
+this feature.
 
 ## License
 

psdk_lib/include/dji_version.h

@@ -35,9 +35,9 @@ 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     9 /*!< DJI SDK minor version num, when add functionality in a backwards compatible manner changes. Range from 0 to 99. */
-#define DJI_VERSION_MODIFY    1 /*!< DJI SDK modify version num, when have backwards compatible bug fixes changes. Range from 0 to 99. */
+#define DJI_VERSION_MODIFY    2 /*!< 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     2090 /*!< DJI SDK version build info, when jenkins trigger build changes. Range from 0 to 65535. */
+#define DJI_VERSION_BUILD     2125 /*!< DJI SDK version build info, when jenkins trigger build changes. Range from 0 to 65535. */
 
 /* Exported types ------------------------------------------------------------*/
 

samples/sample_c++/platform/linux/common/osal/osal.c

@@ -320,7 +320,7 @@ T_DjiReturnCode Osal_GetTimeUs(uint64_t *us)
     if (s_localTimeUsOffset == 0) {
         s_localTimeUsOffset = *us;
     } else {
-        *us = *us - s_localTimeMsOffset;
+        *us = *us - s_localTimeUsOffset;
     }
 
     return DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS;

samples/sample_c/module_sample/data_transmission/test_data_transmission.c

@@ -83,8 +83,10 @@ T_DjiReturnCode DjiTest_DataTransmissionStartService(void)
         return DJI_ERROR_SYSTEM_MODULE_CODE_UNKNOWN;
     }
 
-    if (s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M30 ||
-        s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M30T) {
+        if (s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M30  ||
+            s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M30T ||
+            s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M3D  ||
+            s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M3TD) {
         channelAddress = DJI_CHANNEL_ADDRESS_CLOUD_API;
         djiStat = DjiLowSpeedDataChannel_RegRecvDataCallback(channelAddress, ReceiveDataFromCloud);
         if (djiStat != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
@@ -206,8 +208,10 @@ static void *UserDataTransmission_Task(void *arg)
             USER_LOG_ERROR("get send to mobile channel state error.");
         }
 
-        if (s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M30 ||
-            s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M30T) {
+        if (s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M30  ||
+            s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M30T ||
+            s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M3D  ||
+            s_aircraftInfoBaseInfo.aircraftType == DJI_AIRCRAFT_TYPE_M3TD) {
             channelAddress = DJI_CHANNEL_ADDRESS_CLOUD_API;
             djiStat = DjiLowSpeedDataChannel_SendData(channelAddress, dataToBeSent, sizeof(dataToBeSent));
             if (djiStat != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS)

samples/sample_c/platform/linux/common/osal/osal.c

@@ -323,7 +323,7 @@ T_DjiReturnCode Osal_GetTimeUs(uint64_t *us)
     if (s_localTimeUsOffset == 0) {
         s_localTimeUsOffset = *us;
     } else {
-        *us = *us - s_localTimeMsOffset;
+        *us = *us - s_localTimeUsOffset;
     }
 
     return DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS;