diff --git a/LICENSE.txt b/LICENSE.txt index 5ff326d..01ad266 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -33,8 +33,11 @@ The following portions of the DJI’s Payload SDK (“Software” referred to in │   │   ├── dji_gimbal.h │   │   ├── dji_gimbal_manager.h │   │   ├── dji_high_speed_data_channel.h +│   │   ├── dji_hms_customization.h │   │   ├── dji_hms.h │   │   ├── dji_hms_info_table.h +│   │   ├── dji_hms_manager.h +│   │   ├── dji_interest_point.h │   │   ├── dji_liveview.h │   │   ├── dji_logger.h │   │   ├── dji_low_speed_data_channel.h @@ -149,6 +152,9 @@ The following portions of the DJI’s Payload SDK (“Software” referred to in │   │   │   │   ├── test_gimbal_manager.c │   │   │   │   └── test_gimbal_manager.h │   │   │   ├── hms +│   │   │   │   ├── data +│   │   │   │   │   ├── hms_2023_05_18.json +│   │   │   │   │   └── hms_2023_08_22.json │   │   │   │   ├── hms_text │   │   │   │   │   ├── cn │   │   │   │   │   │   └── hms_text_config.json @@ -159,6 +165,9 @@ The following portions of the DJI’s Payload SDK (“Software” referred to in │   │   │   │   │   └── hms_text_config_json.h │   │   │   │   ├── test_hms.c │   │   │   │   └── test_hms.h +│   │   │   ├── interest_point +│   │   │   │   ├── test_interest_point.c +│   │   │   │   └── test_interest_point.h │   │   │   ├── liveview │   │   │   │   ├── test_liveview.c │   │   │   │   └── test_liveview.h @@ -190,6 +199,8 @@ The following portions of the DJI’s Payload SDK (“Software” referred to in │   │   │   │   ├── test_upgrade_platform_opt.c │   │   │   │   └── test_upgrade_platform_opt.h │   │   │   ├── utils +│   │   │   │   ├── cJSON.c +│   │   │   │   ├── cJSON.h │   │   │   │   ├── util_buffer.c │   │   │   │   ├── util_buffer.h │   │   │   │   ├── util_file.c @@ -383,10 +394,196 @@ The following portions of the DJI’s Payload SDK (“Software” referred to in │   │   │   │   ├── Device │   │   │   │   │   └── ST │   │   │   │   │   └── STM32F4xx +│   │   │   │   │   ├── Include +│   │   │   │   │   │   ├── stm32f407xx.h +│   │   │   │   │   │   ├── stm32f4xx.h +│   │   │   │   │   │   └── system_stm32f4xx.h +│   │   │   │   │   └── Source +│   │   │   │   │   └── Templates +│   │   │   │   │   ├── arm +│   │   │   │   │   │   ├── startup_stm32f401xc.s +│   │   │   │   │   │   ├── startup_stm32f401xe.s +│   │   │   │   │   │   ├── startup_stm32f405xx.s +│   │   │   │   │   │   ├── startup_stm32f407xx.s +│   │   │   │   │   │   ├── startup_stm32f410cx.s +│   │   │   │   │   │   ├── startup_stm32f410rx.s +│   │   │   │   │   │   ├── startup_stm32f410tx.s +│   │   │   │   │   │   ├── startup_stm32f411xe.s +│   │   │   │   │   │   ├── startup_stm32f412cx.s +│   │   │   │   │   │   ├── startup_stm32f412rx.s +│   │   │   │   │   │   ├── startup_stm32f412vx.s +│   │   │   │   │   │   ├── startup_stm32f412zx.s +│   │   │   │   │   │   ├── startup_stm32f413xx.s +│   │   │   │   │   │   ├── startup_stm32f415xx.s +│   │   │   │   │   │   ├── startup_stm32f417xx.s +│   │   │   │   │   │   ├── startup_stm32f423xx.s +│   │   │   │   │   │   ├── startup_stm32f427xx.s +│   │   │   │   │   │   ├── startup_stm32f429xx.s +│   │   │   │   │   │   ├── startup_stm32f437xx.s +│   │   │   │   │   │   ├── startup_stm32f439xx.s +│   │   │   │   │   │   ├── startup_stm32f446xx.s +│   │   │   │   │   │   ├── startup_stm32f469xx.s +│   │   │   │   │   │   └── startup_stm32f479xx.s +│   │   │   │   │   ├── gcc +│   │   │   │   │   │   ├── startup_stm32f401xc.s +│   │   │   │   │   │   ├── startup_stm32f401xe.s +│   │   │   │   │   │   ├── startup_stm32f405xx.s +│   │   │   │   │   │   ├── startup_stm32f407xx.s +│   │   │   │   │   │   ├── startup_stm32f410cx.s +│   │   │   │   │   │   ├── startup_stm32f410rx.s +│   │   │   │   │   │   ├── startup_stm32f410tx.s +│   │   │   │   │   │   ├── startup_stm32f411xe.s +│   │   │   │   │   │   ├── startup_stm32f412cx.s +│   │   │   │   │   │   ├── startup_stm32f412rx.s +│   │   │   │   │   │   ├── startup_stm32f412vx.s +│   │   │   │   │   │   ├── startup_stm32f412zx.s +│   │   │   │   │   │   ├── startup_stm32f413xx.s +│   │   │   │   │   │   ├── startup_stm32f415xx.s +│   │   │   │   │   │   ├── startup_stm32f417xx.s +│   │   │   │   │   │   ├── startup_stm32f423xx.s +│   │   │   │   │   │   ├── startup_stm32f427xx.s +│   │   │   │   │   │   ├── startup_stm32f429xx.s +│   │   │   │   │   │   ├── startup_stm32f437xx.s +│   │   │   │   │   │   ├── startup_stm32f439xx.s +│   │   │   │   │   │   ├── startup_stm32f446xx.s +│   │   │   │   │   │   ├── startup_stm32f469xx.s +│   │   │   │   │   │   └── startup_stm32f479xx.s +│   │   │   │   │   └── iar +│   │   │   │   │   ├── linker +│   │   │   │   │   │   ├── stm32f401xc_flash.icf +│   │   │   │   │   │   ├── stm32f401xc_sram.icf +│   │   │   │   │   │   ├── stm32f401xe_flash.icf +│   │   │   │   │   │   ├── stm32f401xe_sram.icf +│   │   │   │   │   │   ├── stm32f405xx_flash.icf +│   │   │   │   │   │   ├── stm32f405xx_sram.icf +│   │   │   │   │   │   ├── stm32f407xx_flash.icf +│   │   │   │   │   │   ├── stm32f407xx_sram.icf +│   │   │   │   │   │   ├── stm32f410cx_flash.icf +│   │   │   │   │   │   ├── stm32f410cx_sram.icf +│   │   │   │   │   │   ├── stm32f410rx_flash.icf +│   │   │   │   │   │   ├── stm32f410rx_sram.icf +│   │   │   │   │   │   ├── stm32f410tx_flash.icf +│   │   │   │   │   │   ├── stm32f410tx_sram.icf +│   │   │   │   │   │   ├── stm32f411xe_flash.icf +│   │   │   │   │   │   ├── stm32f411xe_sram.icf +│   │   │   │   │   │   ├── stm32f412cx_flash.icf +│   │   │   │   │   │   ├── stm32f412cx_sram.icf +│   │   │   │   │   │   ├── stm32f412rx_flash.icf +│   │   │   │   │   │   ├── stm32f412rx_sram.icf +│   │   │   │   │   │   ├── stm32f412vx_flash.icf +│   │   │   │   │   │   ├── stm32f412vx_sram.icf +│   │   │   │   │   │   ├── stm32f412zx_flash.icf +│   │   │   │   │   │   ├── stm32f412zx_sram.icf +│   │   │   │   │   │   ├── stm32f413xx_flash.icf +│   │   │   │   │   │   ├── stm32f413xx_sram.icf +│   │   │   │   │   │   ├── stm32f415xx_flash.icf +│   │   │   │   │   │   ├── stm32f415xx_sram.icf +│   │   │   │   │   │   ├── stm32f417xx_flash.icf +│   │   │   │   │   │   ├── stm32f417xx_sram.icf +│   │   │   │   │   │   ├── stm32f423xx_flash.icf +│   │   │   │   │   │   ├── stm32f423xx_sram.icf +│   │   │   │   │   │   ├── stm32f427xx_flash.icf +│   │   │   │   │   │   ├── stm32f427xx_sram.icf +│   │   │   │   │   │   ├── stm32f429xx_flash.icf +│   │   │   │   │   │   ├── stm32f429xx_sram.icf +│   │   │   │   │   │   ├── stm32f437xx_flash.icf +│   │   │   │   │   │   ├── stm32f437xx_sram.icf +│   │   │   │   │   │   ├── stm32f439xx_flash.icf +│   │   │   │   │   │   ├── stm32f439xx_sram.icf +│   │   │   │   │   │   ├── stm32f446xx_flash.icf +│   │   │   │   │   │   ├── stm32f446xx_sram.icf +│   │   │   │   │   │   ├── stm32f469xx_flash.icf +│   │   │   │   │   │   ├── stm32f469xx_sram.icf +│   │   │   │   │   │   ├── stm32f479xx_flash.icf +│   │   │   │   │   │   └── stm32f479xx_sram.icf +│   │   │   │   │   ├── startup_stm32f401xc.s +│   │   │   │   │   ├── startup_stm32f401xe.s +│   │   │   │   │   ├── startup_stm32f405xx.s +│   │   │   │   │   ├── startup_stm32f407xx.s +│   │   │   │   │   ├── startup_stm32f410cx.s +│   │   │   │   │   ├── startup_stm32f410rx.s +│   │   │   │   │   ├── startup_stm32f410tx.s +│   │   │   │   │   ├── startup_stm32f411xe.s +│   │   │   │   │   ├── startup_stm32f412cx.s +│   │   │   │   │   ├── startup_stm32f412rx.s +│   │   │   │   │   ├── startup_stm32f412vx.s +│   │   │   │   │   ├── startup_stm32f412zx.s +│   │   │   │   │   ├── startup_stm32f413xx.s +│   │   │   │   │   ├── startup_stm32f415xx.s +│   │   │   │   │   ├── startup_stm32f417xx.s +│   │   │   │   │   ├── startup_stm32f423xx.s +│   │   │   │   │   ├── startup_stm32f427xx.s +│   │   │   │   │   ├── startup_stm32f429xx.s +│   │   │   │   │   ├── startup_stm32f437xx.s +│   │   │   │   │   ├── startup_stm32f439xx.s +│   │   │   │   │   ├── startup_stm32f446xx.s +│   │   │   │   │   ├── startup_stm32f469xx.s +│   │   │   │   │   └── startup_stm32f479xx.s │   │   │   │   └── Include +│   │   │   │   ├── cmsis_armcc.h +│   │   │   │   ├── cmsis_armclang.h +│   │   │   │   ├── cmsis_compiler.h +│   │   │   │   ├── cmsis_gcc.h +│   │   │   │   ├── cmsis_iccarm.h +│   │   │   │   ├── cmsis_version.h +│   │   │   │   ├── core_armv8mbl.h +│   │   │   │   ├── core_armv8mml.h +│   │   │   │   ├── core_cm0.h +│   │   │   │   ├── core_cm0plus.h +│   │   │   │   ├── core_cm1.h +│   │   │   │   ├── core_cm23.h +│   │   │   │   ├── core_cm33.h +│   │   │   │   ├── core_cm3.h +│   │   │   │   ├── core_cm4.h +│   │   │   │   ├── core_cm7.h +│   │   │   │   ├── core_sc000.h +│   │   │   │   ├── core_sc300.h +│   │   │   │   ├── mpu_armv7.h +│   │   │   │   ├── mpu_armv8.h +│   │   │   │   └── tz_context.h │   │   │   ├── STM32F4xx_HAL_Driver │   │   │   │   ├── Inc +│   │   │   │   │   ├── Legacy +│   │   │   │   │   │   └── stm32_hal_legacy.h +│   │   │   │   │   ├── stm32f4xx_hal_cortex.h +│   │   │   │   │   ├── stm32f4xx_hal_def.h +│   │   │   │   │   ├── stm32f4xx_hal_dma_ex.h +│   │   │   │   │   ├── stm32f4xx_hal_dma.h +│   │   │   │   │   ├── stm32f4xx_hal_exti.h +│   │   │   │   │   ├── stm32f4xx_hal_flash_ex.h +│   │   │   │   │   ├── stm32f4xx_hal_flash.h +│   │   │   │   │   ├── stm32f4xx_hal_flash_ramfunc.h +│   │   │   │   │   ├── stm32f4xx_hal_gpio_ex.h +│   │   │   │   │   ├── stm32f4xx_hal_gpio.h +│   │   │   │   │   ├── stm32f4xx_hal.h +│   │   │   │   │   ├── stm32f4xx_hal_hcd.h +│   │   │   │   │   ├── stm32f4xx_hal_pwr_ex.h +│   │   │   │   │   ├── stm32f4xx_hal_pwr.h +│   │   │   │   │   ├── stm32f4xx_hal_rcc_ex.h +│   │   │   │   │   ├── stm32f4xx_hal_rcc.h +│   │   │   │   │   ├── stm32f4xx_hal_tim_ex.h +│   │   │   │   │   ├── stm32f4xx_hal_tim.h +│   │   │   │   │   ├── stm32f4xx_hal_uart.h +│   │   │   │   │   └── stm32f4xx_ll_usb.h │   │   │   │   └── Src +│   │   │   │   ├── stm32f4xx_hal.c +│   │   │   │   ├── stm32f4xx_hal_cortex.c +│   │   │   │   ├── stm32f4xx_hal_dma.c +│   │   │   │   ├── stm32f4xx_hal_dma_ex.c +│   │   │   │   ├── stm32f4xx_hal_exti.c +│   │   │   │   ├── stm32f4xx_hal_flash.c +│   │   │   │   ├── stm32f4xx_hal_flash_ex.c +│   │   │   │   ├── stm32f4xx_hal_flash_ramfunc.c +│   │   │   │   ├── stm32f4xx_hal_gpio.c +│   │   │   │   ├── stm32f4xx_hal_hcd.c +│   │   │   │   ├── stm32f4xx_hal_pwr.c +│   │   │   │   ├── stm32f4xx_hal_pwr_ex.c +│   │   │   │   ├── stm32f4xx_hal_rcc.c +│   │   │   │   ├── stm32f4xx_hal_rcc_ex.c +│   │   │   │   ├── stm32f4xx_hal_tim.c +│   │   │   │   ├── stm32f4xx_hal_tim_ex.c +│   │   │   │   ├── stm32f4xx_hal_uart.c +│   │   │   │   └── stm32f4xx_ll_usb.c │   │   │   └── USB_HOST │   │   │   ├── App │   │   │   │   ├── usb_host.c @@ -422,11 +619,65 @@ The following portions of the DJI’s Payload SDK (“Software” referred to in │   │   │   └── FreeRTOS │   │   │   └── Source │   │   │   ├── CMSIS_RTOS +│   │   │   │   ├── cmsis_os.c +│   │   │   │   └── cmsis_os.h │   │   │   ├── croutine.c │   │   │   ├── event_groups.c │   │   │   ├── include +│   │   │   │   ├── atomic.h +│   │   │   │   ├── croutine.h +│   │   │   │   ├── deprecated_definitions.h +│   │   │   │   ├── event_groups.h +│   │   │   │   ├── FreeRTOS.h +│   │   │   │   ├── list.h +│   │   │   │   ├── message_buffer.h +│   │   │   │   ├── mpu_prototypes.h +│   │   │   │   ├── mpu_wrappers.h +│   │   │   │   ├── portable.h +│   │   │   │   ├── projdefs.h +│   │   │   │   ├── queue.h +│   │   │   │   ├── semphr.h +│   │   │   │   ├── stack_macros.h +│   │   │   │   ├── StackMacros.h +│   │   │   │   ├── stream_buffer.h +│   │   │   │   ├── task.h +│   │   │   │   └── timers.h │   │   │   ├── list.c │   │   │   ├── portable +│   │   │   │   ├── GCC +│   │   │   │   │   └── ARM_CM4F +│   │   │   │   │   ├── port.c +│   │   │   │   │   └── portmacro.h +│   │   │   │   ├── MemMang +│   │   │   │   │   └── heap_4.c +│   │   │   │   └── RVDS +│   │   │   │   ├── ARM7_LPC21xx +│   │   │   │   │   ├── portASM.s +│   │   │   │   │   ├── port.c +│   │   │   │   │   ├── portmacro.h +│   │   │   │   │   └── portmacro.inc +│   │   │   │   ├── ARM_CA9 +│   │   │   │   │   ├── portASM.s +│   │   │   │   │   ├── port.c +│   │   │   │   │   ├── portmacro.h +│   │   │   │   │   └── portmacro.inc +│   │   │   │   ├── ARM_CM0 +│   │   │   │   │   ├── port.c +│   │   │   │   │   └── portmacro.h +│   │   │   │   ├── ARM_CM3 +│   │   │   │   │   ├── port.c +│   │   │   │   │   └── portmacro.h +│   │   │   │   ├── ARM_CM4F +│   │   │   │   │   ├── port.c +│   │   │   │   │   └── portmacro.h +│   │   │   │   ├── ARM_CM4_MPU +│   │   │   │   │   ├── port.c +│   │   │   │   │   └── portmacro.h +│   │   │   │   └── ARM_CM7 +│   │   │   │   ├── r0p1 +│   │   │   │   │   ├── port.c +│   │   │   │   │   └── portmacro.h +│   │   │   │   └── ReadMe.txt │   │   │   ├── queue.c │   │   │   ├── stream_buffer.c │   │   │   ├── tasks.c @@ -446,9 +697,19 @@ The following portions of the DJI’s Payload SDK (“Software” referred to in │   │   ├── camera_manager │   │   │   ├── test_camera_manager_entry.cpp │   │   │   └── test_camera_manager_entry.h +│   │   ├── flight_controller +│   │   │   ├── config +│   │   │   │   └── flying_config.json +│   │   │   ├── test_flight_controller_command_flying.cpp +│   │   │   ├── test_flight_controller_command_flying.h +│   │   │   ├── test_flight_controller_entry.cpp +│   │   │   └── test_flight_controller_entry.h │   │   ├── gimbal │   │   │   ├── test_gimbal_entry.cpp │   │   │   └── test_gimbal_entry.hpp +│   │   ├── hms_manager +│   │   │   ├── hms_manager_entry.cpp +│   │   │   └── hms_manager_entry.h │   │   ├── liveview │   │   │   ├── data │   │   │   │   ├── haarcascade_frontalface_alt.xml @@ -486,8 +747,11 @@ The following portions of the DJI’s Payload SDK (“Software” referred to in │   │   ├── application │   │   │   ├── application.cpp │   │   │   ├── application.hpp +│   │   │   ├── dji_config_manager.c +│   │   │   ├── dji_config_manager.h │   │   │   ├── dji_sdk_app_info.h │   │   │   ├── dji_sdk_config.h +│   │   │   ├── dji_sdk_config.json │   │   │   └── main.cpp │   │   ├── CMakeLists.txt │   │   └── hal diff --git a/psdk_lib/include/dji_typedef.h b/psdk_lib/include/dji_typedef.h index c1b7364..ecb5d76 100644 --- a/psdk_lib/include/dji_typedef.h +++ b/psdk_lib/include/dji_typedef.h @@ -122,7 +122,6 @@ typedef enum { DJI_CAMERA_TYPE_H20N = 61, /*!< Camera type is H20N. */ DJI_CAMERA_TYPE_P1 = 50, /*!< Camera type is P1. */ DJI_CAMERA_TYPE_L1, /*!< Camera type is L1. */ - DJI_CAMERA_TYPE_L2, /*!< Camera type is L2. */ DJI_CAMERA_TYPE_M30, /*!< Camera type is M30. */ DJI_CAMERA_TYPE_M30T, /*!< Camera type is M30T. */ DJI_CAMERA_TYPE_M3E, /*!< Camera type is M3E. */ diff --git a/psdk_lib/include/dji_version.h b/psdk_lib/include/dji_version.h index 3ac5aeb..0b7df97 100644 --- a/psdk_lib/include/dji_version.h +++ b/psdk_lib/include/dji_version.h @@ -37,7 +37,7 @@ extern "C" { #define DJI_VERSION_MINOR 6 /*!< 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 1882 /*!< DJI SDK version build info, when jenkins trigger build changes. Range from 0 to 65535. */ +#define DJI_VERSION_BUILD 1883 /*!< DJI SDK version build info, when jenkins trigger build changes. Range from 0 to 65535. */ /* Exported types ------------------------------------------------------------*/ diff --git a/psdk_lib/lib/aarch64-himix100-linux-gcc/libpayloadsdk.a b/psdk_lib/lib/aarch64-himix100-linux-gcc/libpayloadsdk.a index f5fc536..fd8ae12 100644 Binary files a/psdk_lib/lib/aarch64-himix100-linux-gcc/libpayloadsdk.a and b/psdk_lib/lib/aarch64-himix100-linux-gcc/libpayloadsdk.a differ diff --git a/psdk_lib/lib/aarch64-linux-android-gcc/libpayloadsdk.a b/psdk_lib/lib/aarch64-linux-android-gcc/libpayloadsdk.a index 1cb0a9f..c44e71b 100644 Binary files a/psdk_lib/lib/aarch64-linux-android-gcc/libpayloadsdk.a and b/psdk_lib/lib/aarch64-linux-android-gcc/libpayloadsdk.a differ diff --git a/psdk_lib/lib/aarch64-linux-gnu-gcc/libpayloadsdk.a b/psdk_lib/lib/aarch64-linux-gnu-gcc/libpayloadsdk.a index 32d639f..2ec16f5 100644 Binary files a/psdk_lib/lib/aarch64-linux-gnu-gcc/libpayloadsdk.a and b/psdk_lib/lib/aarch64-linux-gnu-gcc/libpayloadsdk.a differ diff --git a/psdk_lib/lib/arm-himix100-linux-gcc/libpayloadsdk.a b/psdk_lib/lib/arm-himix100-linux-gcc/libpayloadsdk.a index 06cbed9..3b27915 100644 Binary files a/psdk_lib/lib/arm-himix100-linux-gcc/libpayloadsdk.a and b/psdk_lib/lib/arm-himix100-linux-gcc/libpayloadsdk.a differ diff --git a/psdk_lib/lib/arm-himix200-linux-gcc/libpayloadsdk.a b/psdk_lib/lib/arm-himix200-linux-gcc/libpayloadsdk.a index 64204ef..939eda1 100644 Binary files a/psdk_lib/lib/arm-himix200-linux-gcc/libpayloadsdk.a and b/psdk_lib/lib/arm-himix200-linux-gcc/libpayloadsdk.a differ diff --git a/psdk_lib/lib/arm-hisiv300-linux-gcc/libpayloadsdk.a b/psdk_lib/lib/arm-hisiv300-linux-gcc/libpayloadsdk.a index 32399b5..be24dc0 100644 Binary files a/psdk_lib/lib/arm-hisiv300-linux-gcc/libpayloadsdk.a and b/psdk_lib/lib/arm-hisiv300-linux-gcc/libpayloadsdk.a differ diff --git a/psdk_lib/lib/arm-hisiv400-linux-gcc/libpayloadsdk.a b/psdk_lib/lib/arm-hisiv400-linux-gcc/libpayloadsdk.a index 5442f17..68090e7 100644 Binary files a/psdk_lib/lib/arm-hisiv400-linux-gcc/libpayloadsdk.a and b/psdk_lib/lib/arm-hisiv400-linux-gcc/libpayloadsdk.a differ diff --git a/psdk_lib/lib/arm-hisiv500-linux-gcc/libpayloadsdk.a b/psdk_lib/lib/arm-hisiv500-linux-gcc/libpayloadsdk.a index bb5cf53..2eff645 100644 Binary files a/psdk_lib/lib/arm-hisiv500-linux-gcc/libpayloadsdk.a and b/psdk_lib/lib/arm-hisiv500-linux-gcc/libpayloadsdk.a differ diff --git a/psdk_lib/lib/arm-hisiv600-linux-gcc/libpayloadsdk.a b/psdk_lib/lib/arm-hisiv600-linux-gcc/libpayloadsdk.a index 1a8245b..a21a6cf 100644 Binary files a/psdk_lib/lib/arm-hisiv600-linux-gcc/libpayloadsdk.a and b/psdk_lib/lib/arm-hisiv600-linux-gcc/libpayloadsdk.a differ diff --git a/psdk_lib/lib/arm-linux-androideabi-gcc/libpayloadsdk.a b/psdk_lib/lib/arm-linux-androideabi-gcc/libpayloadsdk.a index 289c09b..8419e8f 100644 Binary files a/psdk_lib/lib/arm-linux-androideabi-gcc/libpayloadsdk.a and b/psdk_lib/lib/arm-linux-androideabi-gcc/libpayloadsdk.a differ diff --git a/psdk_lib/lib/arm-linux-gnueabi-gcc/libpayloadsdk.a b/psdk_lib/lib/arm-linux-gnueabi-gcc/libpayloadsdk.a index e7420f0..a2156ff 100644 Binary files a/psdk_lib/lib/arm-linux-gnueabi-gcc/libpayloadsdk.a and b/psdk_lib/lib/arm-linux-gnueabi-gcc/libpayloadsdk.a differ diff --git a/psdk_lib/lib/arm-linux-gnueabihf-gcc/libpayloadsdk.a b/psdk_lib/lib/arm-linux-gnueabihf-gcc/libpayloadsdk.a index 883b4a2..50efcb8 100644 Binary files a/psdk_lib/lib/arm-linux-gnueabihf-gcc/libpayloadsdk.a and b/psdk_lib/lib/arm-linux-gnueabihf-gcc/libpayloadsdk.a differ diff --git a/psdk_lib/lib/arm-none-eabi-gcc/libpayloadsdk.a b/psdk_lib/lib/arm-none-eabi-gcc/libpayloadsdk.a index 3ee9822..31e2bd1 100644 Binary files a/psdk_lib/lib/arm-none-eabi-gcc/libpayloadsdk.a and b/psdk_lib/lib/arm-none-eabi-gcc/libpayloadsdk.a differ diff --git a/psdk_lib/lib/armcc_cortex-m4/libpayload.lib b/psdk_lib/lib/armcc_cortex-m4/libpayload.lib index 91a5159..fe625bb 100644 Binary files a/psdk_lib/lib/armcc_cortex-m4/libpayload.lib and b/psdk_lib/lib/armcc_cortex-m4/libpayload.lib differ diff --git a/psdk_lib/lib/x86_64-linux-gnu-gcc/libpayloadsdk.a b/psdk_lib/lib/x86_64-linux-gnu-gcc/libpayloadsdk.a index 109ce90..460a343 100644 Binary files a/psdk_lib/lib/x86_64-linux-gnu-gcc/libpayloadsdk.a and b/psdk_lib/lib/x86_64-linux-gnu-gcc/libpayloadsdk.a differ diff --git a/psdk_lib/lib/xtensa-esp32-elf-gcc/libpayloadsdk.a b/psdk_lib/lib/xtensa-esp32-elf-gcc/libpayloadsdk.a index 18379fb..793fc38 100644 Binary files a/psdk_lib/lib/xtensa-esp32-elf-gcc/libpayloadsdk.a and b/psdk_lib/lib/xtensa-esp32-elf-gcc/libpayloadsdk.a differ diff --git a/samples/sample_c/module_sample/camera_manager/test_camera_manager.c b/samples/sample_c/module_sample/camera_manager/test_camera_manager.c index 4c6f0c4..0bbbb42 100644 --- a/samples/sample_c/module_sample/camera_manager/test_camera_manager.c +++ b/samples/sample_c/module_sample/camera_manager/test_camera_manager.c @@ -55,7 +55,6 @@ static const T_DjiTestCameraTypeStr s_cameraTypeStrList[] = { {DJI_CAMERA_TYPE_H20T, "Zenmuse H20T"}, {DJI_CAMERA_TYPE_P1, "Zenmuse P1"}, {DJI_CAMERA_TYPE_L1, "Zenmuse L1"}, - {DJI_CAMERA_TYPE_L2, "Zenmuse L2"}, {DJI_CAMERA_TYPE_H20N, "Zenmuse H20N"}, {DJI_CAMERA_TYPE_M30, "M30 Camera"}, {DJI_CAMERA_TYPE_M30T, "M30T Camera"}, @@ -907,8 +906,7 @@ T_DjiReturnCode DjiTest_CameraManagerRunSample(E_DjiMountPosition mountPosition, if (cameraType == DJI_CAMERA_TYPE_H20 || cameraType == DJI_CAMERA_TYPE_H20T || cameraType == DJI_CAMERA_TYPE_H20N || cameraType == DJI_CAMERA_TYPE_M30 || cameraType == DJI_CAMERA_TYPE_M30T || cameraType == DJI_CAMERA_TYPE_M3E || - cameraType == DJI_CAMERA_TYPE_M3T || cameraType == DJI_CAMERA_TYPE_M3T || - cameraType == DJI_CAMERA_TYPE_L2) { + cameraType == DJI_CAMERA_TYPE_M3T || cameraType == DJI_CAMERA_TYPE_M3T) { USER_LOG_INFO("Set mounted position %d camera's exposure mode to manual mode.", mountPosition); returnCode = DjiTest_CameraManagerSetExposureMode(mountPosition, @@ -947,7 +945,7 @@ T_DjiReturnCode DjiTest_CameraManagerRunSample(E_DjiMountPosition mountPosition, if (cameraType == DJI_CAMERA_TYPE_H20 || cameraType == DJI_CAMERA_TYPE_H20N || cameraType == DJI_CAMERA_TYPE_H20T || cameraType == DJI_CAMERA_TYPE_M30 || cameraType == DJI_CAMERA_TYPE_M30T || cameraType == DJI_CAMERA_TYPE_M3E - || cameraType == DJI_CAMERA_TYPE_M3T || cameraType == DJI_CAMERA_TYPE_L2) { + || cameraType == DJI_CAMERA_TYPE_M3T) { USER_LOG_INFO("Set mounted position %d camera's exposure mode to manual mode.", mountPosition); returnCode = DjiTest_CameraManagerSetExposureMode(mountPosition, @@ -1253,8 +1251,8 @@ T_DjiReturnCode DjiTest_CameraManagerRunSample(E_DjiMountPosition mountPosition, if (cameraType == DJI_CAMERA_TYPE_XT2 || cameraType == DJI_CAMERA_TYPE_XTS || cameraType == DJI_CAMERA_TYPE_H20 || cameraType == DJI_CAMERA_TYPE_P1 || - cameraType == DJI_CAMERA_TYPE_L1 || cameraType == DJI_CAMERA_TYPE_L2 || - cameraType == DJI_CAMERA_TYPE_M3E || cameraType == DJI_CAMERA_TYPE_M3T) { + cameraType == DJI_CAMERA_TYPE_L1 || cameraType == DJI_CAMERA_TYPE_M3E || + cameraType == DJI_CAMERA_TYPE_M3T) { USER_LOG_INFO("Camera type %d does not support night scene mode!", cameraType); goto exitCameraModule; }