NEW: release DJI Payload-SDK version 3.13.0

Signed-off-by: martin <dev@dji.com>

psdk_lib/include/dji_camera_manager.h

@@ -682,6 +682,7 @@ typedef struct {
         E_DjiCameraManagerStreamSource streamSource[16];
         E_DjiCameraManagerStreamStorage streamStorage[16];
         E_DjiCameraManagerNightSceneMode nightSceneMode[16];
+        E_DjiCameraManagerMeteringMode meteringMode[16];
     };
     uint32_t minValue;
     uint32_t maxValue;
@@ -850,7 +851,7 @@ T_DjiReturnCode DjiCameraManager_SetPhotoBurstCount(E_DjiMountPosition position,
 /**
  * @brief Set the parameters for INTERVAL shooting mode.
  * @note In this mode, the camera captures a photo, waits a specified interval
- * of time, then captures another photo, continuing until the set number of 
+ * of time, then captures another photo, continuing until the set number of
  * photos is reached. Supported by thermal imaging cameras, too.
  * @param position: camera mounted position
  * @param intervalSetting: refer to T_DjiCameraPhotoTimeIntervalSettings.
@@ -991,7 +992,7 @@ T_DjiReturnCode DjiCameraManager_GetTapZoomEnabled(E_DjiMountPosition position,
 
 /**
  * @brief Set camera's tap-zoom multiplier of the selected camera mounted position.
- * @note The final zoom scale during a tap-zoom action will be: 
+ * @note The final zoom scale during a tap-zoom action will be:
  * Current Zoom Scale x Multiplier.
  * @param position: camera mounted position
  * @param tapZoomMultiplier: The multiplier range is [1,5]. A multiplier of 1 will not change the zoom.
@@ -1603,6 +1604,15 @@ T_DjiReturnCode DjiCameraManager_SetInfraredCameraGainMode(E_DjiMountPosition po
 T_DjiReturnCode DjiCameraManager_GetInfraredCameraGainModeTemperatureRange(E_DjiMountPosition position,
                                                                T_DjiCameraManagerIrTempMeterRange *tempRange);
 
+/**
+ * @brief Get metergin mode range of infrared camera.
+ * @param position: camera mounted position.
+ * @param tempRange: returned value of metering range.
+ * @return Execution result.
+ */
+T_DjiReturnCode DjiCameraManager_GetMeteringModeRange(E_DjiMountPosition position,
+                                                      T_DjiCameraManagerRangeList *rangeList);
+
 /**
  * @brief Set camera metering mode.
  * @param position: camera mounted position
@@ -1640,6 +1650,16 @@ T_DjiReturnCode DjiCameraManager_GetMeteringPointRegionRange(E_DjiMountPosition
 T_DjiReturnCode DjiCameraManager_SetMeteringPoint(E_DjiMountPosition position,
                                                   uint8_t x, uint8_t y);
 
+/**
+ * @brief Set metering point normalize.
+ * @param position: camera mounted position
+ * @param x: Normalized horizontal coordinate, value ranges in 0 ~ 1.
+ * @param y: Normalized Vertical coordinate, value ranges in 0 ~ 1.
+ * @return Execution result.
+ */
+T_DjiReturnCode DjiCameraManager_SetMeteringPointNormalized(E_DjiMountPosition position,
+                                                           dji_f32_t x, dji_f32_t y);
+
 /**
  * @brief Get camera metering mode.
  * @param position: camera mounted position
@@ -1651,6 +1671,18 @@ T_DjiReturnCode DjiCameraManager_GetMeteringPoint(E_DjiMountPosition position,
                                                   uint8_t *x, uint8_t *y);
 
 
+/**
+ * @brief Get camera metering mode.
+ * @param position: camera mounted position
+ * @param x: a pointer to a float (dji_f32_t) that will receive the normalized x-coordinate of the
+ * metering point.
+ * @param y: a pointer to a float (dji_f32_t) that will receive the normalized y-coordinate of the
+ * metering point.
+ * @return Execution result.
+ */
+T_DjiReturnCode DjiCameraManager_GetMeteringPointNormalized(E_DjiMountPosition position,
+                                                           dji_f32_t *x, dji_f32_t *y);
+
 /**
  * @brief Start to record point cloud of the selected camera mounted position.
  * @param position: camera mounted position

psdk_lib/include/dji_flight_controller.h

@@ -292,7 +292,7 @@ typedef struct {
 } T_DjiFtsPwmTriggerStatus;
 
 typedef struct {
-    T_DjiFtsPwmTriggerStatus ESC[4]; /* trigger tatus of the two ESCs, M4/M4D only ESC[0] and ESC[1], M400 for alls */
+    T_DjiFtsPwmTriggerStatus ESC[4]; /* trigger status of the two ESCs */
 } T_DjiFtsPwmEscTriggerStatus;
 
 /* Exported functions --------------------------------------------------------*/

psdk_lib/include/dji_typedef.h

@@ -129,6 +129,7 @@ typedef enum {
     DJI_AIRCRAFT_TYPE_M3E                       = 77, /*!< Aircraft type is Mavic 3E. */
     DJI_AIRCRAFT_TYPE_FC30                      = 78, /* !<Aircraft type is FlyCart 30> */
     DJI_AIRCRAFT_TYPE_M3T                       = 79, /*!< Aircraft type is Mavic 3T. */
+    DJI_AIRCRAFT_TYPE_M3TA                      = 80, /*!< Aircraft type is Mavic 3TA. */
     DJI_AIRCRAFT_TYPE_M350_RTK                  = 89, /*!< Aircraft type is Matrice 350 RTK. */
     DJI_AIRCRAFT_TYPE_M3D                       = 91, /*!< Aircraft type is Matrice 3D. */
     DJI_AIRCRAFT_TYPE_M3TD                      = 93, /*!< Aircraft type is Matrice 3TD. */
@@ -158,6 +159,7 @@ typedef enum {
     DJI_CAMERA_TYPE_M30T                        = 53, /*!< Camera type is M30T. */
     DJI_CAMERA_TYPE_M3E                         = 66, /*!< Camera type is M3E. */
     DJI_CAMERA_TYPE_M3T                         = 67, /*!< Camera type is M3T. */
+    DJI_CAMERA_TYPE_M3TA                        = 68, /*!< Camera type is M3T. */
     DJI_CAMERA_TYPE_M3D                         = 80, /*!< Camera type is Matrice 3D. */
     DJI_CAMERA_TYPE_M3TD                        = 81, /*!< Camera type is Matrice 3TD. */
     DJI_CAMERA_TYPE_H30                         = 82, /*!< Camera type is H30. */

psdk_lib/include/dji_version.h

@@ -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   12  /*!< 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_MINOR   13  /*!< 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   2262 /*!< DJI SDK version build info, when jenkins trigger build changes. Range from 0 to 65535. */
+#define DJI_VERSION_BUILD   2270 /*!< DJI SDK version build info, when jenkins trigger build changes. Range from 0 to 65535. */
 
 /* Exported types ------------------------------------------------------------*/