Merge pull request #93 from dji-sdk/release/v3.3

FIX: fixed the payload camera sdcard state is not work
2023-03-13 11:41:12 +08:00
parent 55c3d4c306 b621c93fde
commit 1d2a17e771
16 changed files with 3 additions and 1 deletions
--- a/psdk_lib/include/dji_version.h
+++ b/psdk_lib/include/dji_version.h
@ -37,7 +37,7 @@ extern "C" {
 #define DJI_VERSION_MINOR     3 /*!< 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     1704 /*!< DJI SDK version build info, when jenkins trigger build changes. Range from 0 to 65535. */
+#define DJI_VERSION_BUILD     1705 /*!< DJI SDK version build info, when jenkins trigger build changes. Range from 0 to 65535. */

 /* Exported types ------------------------------------------------------------*/

--- a/psdk_lib/lib/aarch64-himix100-linux-gcc/libpayloadsdk.a
+++ b/psdk_lib/lib/aarch64-himix100-linux-gcc/libpayloadsdk.a
--- a/psdk_lib/lib/aarch64-linux-gnu-gcc/libpayloadsdk.a
+++ b/psdk_lib/lib/aarch64-linux-gnu-gcc/libpayloadsdk.a
--- a/psdk_lib/lib/arm-himix100-linux-gcc/libpayloadsdk.a
+++ b/psdk_lib/lib/arm-himix100-linux-gcc/libpayloadsdk.a
--- a/psdk_lib/lib/arm-himix200-linux-gcc/libpayloadsdk.a
+++ b/psdk_lib/lib/arm-himix200-linux-gcc/libpayloadsdk.a
--- a/psdk_lib/lib/arm-hisiv300-linux-gcc/libpayloadsdk.a
+++ b/psdk_lib/lib/arm-hisiv300-linux-gcc/libpayloadsdk.a
--- a/psdk_lib/lib/arm-hisiv400-linux-gcc/libpayloadsdk.a
+++ b/psdk_lib/lib/arm-hisiv400-linux-gcc/libpayloadsdk.a
--- a/psdk_lib/lib/arm-hisiv500-linux-gcc/libpayloadsdk.a
+++ b/psdk_lib/lib/arm-hisiv500-linux-gcc/libpayloadsdk.a
--- a/psdk_lib/lib/arm-hisiv600-linux-gcc/libpayloadsdk.a
+++ b/psdk_lib/lib/arm-hisiv600-linux-gcc/libpayloadsdk.a
--- a/psdk_lib/lib/arm-linux-gnueabi-gcc/libpayloadsdk.a
+++ b/psdk_lib/lib/arm-linux-gnueabi-gcc/libpayloadsdk.a
--- a/psdk_lib/lib/arm-linux-gnueabihf-gcc/libpayloadsdk.a
+++ b/psdk_lib/lib/arm-linux-gnueabihf-gcc/libpayloadsdk.a
--- a/psdk_lib/lib/arm-none-eabi-gcc/libpayloadsdk.a
+++ b/psdk_lib/lib/arm-none-eabi-gcc/libpayloadsdk.a
--- a/psdk_lib/lib/armcc_cortex-m4/libpayload.lib
+++ b/psdk_lib/lib/armcc_cortex-m4/libpayload.lib
--- a/psdk_lib/lib/x86_64-linux-gnu-gcc/libpayloadsdk.a
+++ b/psdk_lib/lib/x86_64-linux-gnu-gcc/libpayloadsdk.a
--- a/psdk_lib/lib/xtensa-esp32-elf-gcc/libpayloadsdk.a
+++ b/psdk_lib/lib/xtensa-esp32-elf-gcc/libpayloadsdk.a
--- a/samples/sample_c/module_sample/camera_emu/test_payload_cam_emu_base.c
+++ b/samples/sample_c/module_sample/camera_emu/test_payload_cam_emu_base.c
@ -511,6 +511,7 @@ static T_DjiReturnCode FormatSDCard(void)

    memset(&s_cameraSDCardState, 0, sizeof(T_DjiCameraSDCardState));
    s_cameraSDCardState.isInserted = true;
+    s_cameraSDCardState.isVerified = true;
    s_cameraSDCardState.totalSpaceInMB = SDCARD_TOTAL_SPACE_IN_MB;
    s_cameraSDCardState.remainSpaceInMB = SDCARD_TOTAL_SPACE_IN_MB;
    s_cameraSDCardState.availableCaptureCount = SDCARD_TOTAL_SPACE_IN_MB / SDCARD_PER_PHOTO_SPACE_IN_MB;
@ -1241,6 +1242,7 @@ T_DjiReturnCode DjiTest_CameraEmuBaseStartService(void)

    /* Init the SDcard parameters */
    s_cameraSDCardState.isInserted = true;
+    s_cameraSDCardState.isVerified = true;
    s_cameraSDCardState.totalSpaceInMB = SDCARD_TOTAL_SPACE_IN_MB;
    s_cameraSDCardState.remainSpaceInMB = SDCARD_TOTAL_SPACE_IN_MB;
    s_cameraSDCardState.availableCaptureCount = SDCARD_TOTAL_SPACE_IN_MB / SDCARD_PER_PHOTO_SPACE_IN_MB;