NEW: add the M30T model stp and esp32 toolchain support

Signed-off-by: DJI-Martin <DJI-Martin@dji.com>

psdk_lib/include/dji_camera_manager.h

@@ -471,13 +471,16 @@ typedef struct {
 typedef struct {
     union {
         struct {
-            uint8_t reserved[16];
+            uint32_t attributePhotoReserved: 22;
+            uint32_t attributePhotoRatio: 8;
+            uint32_t attributePhotoRotation: 2;
+            uint8_t reserved[12];
         } photoAttribute;
         struct {
-            uint8_t attributeVideoDuration;
-            uint8_t attributeVideoFramerate;
-            uint8_t attributeVideoRotation;
-            uint8_t attributeVideoResolution;
+            uint32_t attributeVideoDuration: 16;
+            uint32_t attributeVideoFramerate: 6;
+            uint32_t attributeVideoRotation: 2;
+            uint32_t attributeVideoResolution: 8;
             uint8_t reserved[12];
         } videoAttribute;
     };
@@ -488,7 +491,7 @@ typedef struct {
     uint32_t fileSize;
     uint32_t fileIndex;
     T_DjiCameraManagerFileCreateTime createTime;
-    uint8_t type;
+    E_DjiCameraMediaFileType type;
     T_DjiCameraManagerFileAttributeData attributeData;
 } T_DjiCameraManagerFileListInfo;
 

psdk_lib/include/dji_flight_controller.h

@@ -252,6 +252,10 @@ typedef struct {
     dji_f64_t latitude;  /*!< unit: rad */
     dji_f64_t longitude; /*!< unit: rad */
 } T_DjiFlightControllerHomeLocation; // pack(1)
+
+typedef struct {
+    char serialNum[16];
+} T_DjiFlightControllerGeneralInfo;
 #pragma pack()
 
 /* Exported functions --------------------------------------------------------*/
@@ -585,6 +589,14 @@ T_DjiReturnCode DjiFlightController_ExecuteEmergencyBrakeAction(void);
  */
 T_DjiReturnCode DjiFlightController_CancelEmergencyBrakeAction(void);
 
+/**
+ * @brief Get general info of the aircraft.
+ * @param generalInfo: the struct stored the serial num which contains a array of chars var in case the user gives an
+ * illegal length character pointer
+ * @return Execution result.
+ */
+T_DjiReturnCode DjiFlightController_GetGeneralInfo(T_DjiFlightControllerGeneralInfo *generalInfo);
+
 #ifdef __cplusplus
 }
 #endif

psdk_lib/include/dji_liveview.h

@@ -53,10 +53,15 @@ typedef enum {
 typedef enum {
     DJI_LIVEVIEW_CAMERA_SOURCE_DEFAULT = 0,
     DJI_LIVEVIEW_CAMERA_SOURCE_H20_WIDE = 1,
-    DJI_LIVEVIEW_CAMERA_SOURCE_H20T_WIDE = 1,
     DJI_LIVEVIEW_CAMERA_SOURCE_H20_ZOOM = 2,
+    DJI_LIVEVIEW_CAMERA_SOURCE_H20T_WIDE = 1,
     DJI_LIVEVIEW_CAMERA_SOURCE_H20T_ZOOM = 2,
-    DJI_LIVEVIEW_CAMERA_SOURCE_H20T_IR = 3
+    DJI_LIVEVIEW_CAMERA_SOURCE_H20T_IR = 3,
+    DJI_LIVEVIEW_CAMERA_SOURCE_M30_ZOOM = 1,
+    DJI_LIVEVIEW_CAMERA_SOURCE_M30_WIDE = 2,
+    DJI_LIVEVIEW_CAMERA_SOURCE_M30T_ZOOM = 1,
+    DJI_LIVEVIEW_CAMERA_SOURCE_M30T_WIDE = 2,
+    DJI_LIVEVIEW_CAMERA_SOURCE_M30T_IR = 3
 } E_DjiLiveViewCameraSource;
 
 /**

psdk_lib/include/dji_payload_camera.h

@@ -82,16 +82,6 @@ typedef enum {
     DJI_CAMERA_FOCUS_MODE_AUTO = 1, /*!< Auto focus mode. */
 } E_DjiCameraFocusMode;
 
-/**
- * @brief Camera supported media file type.
- */
-typedef enum {
-    DJI_CAMERA_FILE_TYPE_JPEG = 0, /*!< Media file JPEG type. */
-    DJI_CAMERA_FILE_TYPE_DNG = 1, /*!< Media file DNG type. */
-    DJI_CAMERA_FILE_TYPE_MOV = 2, /*!< Media file MOV type. */
-    DJI_CAMERA_FILE_TYPE_MP4 = 3, /*!< Media file MP4 type. */
-} E_DjiCameraMediaFileType;
-
 /**
  * @brief Camera playback mode in playback process.
  */

psdk_lib/include/dji_typedef.h

@@ -120,6 +120,17 @@ typedef enum {
     DJI_CAMERA_TYPE_M30T, /*!< Camera type is M30T. */
 } E_DjiCameraType;
 
+/**
+ * @brief Camera supported media file type.
+ */
+typedef enum {
+    DJI_CAMERA_FILE_TYPE_JPEG = 0, /*!< Media file JPEG type. */
+    DJI_CAMERA_FILE_TYPE_DNG = 1, /*!< Media file DNG type. */
+    DJI_CAMERA_FILE_TYPE_MOV = 2, /*!< Media file MOV type. */
+    DJI_CAMERA_FILE_TYPE_MP4 = 3, /*!< Media file MP4 type. */
+    DJI_CAMERA_FILE_TYPE_UNKNOWN = 255, /*!< Media file unknown type. */
+} E_DjiCameraMediaFileType;
+
 /**
  * @brief Camera optical zoom specifies.
  */

psdk_lib/include/dji_version.h

@@ -37,7 +37,7 @@ extern "C" {
 #define DJI_VERSION_MINOR     1 /*!< 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     1491 /*!< DJI SDK version build info, when jenkins trigger build changes. Range from 0 to 65535. */
+#define DJI_VERSION_BUILD     1500 /*!< DJI SDK version build info, when jenkins trigger build changes. Range from 0 to 65535. */
 
 /* Exported types ------------------------------------------------------------*/