潘浩彬 / JZSDK_Linux · 提交

转到一个项目

作者 ookk303
提交 c5cd8767b477ccf3556b5dc2b280347c692a9138 1 个父辈 021f0ac8

相机更新

内嵌 并排对比
正在显示 39 个修改的文件 包含 517 行增加 和 192 行删除
@@ -87,7 +87,19 @@ @@ -87,7 +87,19 @@
87 "gimbal.h": "c", 87 "gimbal.h": "c",
88 "jzsdk_uart_uartdeal.h": "c", 88 "jzsdk_uart_uartdeal.h": "c",
89 "powermanager_inandout.h": "c", 89 "powermanager_inandout.h": "c",
90 - "jzsdk_definecode.h": "c" 90 + "jzsdk_definecode.h": "c",
  91 + "jzsdk_devicecode.h": "c",
  92 + "opus.h": "c",
  93 + "jzsdk_hal.h": "c",
  94 + "commonmod.h": "c",
  95 + "gimbal_specialuart.h": "c",
  96 + "megaphone_opus.h": "c",
  97 + "megaphone_audiofile.h": "c",
  98 + "dji_typedef.h": "c",
  99 + "jzsdk_flagcode.h": "c",
  100 + "jzsdk_typedef.h": "c",
  101 + "jzsdk_errorcode.h": "c",
  102 + "jzsdk_portcode.h": "c"
91 }, 103 },
92 "Codegeex.GenerationPreference": "automatic", 104 "Codegeex.GenerationPreference": "automatic",
93 "C_Cpp.dimInactiveRegions": false 105 "C_Cpp.dimInactiveRegions": false
1 # 编译链的配置 1 # 编译链的配置
2 2
3 #1、编译链与设备类型的选择 3 #1、编译链与设备类型的选择
4 -set(DEVICE_NAME JZ_H1T) 4 +set(DEVICE_NAME JZ_C1)
5 #上一行为禁止修改行 5 #上一行为禁止修改行
6 6
7 message("**************************JZSDK构建编译开始***************************\n") 7 message("**************************JZSDK构建编译开始***************************\n")
@@ -27,10 +27,6 @@ file(GLOB_RECURSE JZSDK_HAL_SRC ${ROOT_DIRS}JZsdk_hal/*.c) @@ -27,10 +27,6 @@ file(GLOB_RECURSE JZSDK_HAL_SRC ${ROOT_DIRS}JZsdk_hal/*.c)
27 list(APPEND ALL_SRC_FILES ${JZSDK_HAL_SRC}) 27 list(APPEND ALL_SRC_FILES ${JZSDK_HAL_SRC})
28 list(APPEND ALL_INC_FILES ${ROOT_DIRS}JZsdk_hal) 28 list(APPEND ALL_INC_FILES ${ROOT_DIRS}JZsdk_hal)
29 29
30 -file(GLOB_RECURSE JZSDK_OSAL_SRC ${ROOT_DIRS}JZsdk_osal/*.c)  
31 -list(APPEND ALL_SRC_FILES ${JZSDK_OSAL_SRC})  
32 -list(APPEND ALL_INC_FILES ${ROOT_DIRS}JZsdk_osal)  
33 -  
34 message("\nJZSDK基础代码加载完毕\n") 30 message("\nJZSDK基础代码加载完毕\n")
35 31
36 #如果要加载设备信息模块，需要加载以下附属内容 32 #如果要加载设备信息模块，需要加载以下附属内容
@@ -104,6 +100,7 @@ if(${MEDIA_PROC_MODULE} STREQUAL "VERSION_SWITCH_ON") @@ -104,6 +100,7 @@ if(${MEDIA_PROC_MODULE} STREQUAL "VERSION_SWITCH_ON")
104 set(LIB_USB VERSION_SWITCH_ON) 100 set(LIB_USB VERSION_SWITCH_ON)
105 101
106 if(${IRC_MODULE} STREQUAL "VERSION_SWITCH_ON") 102 if(${IRC_MODULE} STREQUAL "VERSION_SWITCH_ON")
  103 + message("加载昆腾红外相机模块")
107 set(LIB_KT_IRC VERSION_SWITCH_ON) 104 set(LIB_KT_IRC VERSION_SWITCH_ON)
108 105
109 endif() 106 endif()
@@ -177,13 +177,16 @@ endif() @@ -177,13 +177,16 @@ endif()
177 177
178 #kt_IRC库 178 #kt_IRC库
179 if(${LIB_KT_IRC} STREQUAL "VERSION_SWITCH_ON") 179 if(${LIB_KT_IRC} STREQUAL "VERSION_SWITCH_ON")
  180 +
  181 + add_definitions(-DMACRO_KTIRC_MODULE)
  182 +
180 message("ktIRC库已加载\n") 183 message("ktIRC库已加载\n")
181 include_directories(${ROOT_DIRS}/ThirdParty/KT_IRC/include) 184 include_directories(${ROOT_DIRS}/ThirdParty/KT_IRC/include)
182 target_link_libraries( 185 target_link_libraries(
183 ${PROJECT_NAME} 186 ${PROJECT_NAME}
184 - ${ROOT_DIRS}/ThirdParty/KT_IRC/aarch64-none-linux-gnu/lib/libktlib.so 187 + ${ROOT_DIRS}/ThirdParty/KT_IRC/aarch64-none-linux-gnu/lib/libm330aarchx64.so
185 ) 188 )
186 - add_definitions(-DMACRO_KTIRC_MODULE) 189 +
187 endif() 190 endif()
188 191
189 message("**************************动态库加载完毕***************************\n") 192 message("**************************动态库加载完毕***************************\n")
@@ -24,8 +24,8 @@ extern "C" { @@ -24,8 +24,8 @@ extern "C" {
24 #include "./JZsdk_ReturnCode.h" 24 #include "./JZsdk_ReturnCode.h"
25 #include "./JZsdk_FileType.h" 25 #include "./JZsdk_FileType.h"
26 #include "./JZsdk_WidgetCode.h" 26 #include "./JZsdk_WidgetCode.h"
27 -#include "./JZsdk_DefineCode.h"  
28 #include "./JZsdk_DeviceCode.h" 27 #include "./JZsdk_DeviceCode.h"
  28 +#include "./JZsdk_DefineCode.h"
29 29
30 /* Exported types ------------------------------------------------------------*/ 30 /* Exported types ------------------------------------------------------------*/
31 31
@@ -10,6 +10,4 @@ @@ -10,6 +10,4 @@
10 unsigned char *JZsdk_GetDeviceName() 10 unsigned char *JZsdk_GetDeviceName()
11 { 11 {
12 12
13 -  
14 - return  
15 } 13 }
@@ -36,31 +36,51 @@ typedef enum FirmwarePlace @@ -36,31 +36,51 @@ typedef enum FirmwarePlace
36 }FirmwarePlace; 36 }FirmwarePlace;
37 37
38 //加载开关 38 //加载开关
39 -typedef enum VersionLoadSwitch  
40 -{  
41 - VERSION_SWITCH_ON = 0x0001, //加载  
42 - VERSION_SWITCH_OFF = 0x0000, //不加载  
43 -}VersionLoadSwitch; 39 +// typedef enum VersionLoadSwitch
  40 +// {
  41 +// VERSION_SWITCH_ON = 0x0001, //加载
  42 +// VERSION_SWITCH_OFF = 0x0000, //不加载
  43 +// }VersionLoadSwitch;
44 44
45 -//设备名  
46 -typedef enum DeviceName  
47 -{  
48 - JZ_H1E = 0x0011, //H1E  
49 - JZ_H1T = 0x0016, //H1T  
50 - JZ_U3 = 0x0017, //U3  
51 - JZ_U3S = 0x0018, //U3S  
52 - JZ_U3D = 0x0019, //U3D  
53 - JZ_U30 = 0x001A, //U30  
54 - JZ_H150S = 0x0013, //H150S  
55 - JZ_H150T = 0x0015, //H150T  
56 - JZ_H10 = 0x0012, //H10  
57 - JZ_H10T = 0x0014, //H10T  
58 - TF_A1 = 0x1010, //TF-A1  
59 - JZ_C1 = 0x1011, //C1  
60 -  
61 -}DeviceName; 45 +#define VERSION_SWITCH_ON 0x0001 //加载
  46 +#define VERSION_SWITCH_OFF 0x0000 //不加载
  47 +
  48 +// //设备名
  49 +// typedef enum DeviceName
  50 +// {
  51 +// JZ_H1E = 0x0011, //H1E
  52 +// JZ_H1T = 0x0016, //H1T
  53 +// JZ_U3 = 0x0017, //U3
  54 +// JZ_U3S = 0x0018, //U3S
  55 +// JZ_U3D = 0x0019, //U3D
  56 +// JZ_U30 = 0x001A, //U30
  57 +// JZ_H150S = 0x0013, //H150S
  58 +// JZ_H150T = 0x0015, //H150T
  59 +// JZ_H10 = 0x0012, //H10
  60 +// JZ_H10T = 0x0014, //H10T
  61 +// TF_A1 = 0x1010, //TF-A1
  62 +// JZ_C1 = 0x1011, //C1
  63 +
  64 +// }DeviceName;
  65 +
  66 +//设备选择
  67 +#define JZ_H1E 0x0011
  68 +
  69 +#define JZ_H1T 0x0016
  70 +
  71 +#define JZ_U3 0x0017
  72 +#define JZ_U3S 0x0018
  73 +#define JZ_U3D 0x0019
  74 +#define JZ_U30 0x001A
  75 +
  76 +#define JZ_H150S 0x0013
  77 +#define JZ_H150T 0x0015
62 78
  79 +#define JZ_H10 0x0012
  80 +#define JZ_H10T 0x0014
63 81
  82 +#define TF_A1 0x1010
  83 +#define JZ_C1 0x1011
64 84
65 85
66 /*********************************** 86 /***********************************
  1 +// #include "../JZsdk_Code/JZsdk_Code.h"
  2 +// #include "./JZsdk_Osal.h"
  3 +
  4 +// T_JZsdkReturnCode JZsdk_Osal_TaskCreate(const char *name, void *(*taskFunc)(void *), uint32_t stackSize, void *arg,
  5 +// T_JzTaskHandle *task)
  1 +/**
  2 + ********************************************************************
  3 + * @file JZsdk_Osal.h
  4 + * JZsdk_Osal.c 的头文件
  5 + *
  6 + *********************************************************************
  7 + */
  8 +
  9 +/* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/
  10 +#ifndef JZSDK_OSAL_H
  11 +#define JZSDK_OSAL_H
  12 +
  13 +/* Includes ------------------------------------------------------------------*/
  14 +#include "../JZsdk_Code/JZsdk_Code.h"
  15 +
  16 +#ifdef __cplusplus
  17 +extern "C" {
  18 +#endif
  19 +
  20 +/* Exported constants --------------------------------------------------------*/
  21 +/* 常亮定义*/
  22 +
  23 +typedef void *T_JzTaskHandle;
  24 +
  25 +/* Exported types ------------------------------------------------------------*/
  26 +
  27 +
  28 +/* Exported functions --------------------------------------------------------*/
  29 +
  30 +
  31 +#ifdef __cplusplus
  32 +}
  33 +#endif
  34 +
  35 +#endif
  36 +/************************ (C) COPYRIGHT DJI Innovations *******END OF FILE******/
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
32 #ifdef MEGAPHONE_CONFIG_STATUS_ON 32 #ifdef MEGAPHONE_CONFIG_STATUS_ON
33 #include "AudioDeal/AudioDeal.h" 33 #include "AudioDeal/AudioDeal.h"
34 #include "Megaphone/Megaphone.h" 34 #include "Megaphone/Megaphone.h"
  35 + extern int MegaphoneStatusFlag;
35 #endif 36 #endif
36 37
37 #ifdef SIDE_LASER_STATUS_ON 38 #ifdef SIDE_LASER_STATUS_ON
@@ -42,7 +43,7 @@ static int Main_WorkMode(); @@ -42,7 +43,7 @@ static int Main_WorkMode();
42 static void *Main_WorkModeTask(void *arg); 43 static void *Main_WorkModeTask(void *arg);
43 static int WorkMode = JZ_FLAGCODE_OFF; 44 static int WorkMode = JZ_FLAGCODE_OFF;
44 45
45 -extern int MegaphoneStatusFlag; 46 +
46 static int g_All_filter_Mode = JZ_FLAGCODE_OFF; //用于m30的滤波开关 47 static int g_All_filter_Mode = JZ_FLAGCODE_OFF; //用于m30的滤波开关
47 static int StartupPriorityNum = JZ_FLAGCODE_OFF; //优先启动项值 48 static int StartupPriorityNum = JZ_FLAGCODE_OFF; //优先启动项值
48 49
@@ -728,12 +729,13 @@ static void *Main_WorkModeTask(void *arg) @@ -728,12 +729,13 @@ static void *Main_WorkModeTask(void *arg)
728 delayMs(1000);//延迟一秒钟 729 delayMs(1000);//延迟一秒钟
729 printf("计数%d\n",i); 730 printf("计数%d\n",i);
730 731
  732 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
731 if (start_voice_flag == JZ_FLAGCODE_OFF && MegaphoneStatusFlag == JZ_FLAGCODE_ON) 733 if (start_voice_flag == JZ_FLAGCODE_OFF && MegaphoneStatusFlag == JZ_FLAGCODE_ON)
732 { 734 {
733 start_voice_flag = JZ_FLAGCODE_ON; 735 start_voice_flag = JZ_FLAGCODE_ON;
734 Start_voice(); 736 Start_voice();
735 } 737 }
736 - 738 +#endif
737 if (WorkMode == JZ_FLAGCODE_ON) 739 if (WorkMode == JZ_FLAGCODE_ON)
738 { 740 {
739 printf("串口连接成功,进入串口模式\n"); 741 printf("串口连接成功,进入串口模式\n");
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 #include "version_choose.h" 14 #include "version_choose.h"
15 #include "JZsdkLib.h" 15 #include "JZsdkLib.h"
16 #include "./ParamterParsing.h" 16 #include "./ParamterParsing.h"
  17 +#include "JZsdk_Base/JZsdk_Code/JZsdk_DeviceCode.h"
17 18
18 #ifdef __cplusplus 19 #ifdef __cplusplus
19 extern "C" { 20 extern "C" {
@@ -5,23 +5,24 @@ @@ -5,23 +5,24 @@
5 ***********************************************/ 5 ***********************************************/
6 #ifndef VERSION_CHOOSE_H 6 #ifndef VERSION_CHOOSE_H
7 #define VERSION_CHOOSE_H 7 #define VERSION_CHOOSE_H
8 -  
9 -#include "JZsdk_Base/JZsdk_Code/JZsdk_DeviceNameCode.h"  
10 - 8 +#include "JZsdk_Base/JZsdk_Code/JZsdk_DeviceCode.h"
11 //1~10行 除了D可以修改版本选择 禁止动任何东西 9 //1~10行 除了D可以修改版本选择 禁止动任何东西
12 -#define DEVICE_VERSION JZ_H1T 10 +#define DEVICE_VERSION JZ_C1
13 11
14 //禁止修改行 选择是串口程序 还是 psdk程序 12 //禁止修改行 选择是串口程序 还是 psdk程序
15 -#define APP_VERSION APP_UART 13 +#define APP_VERSION APP_PSDK
16 14
17 //禁止修改行 板子型号 15 //禁止修改行 板子型号
18 #define PLATFORM_VERSION PLATFORM_V3S 16 #define PLATFORM_VERSION PLATFORM_V3S
19 17
20 //禁止修改行 串口连接程序的软件版本号 18 //禁止修改行 串口连接程序的软件版本号
21 -#define MAJOR_VERSION 0x00  
22 -#define MINOR_VERSION 0x00  
23 -#define MODIFY_VERSION 0x02  
24 -#define DEBUG_VERSION 0x12 19 +#define MAJOR_VERSION 0x01
  20 +#define MINOR_VERSION 0x03
  21 +#define MODIFY_VERSION 0x09
  22 +#define DEBUG_VERSION 0x07
  23 +
  24 +//禁止修改行 滤波方式
  25 +#define FILTERING_TYPE HIGH_PASS_FILTERING
25 26
26 //禁止修改行固件属地 目前 国内版/海外版 27 //禁止修改行固件属地 目前 国内版/海外版
27 #define FIRMWARE_ORIGIN DOMESTIC_VERSION 28 #define FIRMWARE_ORIGIN DOMESTIC_VERSION
@@ -53,7 +54,7 @@ @@ -53,7 +54,7 @@
53 #endif 54 #endif
54 55
55 //是否加载ktirclib 56 //是否加载ktirclib
56 - #ifdef DMACRO_KTIRC_MODULE 57 + #ifdef MACRO_KTIRC_MODULE
57 #define KTIRC_LIB_STATUS_ON 58 #define KTIRC_LIB_STATUS_ON
58 #endif 59 #endif
59 60
@@ -18,9 +18,9 @@ @@ -18,9 +18,9 @@
18 #include "Hal_Send/HalSend.h" 18 #include "Hal_Send/HalSend.h"
19 #include "JZsdk_Hal.h" 19 #include "JZsdk_Hal.h"
20 20
21 -#if (MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON) 21 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
22 #include "Megaphone/Megaphone.h" 22 #include "Megaphone/Megaphone.h"
23 - #include "Megaphone/AudioFile/Megaphone_AudioFile.h" 23 + #include "Megaphone/Music/AudioFile/Megaphone_AudioFile.h"
24 #endif 24 #endif
25 25
26 static int HalRecvMode = JZ_FLAGCODE_OFF; 26 static int HalRecvMode = JZ_FLAGCODE_OFF;
@@ -332,7 +332,7 @@ static T_JZsdkReturnCode RecvDeal_RealTimeMP2_start(int Port, char *getbuf) @@ -332,7 +332,7 @@ static T_JZsdkReturnCode RecvDeal_RealTimeMP2_start(int Port, char *getbuf)
332 } 332 }
333 333
334 //3、打开实时MP2模式 334 //3、打开实时MP2模式
335 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 335 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
336 ret = Megaphone_RealTimeMP2_start(); 336 ret = Megaphone_RealTimeMP2_start();
337 337
338 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 338 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -387,7 +387,7 @@ static T_JZsdkReturnCode RecvDeal_RealTimeMP2_Limit_transmission(int Port, char @@ -387,7 +387,7 @@ static T_JZsdkReturnCode RecvDeal_RealTimeMP2_Limit_transmission(int Port, char
387 JZSDK_LOG_DEBUG("%s,MP2实时喊话定长制传输中 长度:%d 总长度:%d",JZsdk_DefineCode_GetPortName(Port), DataLen, HalRecvDataLen); 387 JZSDK_LOG_DEBUG("%s,MP2实时喊话定长制传输中 长度:%d 总长度:%d",JZsdk_DefineCode_GetPortName(Port), DataLen, HalRecvDataLen);
388 388
389 //传输数据接口 389 //传输数据接口
390 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 390 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
391 ret = Megaphone_RealTimeMP2_trans(getbuf+9, DataLen); 391 ret = Megaphone_RealTimeMP2_trans(getbuf+9, DataLen);
392 #endif 392 #endif
393 393
@@ -424,7 +424,7 @@ static T_JZsdkReturnCode RecvDeal_RealTimeMP2_stop(int Port, char *getbuf) @@ -424,7 +424,7 @@ static T_JZsdkReturnCode RecvDeal_RealTimeMP2_stop(int Port, char *getbuf)
424 424
425 //2、关闭实时MP2模式 425 //2、关闭实时MP2模式
426 ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 426 ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
427 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 427 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
428 ret = Megaphone_RealTimeMP2_stop(); 428 ret = Megaphone_RealTimeMP2_stop();
429 #endif 429 #endif
430 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 430 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -472,7 +472,7 @@ static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_start(int Port, char *getbu @@ -472,7 +472,7 @@ static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_start(int Port, char *getbu
472 memcpy(FileName, &getbuf[9], FileNameLen); 472 memcpy(FileName, &getbuf[9], FileNameLen);
473 JZSDK_LOG_INFO("保存的文件名为%s",FileName); 473 JZSDK_LOG_INFO("保存的文件名为%s",FileName);
474 474
475 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 475 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
476 476
477 ret = Megaphone_SaveAudioFileStart(FileName); 477 ret = Megaphone_SaveAudioFileStart(FileName);
478 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 478 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -526,7 +526,7 @@ static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_LimitTransmission(int Port, @@ -526,7 +526,7 @@ static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_LimitTransmission(int Port,
526 //JZSDK_LOG_DEBUG("%s,传输定长音频文件中 ,一共传输了%d字节",JZsdk_DefineCode_GetPortName(Port), HalRecvDataLen); 526 //JZSDK_LOG_DEBUG("%s,传输定长音频文件中 ,一共传输了%d字节",JZsdk_DefineCode_GetPortName(Port), HalRecvDataLen);
527 527
528 //传输数据接口 528 //传输数据接口
529 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 529 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
530 Megaphone_SaveAudioFileTrans(getbuf+9, DataLen); 530 Megaphone_SaveAudioFileTrans(getbuf+9, DataLen);
531 #endif 531 #endif
532 532
@@ -555,7 +555,7 @@ static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_stop(int Port, char *getbuf @@ -555,7 +555,7 @@ static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_stop(int Port, char *getbuf
555 } 555 }
556 556
557 //1、保存音频数据 557 //1、保存音频数据
558 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 558 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
559 Megaphone_SaveAudioFileStop(JZ_FLAGCODE_OFF, NULL); 559 Megaphone_SaveAudioFileStop(JZ_FLAGCODE_OFF, NULL);
560 #endif 560 #endif
561 561
@@ -625,7 +625,7 @@ static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_stop_and_check(int Port, ch @@ -625,7 +625,7 @@ static T_JZsdkReturnCode RecvDeal_SaveAudioFileTrans_stop_and_check(int Port, ch
625 } 625 }
626 626
627 //1、保存音频数据 627 //1、保存音频数据
628 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 628 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
629 ret = Megaphone_SaveAudioFileStop(checkType, checkCode); 629 ret = Megaphone_SaveAudioFileStop(checkType, checkCode);
630 if (ret == JZ_ERROR_CHECKCODE_CHECK_ERROR) 630 if (ret == JZ_ERROR_CHECKCODE_CHECK_ERROR)
631 { 631 {
@@ -821,7 +821,7 @@ static T_JZsdkReturnCode RecvDeal_audio_GetMusicList(int Port, char *getbuf) @@ -821,7 +821,7 @@ static T_JZsdkReturnCode RecvDeal_audio_GetMusicList(int Port, char *getbuf)
821 //获取帧的序列号 821 //获取帧的序列号
822 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 822 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
823 823
824 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 824 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
825 825
826 //刷新歌曲列表 826 //刷新歌曲列表
827 Megaphone_Flush_MusicList(); 827 Megaphone_Flush_MusicList();
@@ -978,7 +978,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_AudioDetailMessage(int Port, char @@ -978,7 +978,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_AudioDetailMessage(int Port, char
978 978
979 JZSDK_LOG_INFO("解析%s",AudioName); 979 JZSDK_LOG_INFO("解析%s",AudioName);
980 980
981 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 981 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
982 982
983 if (ListBelong == 0) 983 if (ListBelong == 0)
984 { 984 {
@@ -1083,7 +1083,7 @@ static T_JZsdkReturnCode RecvDeal_Amplifier_stop(int Port, char *getbuf) @@ -1083,7 +1083,7 @@ static T_JZsdkReturnCode RecvDeal_Amplifier_stop(int Port, char *getbuf)
1083 1083
1084 int status = JZ_FLAGCODE_OFF; 1084 int status = JZ_FLAGCODE_OFF;
1085 1085
1086 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 1086 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
1087 1087
1088 //先关闭播放 1088 //先关闭播放
1089 ret = UIcontrol_StopPlayAudio(NO_SPECIFIED); 1089 ret = UIcontrol_StopPlayAudio(NO_SPECIFIED);
@@ -1118,7 +1118,7 @@ static T_JZsdkReturnCode RecvDeal_Amplifier_open(int Port, char *getbuf) @@ -1118,7 +1118,7 @@ static T_JZsdkReturnCode RecvDeal_Amplifier_open(int Port, char *getbuf)
1118 1118
1119 int status = JZ_FLAGCODE_ON; 1119 int status = JZ_FLAGCODE_ON;
1120 1120
1121 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 1121 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
1122 1122
1123 //先关闭播放 1123 //先关闭播放
1124 ret = UIcontrol_StopPlayAudio(NO_SPECIFIED); 1124 ret = UIcontrol_StopPlayAudio(NO_SPECIFIED);
@@ -1197,7 +1197,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_volume(int Port, char *getbuf) @@ -1197,7 +1197,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_volume(int Port, char *getbuf)
1197 1197
1198 //1、获取本地的音量 1198 //1、获取本地的音量
1199 int volume; 1199 int volume;
1200 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 1200 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
1201 Megaphone_param(JZ_FLAGCODE_GET, MEGAPHONE_VOLUME, &volume); 1201 Megaphone_param(JZ_FLAGCODE_GET, MEGAPHONE_VOLUME, &volume);
1202 #endif 1202 #endif
1203 1203
@@ -1225,7 +1225,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_play(int Port, char *getbuf) @@ -1225,7 +1225,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_play(int Port, char *getbuf)
1225 1225
1226 //1、获取播放状态 1226 //1、获取播放状态
1227 int status; 1227 int status;
1228 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 1228 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
1229 Megaphone_param(JZ_FLAGCODE_GET, MEGAPHONE_PLAY_STATUS, &status); 1229 Megaphone_param(JZ_FLAGCODE_GET, MEGAPHONE_PLAY_STATUS, &status);
1230 #endif 1230 #endif
1231 1231
@@ -1311,7 +1311,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_PLayFileName(int Port, char *getbu @@ -1311,7 +1311,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_PLayFileName(int Port, char *getbu
1311 //1、获取名字与长度 1311 //1、获取名字与长度
1312 char MusicName[128]; 1312 char MusicName[128];
1313 int MusicName_Len = 0; 1313 int MusicName_Len = 0;
1314 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 1314 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
1315 Megaphone_get_play_FileName(MusicName, &MusicName_Len); 1315 Megaphone_get_play_FileName(MusicName, &MusicName_Len);
1316 #endif 1316 #endif
1317 1317
@@ -1381,7 +1381,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_LoopPlay(int Port, char *getbuf) @@ -1381,7 +1381,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_LoopPlay(int Port, char *getbuf)
1381 //1、获取循环状态 1381 //1、获取循环状态
1382 int LoopStatus = 0; 1382 int LoopStatus = 0;
1383 1383
1384 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 1384 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
1385 Megaphone_param(JZ_FLAGCODE_GET, MEGAPHONE_LOOP, &LoopStatus); 1385 Megaphone_param(JZ_FLAGCODE_GET, MEGAPHONE_LOOP, &LoopStatus);
1386 #endif 1386 #endif
1387 1387
@@ -1418,7 +1418,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_TTS_tone(int Port, char *getbuf) @@ -1418,7 +1418,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_TTS_tone(int Port, char *getbuf)
1418 //1、获取音色 1418 //1、获取音色
1419 int TTS_tone = 0; 1419 int TTS_tone = 0;
1420 1420
1421 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 1421 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
1422 Megaphone_TTS_param(JZ_FLAGCODE_GET, MEGAPHONE_TTS_TONE, &TTS_tone); 1422 Megaphone_TTS_param(JZ_FLAGCODE_GET, MEGAPHONE_TTS_TONE, &TTS_tone);
1423 #endif 1423 #endif
1424 1424
@@ -1458,7 +1458,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_TTS_speed(int Port, char *getbuf) @@ -1458,7 +1458,7 @@ static T_JZsdkReturnCode RecvDeal_CheckStatus_TTS_speed(int Port, char *getbuf)
1458 //1、获取语速 1458 //1、获取语速
1459 int TTS_speed = 0; 1459 int TTS_speed = 0;
1460 1460
1461 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 1461 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
1462 Megaphone_TTS_param(JZ_FLAGCODE_GET, MEGAPHONE_TTS_SPEED, &TTS_speed); 1462 Megaphone_TTS_param(JZ_FLAGCODE_GET, MEGAPHONE_TTS_SPEED, &TTS_speed);
1463 #endif 1463 #endif
1464 1464
@@ -1569,7 +1569,7 @@ static T_JZsdkReturnCode RecvDeal_Delete_Audio(int Port, char *getbuf) @@ -1569,7 +1569,7 @@ static T_JZsdkReturnCode RecvDeal_Delete_Audio(int Port, char *getbuf)
1569 JZsdk_RunSystemCmd(cmd); 1569 JZsdk_RunSystemCmd(cmd);
1570 1570
1571 //4、刷新歌曲列表 1571 //4、刷新歌曲列表
1572 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 1572 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
1573 Megaphone_Flush_MusicList(); 1573 Megaphone_Flush_MusicList();
1574 #endif 1574 #endif
1575 1575
@@ -1608,7 +1608,7 @@ static T_JZsdkReturnCode RecvDeal_Delete_VoiceRecord(int Port, char *getbuf) @@ -1608,7 +1608,7 @@ static T_JZsdkReturnCode RecvDeal_Delete_VoiceRecord(int Port, char *getbuf)
1608 JZsdk_RunSystemCmd(cmd); 1608 JZsdk_RunSystemCmd(cmd);
1609 1609
1610 //4、刷新歌曲列表 1610 //4、刷新歌曲列表
1611 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 1611 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
1612 Megaphone_Flush_MusicList(); 1612 Megaphone_Flush_MusicList();
1613 #endif 1613 #endif
1614 1614
@@ -1870,7 +1870,7 @@ static T_JZsdkReturnCode RecvDeal_OpusTrans_start(int Port, char *getbuf) @@ -1870,7 +1870,7 @@ static T_JZsdkReturnCode RecvDeal_OpusTrans_start(int Port, char *getbuf)
1870 } 1870 }
1871 1871
1872 //2、创建存储文件 1872 //2、创建存储文件
1873 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 1873 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
1874 Megaphone_SaveOpusStart(decode_rate); 1874 Megaphone_SaveOpusStart(decode_rate);
1875 #endif 1875 #endif
1876 1876
@@ -1916,7 +1916,7 @@ static T_JZsdkReturnCode RecvDeal_OpusTrans_LimitTransmission(int Port, char *ge @@ -1916,7 +1916,7 @@ static T_JZsdkReturnCode RecvDeal_OpusTrans_LimitTransmission(int Port, char *ge
1916 JZSDK_LOG_DEBUG("%s,传输opus定长音频文件中 一共传输了%d字节",JZsdk_DefineCode_GetPortName(Port),HalRecvDataLen); 1916 JZSDK_LOG_DEBUG("%s,传输opus定长音频文件中 一共传输了%d字节",JZsdk_DefineCode_GetPortName(Port),HalRecvDataLen);
1917 1917
1918 //传输数据接口 1918 //传输数据接口
1919 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 1919 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
1920 Megaphone_SaveOpusTrans(getbuf+9, DataLen); 1920 Megaphone_SaveOpusTrans(getbuf+9, DataLen);
1921 #endif 1921 #endif
1922 1922
@@ -1946,7 +1946,7 @@ static T_JZsdkReturnCode RecvDeal_OpusTrans_stop(int Port, char *getbuf) @@ -1946,7 +1946,7 @@ static T_JZsdkReturnCode RecvDeal_OpusTrans_stop(int Port, char *getbuf)
1946 } 1946 }
1947 1947
1948 1948
1949 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 1949 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
1950 Megaphone_SaveOpusStop(JZ_FLAGCODE_OFF, NULL); 1950 Megaphone_SaveOpusStop(JZ_FLAGCODE_OFF, NULL);
1951 #endif 1951 #endif
1952 1952
@@ -2015,7 +2015,7 @@ static T_JZsdkReturnCode RecvDeal_OpusTrans_stop_and_check(int Port, char *getbu @@ -2015,7 +2015,7 @@ static T_JZsdkReturnCode RecvDeal_OpusTrans_stop_and_check(int Port, char *getbu
2015 } 2015 }
2016 2016
2017 //1、保存音频数据 2017 //1、保存音频数据
2018 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 2018 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
2019 ret = Megaphone_SaveOpusStop(checkType, checkCode); 2019 ret = Megaphone_SaveOpusStop(checkType, checkCode);
2020 if (ret == JZ_ERROR_CHECKCODE_CHECK_ERROR) 2020 if (ret == JZ_ERROR_CHECKCODE_CHECK_ERROR)
2021 { 2021 {
@@ -2119,7 +2119,7 @@ static T_JZsdkReturnCode RecvDeal_Opus_RealTimeVoice_start(int Port, char *getbu @@ -2119,7 +2119,7 @@ static T_JZsdkReturnCode RecvDeal_Opus_RealTimeVoice_start(int Port, char *getbu
2119 } 2119 }
2120 2120
2121 //3、打开实时语音模式 2121 //3、打开实时语音模式
2122 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 2122 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
2123 Megaphone_RealTimeVoice_Start(Rate); 2123 Megaphone_RealTimeVoice_Start(Rate);
2124 #endif 2124 #endif
2125 2125
@@ -2165,7 +2165,7 @@ static T_JZsdkReturnCode RecvDeal_Opus_RealTimeVoice_LimitTransmission(int Port, @@ -2165,7 +2165,7 @@ static T_JZsdkReturnCode RecvDeal_Opus_RealTimeVoice_LimitTransmission(int Port,
2165 JZSDK_LOG_DEBUG("%s,传输opus定长语音传输中 长度:%d,总长度:%d",JZsdk_DefineCode_GetPortName(Port), DataLen, HalRecvDataLen); 2165 JZSDK_LOG_DEBUG("%s,传输opus定长语音传输中 长度:%d,总长度:%d",JZsdk_DefineCode_GetPortName(Port), DataLen, HalRecvDataLen);
2166 2166
2167 //传输数据接口 2167 //传输数据接口
2168 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 2168 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
2169 ret = Megaphone_RealTimeVoice_Trans(getbuf+9, DataLen); 2169 ret = Megaphone_RealTimeVoice_Trans(getbuf+9, DataLen);
2170 #endif 2170 #endif
2171 2171
@@ -2202,7 +2202,7 @@ static T_JZsdkReturnCode RecvDeal_Opus_RealTimeVoice_stop(int Port, char *getbuf @@ -2202,7 +2202,7 @@ static T_JZsdkReturnCode RecvDeal_Opus_RealTimeVoice_stop(int Port, char *getbuf
2202 HalRecvDataLen = 0; 2202 HalRecvDataLen = 0;
2203 2203
2204 //2、关闭实时语音模式 2204 //2、关闭实时语音模式
2205 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 2205 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
2206 ret = Megaphone_RealTimeVoice_Close(); 2206 ret = Megaphone_RealTimeVoice_Close();
2207 #endif 2207 #endif
2208 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 2208 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 * 25 *
26 * 26 *
27 * **************************/ 27 * **************************/
28 -static T_JZsdkReturnCode JZsdk_Uart_UartEnabled(unsigned char *UartDev, unsigned int BitRate, int *UartFd) 28 +T_JZsdkReturnCode JZsdk_Uart_UartEnabled(unsigned char *UartDev, unsigned int BitRate, int *UartFd)
29 { 29 {
30 if (UartFd == NULL) 30 if (UartFd == NULL)
31 { 31 {
@@ -25,6 +25,7 @@ extern "C" { @@ -25,6 +25,7 @@ extern "C" {
25 25
26 /* Exported functions --------------------------------------------------------*/ 26 /* Exported functions --------------------------------------------------------*/
27 T_JZsdkReturnCode JZsdk_Uart_ReInit(int UART_DEV_NAME, int BitRate); 27 T_JZsdkReturnCode JZsdk_Uart_ReInit(int UART_DEV_NAME, int BitRate);
  28 +T_JZsdkReturnCode JZsdk_Uart_UartEnabled(unsigned char *UartDev, unsigned int BitRate, int *UartFd);
28 29
29 #ifdef __cplusplus 30 #ifdef __cplusplus
30 } 31 }
@@ -14,6 +14,8 @@ @@ -14,6 +14,8 @@
14 /* Includes ------------------------------------------------------------------*/ 14 /* Includes ------------------------------------------------------------------*/
15 #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h" 15 #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
16 16
  17 +#include "CommonMod/PowerManger/PowerManger.h"
  18 +
17 #ifdef __cplusplus 19 #ifdef __cplusplus
18 extern "C" { 20 extern "C" {
19 #endif 21 #endif
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
4 #include "JZsdkLib.h" 4 #include "JZsdkLib.h"
5 #include "JZsdk_Hal.h" 5 #include "JZsdk_Hal.h"
6 6
7 -T_JZsdkReturnCode HeartBeat_Uart1Check() 7 +T_JZsdkReturnCode HeartBeat_HalCheck()
8 { 8 {
9 //1、获取hal的使用状态 9 //1、获取hal的使用状态
10 - int JZsdk_HalPort_UseFlag(UART_DEV_1); 10 + int temp = JZsdk_HalPort_UseFlag(UART_DEV_1);
11 11
12 12
13 } 13 }
1 #include <stdio.h> 1 #include <stdio.h>
2 #include "JZsdkLib.h" 2 #include "JZsdkLib.h"
  3 +#include <string.h>
3 4
4 #include "BaseConfig.h" 5 #include "BaseConfig.h"
5 6
@@ -31,7 +32,7 @@ T_JZsdkReturnCode Upgrade_PackageParse() @@ -31,7 +32,7 @@ T_JZsdkReturnCode Upgrade_PackageParse()
31 } 32 }
32 33
33 //分解升级包 34 //分解升级包
34 - memseyt(cmd, 0, sizeof(cmd)); 35 + memset(cmd, 0, sizeof(cmd));
35 sprintf(cmd, "tar -xvf %s -C %s", REMOTE_UPGRADE_FILE_DIR, UPGRADE_FILE_DIR); 36 sprintf(cmd, "tar -xvf %s -C %s", REMOTE_UPGRADE_FILE_DIR, UPGRADE_FILE_DIR);
36 ret = JZsdk_RunSystemCmd(cmd); 37 ret = JZsdk_RunSystemCmd(cmd);
37 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 38 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -74,7 +74,7 @@ static const unsigned char FRAME_HEADER[FRAME_HEADER_SIZE] = {0xaa, 0xbb, 0xcc, @@ -74,7 +74,7 @@ static const unsigned char FRAME_HEADER[FRAME_HEADER_SIZE] = {0xaa, 0xbb, 0xcc,
74 74
75 static unsigned char FrameBuffer[FIRST_HEIGHT * FIRST_WIDTH *2]; //用于存储帧数据的缓冲区 75 static unsigned char FrameBuffer[FIRST_HEIGHT * FIRST_WIDTH *2]; //用于存储帧数据的缓冲区
76 static unsigned int FrameBufferLen = 0; //用于存储帧数据的长度 76 static unsigned int FrameBufferLen = 0; //用于存储帧数据的长度
77 -static FrameBuffer_UseFlag = JZ_FLAGCODE_OFF; 77 +static int FrameBuffer_UseFlag = JZ_FLAGCODE_OFF;
78 78
79 #ifdef RTK_RGA_STATUS_ON 79 #ifdef RTK_RGA_STATUS_ON
80 static T_JZsdkReturnCode JZC1_RgaDeal(C1_RgaInfo *rga_info, int resize, unsigned char *image, unsigned int *imgage_size); 80 static T_JZsdkReturnCode JZC1_RgaDeal(C1_RgaInfo *rga_info, int resize, unsigned char *image, unsigned int *imgage_size);
@@ -10,8 +10,9 @@ @@ -10,8 +10,9 @@
10 #include "../Gimbal_Param.h" 10 #include "../Gimbal_Param.h"
11 11
12 #include "Hal_Send/HalSend.h" 12 #include "Hal_Send/HalSend.h"
  13 +#include "JZsdk_uart/JZsdk_Uart.h"
13 14
14 -#if WIRINGPI_STATUS == VERSION_SWITCH_ON 15 +#ifdef WIRINGPI_STATUS_ON
15 #include <wiringPi.h> 16 #include <wiringPi.h>
16 #endif 17 #endif
17 18
@@ -36,7 +37,7 @@ T_JZsdkReturnCode Gimbal_DataDeal_init() @@ -36,7 +37,7 @@ T_JZsdkReturnCode Gimbal_DataDeal_init()
36 int Uart_fd = 0; 37 int Uart_fd = 0;
37 38
38 //1、串口初始化 39 //1、串口初始化
39 - Uart_fd = UartConnection_UartEnabled(GIMBAL_UART_NUM, GIMBAL_UART_BITRATE); 40 + JZsdk_Uart_UartEnabled(GIMBAL_UART_NUM, GIMBAL_UART_BITRATE, &Uart_fd);
40 41
41 //2、串口接收初始化 42 //2、串口接收初始化
42 Gimbal_SpecialUart_UartReceive_Init(Uart_fd); 43 Gimbal_SpecialUart_UartReceive_Init(Uart_fd);
@@ -185,7 +185,8 @@ T_JZsdkReturnCode JZsdk_FrameCatch_Single(T_JZsdkReturnCode (*task_function)(uns @@ -185,7 +185,8 @@ T_JZsdkReturnCode JZsdk_FrameCatch_Single(T_JZsdkReturnCode (*task_function)(uns
185 return JZ_ERROR_SYSTEM_MODULE_CODE_INVALID_PARAMETER; 185 return JZ_ERROR_SYSTEM_MODULE_CODE_INVALID_PARAMETER;
186 } 186 }
187 187
188 - task->task_function = task_function; 188 + //task->task_function = task_function;
  189 + task->task_function = (void (*)(unsigned char *, unsigned int))task_function;
189 190
190 int opus_Protection = pthread_create(&ReadDataTask,&task_attribute,JZsdk_Catch_SingleThread2,(void *)task); //线程 191 int opus_Protection = pthread_create(&ReadDataTask,&task_attribute,JZsdk_Catch_SingleThread2,(void *)task); //线程
191 if(opus_Protection != 0) 192 if(opus_Protection != 0)
@@ -133,6 +133,8 @@ typedef enum TEMP_CHOOSE @@ -133,6 +133,8 @@ typedef enum TEMP_CHOOSE
133 HIGH_DGCE_THRESHOLD = 5, 133 HIGH_DGCE_THRESHOLD = 5,
134 LOW_DGCE_THRESHOLD = 6, 134 LOW_DGCE_THRESHOLD = 6,
135 135
  136 + HIGH_TEMP_DATA = 7, //高温数据
  137 + LOW_TEMP_DATA = 8, //低温数据
136 138
137 FACTORY_HIGH_TEMP = 10, //出厂高温数据 139 FACTORY_HIGH_TEMP = 10, //出厂高温数据
138 FACTORY_LOW_TEMP = 11, //出厂低温数据 140 FACTORY_LOW_TEMP = 11, //出厂低温数据
@@ -22,6 +22,8 @@ int g_temp_GasValueMin = 30; @@ -22,6 +22,8 @@ int g_temp_GasValueMin = 30;
22 struct IRC_param *g_IRC_Param = NULL; 22 struct IRC_param *g_IRC_Param = NULL;
23 static T_JZsdkReturnCode IRC_param_Init(struct IRC_param **index, int height, int width, int frameRate); 23 static T_JZsdkReturnCode IRC_param_Init(struct IRC_param **index, int height, int width, int frameRate);
24 24
  25 +static FILE *temp_fp = NULL;
  26 +
25 /* 27 /*
26 28
27 功能：初始化IRC参数 29 功能：初始化IRC参数
@@ -36,9 +38,15 @@ T_JZsdkReturnCode IRC_ParamInit(int height, int width, int frameRate) @@ -36,9 +38,15 @@ T_JZsdkReturnCode IRC_ParamInit(int height, int width, int frameRate)
36 38
37 ret = IRC_param_Init(&g_IRC_Param, height, width, frameRate); 39 ret = IRC_param_Init(&g_IRC_Param, height, width, frameRate);
38 40
39 - if (g_IRC_Param->DealWay ==IRC_DEALMODE_KTLIB) 41 + if (g_IRC_Param->DealWay == IRC_DEALMODE_KTLIB)
40 { 42 {
41 - KtLib_Init(); 43 + KtLib_Init(g_IRC_Param);
  44 + }
  45 +
  46 + temp_fp = fopen("IRC_temp.raw", "w");
  47 + if (temp_fp == NULL)
  48 + {
  49 + JZSDK_LOG_ERROR("IRC_temp.raw文件打开失败");
42 } 50 }
43 51
44 return ret; 52 return ret;
@@ -151,7 +159,6 @@ static T_JZsdkReturnCode IRC_data_PreliminaryDeal(U16_t *rawData ,unsigned int * @@ -151,7 +159,6 @@ static T_JZsdkReturnCode IRC_data_PreliminaryDeal(U16_t *rawData ,unsigned int *
151 dealInfo->HighT_flag = JZ_FLAGCODE_ON; 159 dealInfo->HighT_flag = JZ_FLAGCODE_ON;
152 } 160 }
153 161
154 -  
155 /********读取低温数据**********************************************************/ 162 /********读取低温数据**********************************************************/
156 switch (dealInfo->TPC_mode) 163 switch (dealInfo->TPC_mode)
157 { 164 {
@@ -198,10 +205,22 @@ static T_JZsdkReturnCode IRC_data_PreliminaryDeal(U16_t *rawData ,unsigned int * @@ -198,10 +205,22 @@ static T_JZsdkReturnCode IRC_data_PreliminaryDeal(U16_t *rawData ,unsigned int *
198 dealInfo->LowT_flag = JZ_FLAGCODE_ON; 205 dealInfo->LowT_flag = JZ_FLAGCODE_ON;
199 } 206 }
200 207
  208 +
201 //***********重新计算两点校正的斜率**************************************/ 209 //***********重新计算两点校正的斜率**************************************/
202 - JZIrcLib_TPC_Slope_Calculation2(dealInfo);  
203 - }  
204 210
  211 + //如果开启开启的昆腾库，则载入昆腾数据
  212 + if (g_IRC_Param->DealWay == IRC_DEALMODE_KTLIB)
  213 + {
  214 + KtLib_writeMarkData(HIGH_TEMP_DATA ,dealInfo->HighT_NineFrame_Avg, dealInfo->PixelNum);
  215 + KtLib_writeMarkData(LOW_TEMP_DATA ,dealInfo->LowT_NineFrame_Avg, dealInfo->PixelNum);
  216 + }
  217 + else
  218 + {
  219 + //使用本地库计算斜率
  220 + JZIrcLib_TPC_Slope_Calculation2(dealInfo);
  221 + }
  222 +
  223 + }
205 224
206 //如果开启了低温循环标定，计算低温循环数据 225 //如果开启了低温循环标定，计算低温循环数据
207 if (dealInfo->LowT_flag != JZ_FLAGCODE_OFF) 226 if (dealInfo->LowT_flag != JZ_FLAGCODE_OFF)
@@ -247,7 +266,16 @@ static T_JZsdkReturnCode IRC_data_PreliminaryDeal(U16_t *rawData ,unsigned int * @@ -247,7 +266,16 @@ static T_JZsdkReturnCode IRC_data_PreliminaryDeal(U16_t *rawData ,unsigned int *
247 } 266 }
248 267
249 //***********重新计算两点校正的斜率**************************************/ 268 //***********重新计算两点校正的斜率**************************************/
250 - JZIrcLib_TPC_Slope_Calculation2(dealInfo); 269 + //如果开启开启的昆腾库，则载入昆腾数据
  270 + if (g_IRC_Param->DealWay == IRC_DEALMODE_KTLIB)
  271 + {
  272 + KtLib_writeMarkData(LOW_TEMP_DATA ,dealInfo->LowT_NineFrame_Avg, dealInfo->PixelNum);
  273 + }
  274 + else
  275 + {
  276 + //使用本地库计算斜率
  277 + JZIrcLib_TPC_Slope_Calculation2(dealInfo);
  278 + }
251 } 279 }
252 280
253 //如果开启了高温循环标定,计算高温循环数据 281 //如果开启了高温循环标定,计算高温循环数据
@@ -293,7 +321,16 @@ static T_JZsdkReturnCode IRC_data_PreliminaryDeal(U16_t *rawData ,unsigned int * @@ -293,7 +321,16 @@ static T_JZsdkReturnCode IRC_data_PreliminaryDeal(U16_t *rawData ,unsigned int *
293 } 321 }
294 322
295 //***********重新计算两点校正的斜率**************************************/ 323 //***********重新计算两点校正的斜率**************************************/
296 - JZIrcLib_TPC_Slope_Calculation2(dealInfo); 324 + //如果开启开启的昆腾库，则载入昆腾数据
  325 + if (g_IRC_Param->DealWay == IRC_DEALMODE_KTLIB)
  326 + {
  327 + KtLib_writeMarkData(HIGH_TEMP_DATA ,dealInfo->HighT_NineFrame_Avg, dealInfo->PixelNum);
  328 + }
  329 + else
  330 + {
  331 + //使用本地库计算斜率
  332 + JZIrcLib_TPC_Slope_Calculation2(dealInfo);
  333 + }
297 } 334 }
298 335
299 //两点校正模式 336 //两点校正模式
@@ -335,6 +372,12 @@ static T_JZsdkReturnCode IRC_data_PreliminaryDeal(U16_t *rawData ,unsigned int * @@ -335,6 +372,12 @@ static T_JZsdkReturnCode IRC_data_PreliminaryDeal(U16_t *rawData ,unsigned int *
335 372
336 //保存spc标定点 373 //保存spc标定点
337 IRC_LocalFrame_DataWrite(SPC_MARK_DATA, dealInfo, (U16_t *)dealInfo->SPC_Mark_Data, dealInfo->PixelNum); 374 IRC_LocalFrame_DataWrite(SPC_MARK_DATA, dealInfo, (U16_t *)dealInfo->SPC_Mark_Data, dealInfo->PixelNum);
  375 +
  376 + //如果开启开启的昆腾库，则载入昆腾数据
  377 + if (g_IRC_Param->DealWay == IRC_DEALMODE_KTLIB)
  378 + {
  379 + KtLib_writeMarkData(SPC_MARK_DATA ,dealInfo->SPC_Mark_Data, dealInfo->PixelNum);
  380 + }
338 381
339 dealInfo->SPC_ResetFlag = JZ_FLAGCODE_OFF; 382 dealInfo->SPC_ResetFlag = JZ_FLAGCODE_OFF;
340 } 383 }
@@ -375,6 +418,11 @@ static T_JZsdkReturnCode IRC_Postdeal(unsigned char *rgb_data, struct IRC_param @@ -375,6 +418,11 @@ static T_JZsdkReturnCode IRC_Postdeal(unsigned char *rgb_data, struct IRC_param
375 { 418 {
376 //将rgb图形镜像 419 //将rgb图形镜像
377 int MirrorImageFlag = JZ_FLAGCODE_ON; 420 int MirrorImageFlag = JZ_FLAGCODE_ON;
  421 + if (dealInfo->DealWay == IRC_DEALMODE_KTLIB)
  422 + {
  423 + MirrorImageFlag = JZ_FLAGCODE_OFF;
  424 + }
  425 +
378 426
379 if (MirrorImageFlag == JZ_FLAGCODE_ON) 427 if (MirrorImageFlag == JZ_FLAGCODE_ON)
380 { 428 {
@@ -570,6 +618,14 @@ T_JZsdkReturnCode IRC_FrameDeal(U16_t *rawData ,unsigned int dataSize, unsigned @@ -570,6 +618,14 @@ T_JZsdkReturnCode IRC_FrameDeal(U16_t *rawData ,unsigned int dataSize, unsigned
570 618
571 //JZSDK_LOG_DEBUG("数据预处理完成"); 619 //JZSDK_LOG_DEBUG("数据预处理完成");
572 620
  621 + if (temp_fp != NULL)
  622 + {
  623 + fwrite(rawData, sizeof(U16_t), dataSize, temp_fp);
  624 +
  625 + fflush(temp_fp);
  626 + }
  627 +
  628 +
573 //2、数据前处理，将原始数据和16位数据 合成为rgb数据 629 //2、数据前处理，将原始数据和16位数据 合成为rgb数据
574 U8_t *RGB_data = NULL; 630 U8_t *RGB_data = NULL;
575 unsigned int RGB_dataSize = 0; 631 unsigned int RGB_dataSize = 0;
@@ -590,6 +646,8 @@ T_JZsdkReturnCode IRC_FrameDeal(U16_t *rawData ,unsigned int dataSize, unsigned @@ -590,6 +646,8 @@ T_JZsdkReturnCode IRC_FrameDeal(U16_t *rawData ,unsigned int dataSize, unsigned
590 break; 646 break;
591 } 647 }
592 648
  649 + //JZSDK_LOG_DEBUG("数据抽查 1000:%d %d %d 10000:%d %d %d 20000:%d %d %d",RGB_data[1000*3],RGB_data[1000*3+1],RGB_data[1000*3+2],RGB_data[10000*3],RGB_data[10000*3+1],RGB_data[10000*3+2],RGB_data[20000*3],RGB_data[20000*3+1],RGB_data[20000*3+2]);
  650 +
593 //JZSDK_LOG_DEBUG("数据前处理完成"); 651 //JZSDK_LOG_DEBUG("数据前处理完成");
594 652
595 //3、数据后处理，在rgb数据上，进行图像处理 653 //3、数据后处理，在rgb数据上，进行图像处理
@@ -1133,7 +1191,9 @@ static T_JZsdkReturnCode IRC_param_Init(struct IRC_param **index, int height, in @@ -1133,7 +1191,9 @@ static T_JZsdkReturnCode IRC_param_Init(struct IRC_param **index, int height, in
1133 return JZ_ERROR_SYSTEM_MODULE_CODE_INVALID_PARAMETER; 1191 return JZ_ERROR_SYSTEM_MODULE_CODE_INVALID_PARAMETER;
1134 } 1192 }
1135 1193
1136 - IrcDealCfg->DealWay = IRC_DEALMODE_JZSDK; 1194 + //IrcDealCfg->DealWay = IRC_DEALMODE_JZSDK;
  1195 + IrcDealCfg->DealWay = IRC_DEALMODE_KTLIB;
  1196 +
1137 IrcDealCfg->ImgDataBits = 14; //图像为14位图像 1197 IrcDealCfg->ImgDataBits = 14; //图像为14位图像
1138 IrcDealCfg->Height = height; 1198 IrcDealCfg->Height = height;
1139 IrcDealCfg->Width = width; 1199 IrcDealCfg->Width = width;
@@ -8,132 +8,212 @@ @@ -8,132 +8,212 @@
8 #include "../IRC_data_deal/IRC_data_deal.h" 8 #include "../IRC_data_deal/IRC_data_deal.h"
9 9
10 #include <vector> 10 #include <vector>
  11 +#include <mutex>
11 12
12 #ifdef KTIRC_LIB_STATUS_ON 13 #ifdef KTIRC_LIB_STATUS_ON
13 - #include "KTv330_CPP.h" 14 + #include "M330Interface.h"
14 #endif 15 #endif
15 16
16 -  
17 -  
18 #include "MediaProc/MediaProc_Param.h" 17 #include "MediaProc/MediaProc_Param.h"
19 18
20 #include "KtLibProc.h" 19 #include "KtLibProc.h"
21 #include "MediaProc/ImageProc/PseudoColor/PseudoColor.h" 20 #include "MediaProc/ImageProc/PseudoColor/PseudoColor.h"
22 -#include "../IRC_Param.h"  
23 21
24 -// 创建一个 ClassKT 类对象 22 +// 定义互斥锁
  23 +static std::mutex ktLibMutex;
  24 +
  25 +T_JZsdkReturnCode KtLib_Init(struct IRC_param *dealInfo)
  26 +{
25 #ifdef KTIRC_LIB_STATUS_ON 27 #ifdef KTIRC_LIB_STATUS_ON
26 - KTv330Space::ClassKT* KtObject = new KTv330Space::ClassKT(); 28 + InitM330();
  29 +
  30 + KtLib_writeMarkData(HIGH_TEMP_DATA,dealInfo->HighT_NineFrame_Avg ,dealInfo->PixelNum);
  31 + KtLib_writeMarkData(LOW_TEMP_DATA, dealInfo->LowT_NineFrame_Avg ,dealInfo->PixelNum);
  32 + KtLib_writeMarkData(SPC_MARK_DATA, dealInfo->SPC_Mark_Data ,dealInfo->PixelNum);
  33 +
  34 + JZSDK_LOG_INFO("KtLib_Init success");
27 #endif 35 #endif
  36 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  37 +}
  38 +
28 39
  40 +/**********************************************
  41 + *
  42 + *
  43 + *
  44 + *
  45 + *
  46 + * **********************************************/
  47 +T_JZsdkReturnCode KtLib_writeMarkData(int type, U16_t* in ,int size)
  48 +{
  49 + bool bool_ret;
29 50
  51 + // 加锁
  52 + std::lock_guard<std::mutex> lock(ktLibMutex);
  53 +
  54 +#ifdef KTIRC_LIB_STATUS_ON
  55 + switch (type)
  56 + {
  57 + //高温标记数据
  58 + case HIGH_TEMP_DATA:
  59 + bool_ret = LoadMarkData((int *)in ,size,HIGH_MARK_DATA);
  60 + if (bool_ret == false)
  61 + {
  62 + JZSDK_LOG_ERROR("LoadMarkData HIGH_TEMP_DATA error");
  63 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  64 + }
  65 + else
  66 + {
  67 + JZSDK_LOG_INFO("LoadMarkData HIGH_TEMP_DATA success");
  68 + }
  69 +
  70 + break;
  71 +
  72 + //低温标记数据
  73 + case LOW_TEMP_DATA:
  74 + bool_ret = LoadMarkData((int *)in ,size,LOW_MARK_DATA);
  75 + if (bool_ret == false)
  76 + {
  77 + JZSDK_LOG_ERROR("LoadMarkData LOW_TEMP_DATA error");
  78 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  79 + }
  80 + else
  81 + {
  82 + JZSDK_LOG_INFO("LoadMarkData LOW_TEMP_DATA success");
  83 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  84 + }
  85 +
  86 + break;
  87 +
  88 + //单点标记数据
  89 + case SPC_MARK_DATA:
  90 + bool_ret = LoadMarkData((int *)in ,size, SINGLE_MARK_DATA);
  91 + if (bool_ret == false)
  92 + {
  93 + JZSDK_LOG_ERROR("LoadMarkData SPC_MARK_DATA error");
  94 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  95 + }
  96 +
  97 + else
  98 + {
  99 + JZSDK_LOG_INFO("LoadMarkData SPC_MARK_DATA success");
  100 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  101 + }
  102 +
  103 + break;
  104 +
  105 + default:
  106 + break;
  107 + }
  108 +
  109 +#endif
  110 +}
  111 +
  112 +static int lastCorrectMode = JZ_FLAGCODE_OFF;
30 113
31 T_JZsdkReturnCode KtLib_DataDeal(U16_t* U16_data, unsigned int U16_dataSize, 114 T_JZsdkReturnCode KtLib_DataDeal(U16_t* U16_data, unsigned int U16_dataSize,
32 U8_t **RGB_data, unsigned int *RGB_dataSize, 115 U8_t **RGB_data, unsigned int *RGB_dataSize,
33 struct IRC_param *dealInfo) 116 struct IRC_param *dealInfo)
34 { 117 {
  118 + // 加锁
  119 + std::lock_guard<std::mutex> lock(ktLibMutex);
  120 +
35 T_JZsdkReturnCode ret; 121 T_JZsdkReturnCode ret;
36 -#ifdef KTIRC_LIB_STATUS_ON  
37 - // 创建一个存储转换后数据的 vector<int>  
38 - std::vector<int> inputDataVector(U16_data, U16_data + U16_dataSize); 122 + bool bool_ret;
39 123
40 - // 创建一个用于保存校正数据的  
41 - std::vector<int> currentDataVector = inputDataVector; 124 +#ifdef KTIRC_LIB_STATUS_ON
42 125
43 - //JZSDK_LOG_INFO("校正前1:%d 2:%d 3:%d 4:%d",currentDataVector[5000],currentDataVector[15000],currentDataVector[30000],currentDataVector[45000]);  
44 -  
45 // 如果打开了单点校正 126 // 如果打开了单点校正
46 - if (dealInfo->FrameCorrectMode == IRC_CORRCTION_SPC) 127 + if (dealInfo->FrameCorrectMode == IRC_CORRCTION_SPC && lastCorrectMode != IRC_CORRCTION_SPC)
47 { 128 {
48 - // 创建一个用于放置spc的数据  
49 - U16_t *dataPtr = NULL;  
50 - if (dealInfo->SPC_mode == 0 && dealInfo->LowT_NineFrame_Avg != NULL) // 低温打档  
51 - {  
52 - //JZSDK_LOG_INFO("正在用低温数据");  
53 - dataPtr = (U16_t *)dealInfo->LowT_NineFrame_Avg;  
54 - }  
55 - else  
56 - {  
57 - //JZSDK_LOG_INFO("正在用标记数据");  
58 - dataPtr = (U16_t *)dealInfo->SPC_Mark_Data;  
59 - } 129 + JZSDK_LOG_INFO("sdk开启单点校正");
60 130
61 - // 使用 std::span 来避免不必要的拷贝  
62 - std::vector<int> spcMarkDataVector(dataPtr, dataPtr + dealInfo->PixelNum);  
63 - //JZSDK_LOG_INFO("dataPtr 1:%d 2:%d 3:%d 4:%d",dataPtr[5000],dataPtr[15000],dataPtr[30000],dataPtr[45000]); 131 + //关闭两点校正
  132 + CloseDoubleNuc();
64 133
65 - bool retSPC = KtObject->KT_V330_CPP_supportFun_SPC(currentDataVector, inputDataVector, spcMarkDataVector, dealInfo->ImgDataBits);  
66 - if (retSPC == false)  
67 - {  
68 - printf("SPC失败\n");  
69 - } 134 + //打开单点校正
  135 + OpenSingleNuc();
  136 +
  137 + lastCorrectMode = IRC_CORRCTION_SPC;
70 } 138 }
71 139
72 - //JZSDK_LOG_INFO("校正后1:%d 2:%d 3:%d 4:%d",currentDataVector[5000],currentDataVector[15000],currentDataVector[30000],currentDataVector[45000]);  
73 140
74 // 如果打开了两点校正 141 // 如果打开了两点校正
75 - if (dealInfo->FrameCorrectMode == IRC_CORRCTION_TPC) 142 + if (dealInfo->FrameCorrectMode == IRC_CORRCTION_TPC && lastCorrectMode != IRC_CORRCTION_TPC)
76 { 143 {
77 - std::vector<int> highDataVector(dealInfo->HighT_NineFrame_Avg, dealInfo->HighT_NineFrame_Avg + dealInfo->PixelNum);  
78 - std::vector<int> lowDataVector(dealInfo->LowT_NineFrame_Avg, dealInfo->LowT_NineFrame_Avg + dealInfo->PixelNum);  
79 144
80 - currentDataVector = KtObject->ifTPC(inputDataVector, lowDataVector, highDataVector, (unsigned short)dealInfo->ImgDataBits); 145 + JZSDK_LOG_INFO("sdk开启两点校正");
  146 +
  147 + //关闭单点校正
  148 + CloseSingleNuc();
  149 +
  150 + //打开两点校正
  151 + OpenDoubleNuc();
  152 +
  153 + lastCorrectMode = IRC_CORRCTION_TPC;
81 } 154 }
82 155
83 - std::vector<unsigned char> outVector; 156 + // 如果关闭了校正
  157 + if (dealInfo->FrameCorrectMode == JZ_FLAGCODE_OFF && lastCorrectMode != JZ_FLAGCODE_OFF)
  158 + {
  159 + JZSDK_LOG_INFO("sdk无校正");
  160 +
  161 + //关闭单点校正
  162 + CloseSingleNuc();
  163 +
  164 + //关闭两点校正
  165 + CloseDoubleNuc();
  166 +
  167 + lastCorrectMode = JZ_FLAGCODE_OFF;
  168 + }
84 169
85 - // 调用 KT_V330_CPP_supportFun_Histogram_vKT 进行直方图均衡化处理 得到灰度图  
86 - KtObject->KT_V330_CPP_supportFun_Histogram_vKT(outVector, currentDataVector, dealInfo->ImgDataBits, dealInfo->Gain, dealInfo->LeftDrop, dealInfo->RightDrop); 170 + //将u16数据转为char 数据 以用于输入库
  171 + char* inputDataChar = new char[U16_dataSize*2];
  172 + int inputDataSize = U16_dataSize*2;
  173 + for (int i = 0; i < U16_dataSize; i++)
  174 + {
  175 + inputDataChar[i*2+1] = (U16_data[i] & 0xFF00) >> 8;
  176 + inputDataChar[i*2] = (U16_data[i] & 0x00FF);
  177 + }
87 178
88 - // 将vector灰度图转换为 数组灰度图  
89 - U8_t *GrayImage = (U8_t *)malloc(sizeof(U8_t) * dealInfo->PixelNum);  
90 - std::copy(outVector.begin(), outVector.end(), GrayImage); 179 + //注册一个输出数组
  180 + *RGB_data = new U8_t[dealInfo->PixelNum*3];
  181 + *RGB_dataSize = 0;
91 182
92 // 图像输出模式 183 // 图像输出模式
93 switch (dealInfo->OutputPixelColorMode) 184 switch (dealInfo->OutputPixelColorMode)
94 { 185 {
95 case 0: // 默认输出模式 186 case 0: // 默认输出模式
  187 + case 2: // 气体色彩增强输出模式
96 { 188 {
97 - // 灰度图转rgb888  
98 - IRC_GrayTo_RGB(GrayImage, RGB_data, RGB_dataSize, dealInfo); 189 + bool_ret = GetImageSynchronous(inputDataChar, inputDataSize, (char *)*RGB_data, dealInfo->PixelNum*3, (int *)RGB_dataSize); //同步处理数据
99 } 190 }
100 break; 191 break;
101 192
102 case 1: // 伪彩输出模式 193 case 1: // 伪彩输出模式
103 { 194 {
104 - // 灰度图转伪彩rgb888  
105 - ret = PseudoColor_Gray2Rgb(GrayImage, RGB_data, RGB_dataSize, dealInfo->PixelNum);  
106 - if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)  
107 - {  
108 - IRC_GrayTo_RGB(GrayImage, RGB_data, RGB_dataSize, dealInfo);  
109 - }  
110 - }  
111 - break;  
112 -  
113 - case 2: // 气体色彩增强输出模式  
114 - {  
115 - // 转为rgb  
116 - IRC_GrayTo_RGB(GrayImage, RGB_data, RGB_dataSize, dealInfo);  
117 -  
118 - // 灰度图转气体增强rgb888  
119 - IRC_DynamicGasesColorEnhance(*RGB_data, U16_data, dealInfo); 195 + bool_ret = GetImageSynchronous(inputDataChar, inputDataSize, (char *)*RGB_data, dealInfo->PixelNum*3, (int *)RGB_dataSize); //同步处理数据
  196 +
  197 + //将rgb888数据反转为灰度数据并进行颜色映射
120 } 198 }
121 break; 199 break;
122 200
123 default: 201 default:
  202 + delete[] inputDataChar;
124 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 203 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
125 break; 204 break;
126 } 205 }
127 206
128 - return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;  
129 -#endif  
130 -} 207 + if (bool_ret == false)
  208 + {
  209 + JZSDK_LOG_ERROR("sdk处理错误");
  210 + }
  211 +
131 212
132 -T_JZsdkReturnCode KtLib_Init()  
133 -{  
134 -#ifdef KTIRC_LIB_STATUS_ON  
135 - KtObject->KT_M330_InfraredLogin("192.168.1.3", 6666, "192.168.1.2", 6666, 320, 256, 14, NULL, 0, 0);  
136 -#endif  
137 - return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;  
138 -} 213 + //JZSDK_LOG_DEBUG("ktlib pixnum*3:%d rgbsize:%d",dealInfo->PixelNum*3 ,*RGB_dataSize);
  214 +
  215 + delete[] inputDataChar;
139 216
  217 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  218 +#endif
  219 +}
@@ -16,7 +16,8 @@ extern "C" { @@ -16,7 +16,8 @@ extern "C" {
16 T_JZsdkReturnCode KtLib_DataDeal(U16_t* U16_data, unsigned int U16_dataSize, 16 T_JZsdkReturnCode KtLib_DataDeal(U16_t* U16_data, unsigned int U16_dataSize,
17 U8_t **RGB_data, unsigned int *RGB_dataSize, 17 U8_t **RGB_data, unsigned int *RGB_dataSize,
18 struct IRC_param *dealInfo); 18 struct IRC_param *dealInfo);
19 -T_JZsdkReturnCode KtLib_Init(); 19 +T_JZsdkReturnCode KtLib_Init(struct IRC_param *dealInfo);
  20 +T_JZsdkReturnCode KtLib_writeMarkData(int type, U16_t* in ,int size);
20 21
21 22
22 #ifdef __cplusplus 23 #ifdef __cplusplus
@@ -21,8 +21,8 @@ @@ -21,8 +21,8 @@
21 #include "../AudioDeal/AudioDeal.h" 21 #include "../AudioDeal/AudioDeal.h"
22 #include "./TTS/Megaphone_TTS.h" 22 #include "./TTS/Megaphone_TTS.h"
23 #include "./TTS/cnTTS/cnTTS.h" 23 #include "./TTS/cnTTS/cnTTS.h"
24 -#include "./AudioFile/Megaphone_AudioFile.h"  
25 -#include "Megaphone/RealTimeMP2/Megaphone_RealTimeMP2.h" 24 +#include "Megaphone/Music/AudioFile/Megaphone_AudioFile.h"
  25 +#include "Megaphone/Music/RealTimeMP2/Megaphone_RealTimeMP2.h"
26 #include "Megaphone/opus/Megaphone_Opus.h" 26 #include "Megaphone/opus/Megaphone_Opus.h"
27 27
28 int MegPlayStatusUnChange_flag = JZ_FLAGCODE_OFF; 28 int MegPlayStatusUnChange_flag = JZ_FLAGCODE_OFF;
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 #include "AudioDeal/AudioDealThread/AudioDealThread.h" 11 #include "AudioDeal/AudioDealThread/AudioDealThread.h"
12 #include "./AudioFile_PlayDeal.h" 12 #include "./AudioFile_PlayDeal.h"
13 13
14 -#include "Megaohone/AudioMange/AudioMange.h" 14 +#include "Megaphone/AudioMange/AudioMange.h"
15 #include "Megaphone/Megaphone.h" 15 #include "Megaphone/Megaphone.h"
16 16
17 #define AUDIO_DIR "/root/sdcard/audio" 17 #define AUDIO_DIR "/root/sdcard/audio"
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 12
13 /* Includes ------------------------------------------------------------------*/ 13 /* Includes ------------------------------------------------------------------*/
14 #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h" 14 #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
15 -#include "./AudioFile_Param.h" 15 +#include "Megaphone/AudioMange/AudioMange_Param.h"
16 16
17 #ifdef __cplusplus 17 #ifdef __cplusplus
18 extern "C" { 18 extern "C" {
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 6
7 7
8 #include "JZsdkLib.h" 8 #include "JZsdkLib.h"
9 -#include "../Megaphone.h" 9 +#include "Megaphone/Megaphone.h"
10 #include "AudioDeal/AudioDeal.h" 10 #include "AudioDeal/AudioDeal.h"
11 11
12 static int RealTimeMp2_StatusFlag = JZ_FLAGCODE_OFF; 12 static int RealTimeMp2_StatusFlag = JZ_FLAGCODE_OFF;
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 #include <stdlib.h> 2 #include <stdlib.h>
3 #include <string.h> 3 #include <string.h>
4 4
5 -#include "Megaphone/AudioFile/Megaphone_AudioFile.h" 5 +#include "Megaphone/Music/AudioFile/Megaphone_AudioFile.h"
6 #include "Megaphone/TTS/Megaphone_TTS.h" 6 #include "Megaphone/TTS/Megaphone_TTS.h"
7 7
8 #include "Intl_interface.h" 8 #include "Intl_interface.h"
@@ -9,6 +9,30 @@ static int g_OpusFile_SaveFlag = JZ_FLAGCODE_OFF; @@ -9,6 +9,30 @@ static int g_OpusFile_SaveFlag = JZ_FLAGCODE_OFF;
9 #define OPUS_TEMP_SAVE_DIR "/root/opusFileTemp.opus" 9 #define OPUS_TEMP_SAVE_DIR "/root/opusFileTemp.opus"
10 static unsigned char opus_SaveFile[128]; 10 static unsigned char opus_SaveFile[128];
11 11
  12 +static int OpusFile_SaveThread_Flag = JZ_FLAGCODE_OFF;
  13 +
  14 +/******************
  15 + *
  16 + *
  17 + * opus文件 存储显示线程
  18 + *
  19 + *
  20 + * **********************/
  21 +static T_JZsdkReturnCode OpusFile_SaveOpusFileShowLen(void)
  22 +{
  23 + if (OpusFile_SaveThread_Flag != JZ_FLAGCODE_OFF)
  24 + {
  25 + JZSDK_LOG_ERROR("存储显示线程已经启动，请先关闭");
  26 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  27 + }
  28 +
  29 + OpusFile_SaveThread_Flag = JZ_FLAGCODE_ON;
  30 +
  31 +
  32 +
  33 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  34 +}
  35 +
12 /****************** 36 /******************
13 * 37 *
14 * 38 *
@@ -72,6 +96,7 @@ T_JZsdkReturnCode OpusFile_SaveOpusFileStream(unsigned char *Stream, int StreamL @@ -72,6 +96,7 @@ T_JZsdkReturnCode OpusFile_SaveOpusFileStream(unsigned char *Stream, int StreamL
72 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 96 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
73 } 97 }
74 98
  99 + fflush(g_OpusFile_SaveFp);
75 g_OpusFile_SaveLen += StreamLen; 100 g_OpusFile_SaveLen += StreamLen;
76 101
77 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 102 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
@@ -84,4 +109,75 @@ T_JZsdkReturnCode OpusFile_SaveOpusFileStream(unsigned char *Stream, int StreamL @@ -84,4 +109,75 @@ T_JZsdkReturnCode OpusFile_SaveOpusFileStream(unsigned char *Stream, int StreamL
84 * 109 *
85 * 110 *
86 * **********************/ 111 * **********************/
87 -T_JZsdkReturnCode OpusFile_SaveOpusFileEnd()  
  112 +T_JZsdkReturnCode OpusFile_SaveOpusFileEnd(int CheckFlag, unsigned char *CheckCode)
  113 +{
  114 + T_JZsdkReturnCode ret = JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  115 + unsigned char cmd[128];
  116 +
  117 + //标志位判定
  118 + if (g_OpusFile_SaveFlag == JZ_FLAGCODE_OFF)
  119 + {
  120 + JZSDK_LOG_ERROR("没有打开opus文件保存功能");
  121 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  122 + }
  123 +
  124 + //文件指针判定
  125 + if (g_OpusFile_SaveFp == NULL)
  126 + {
  127 + JZSDK_LOG_ERROR("要保存的opus文件未打开");
  128 + g_OpusFile_SaveFlag = JZ_FLAGCODE_OFF;
  129 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  130 + }
  131 +
  132 + //关闭存储的文件
  133 + fflush(g_OpusFile_SaveFp);
  134 + fclose(g_OpusFile_SaveFp);
  135 + g_OpusFile_SaveFp = NULL;
  136 +
  137 + JZSDK_LOG_INFO("已存储opus文件, 其长度为:%d", g_OpusFile_SaveLen);
  138 +
  139 + switch (CheckFlag)
  140 + {
  141 + case JZ_FLAGCODE_OFF:
  142 + {
  143 + JZSDK_LOG_INFO("opus保存无需校验码");
  144 + ret = JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  145 + }
  146 + break;
  147 +
  148 + case JZSDK_CHECK_SUM_TYPE_MD5:
  149 + {
  150 + JZSDK_LOG_INFO("opus保存使用md5校验码");
  151 + //1、获取文件的md5校验码
  152 + ret = JZsdk_CheckSum(JZSDK_CHECK_SUM_TYPE_MD5, OPUS_TEMP_SAVE_DIR, CheckCode, 32);
  153 + }
  154 + break;
  155 +
  156 + case JZSDK_CHECK_SUM_TYPE_SRC32:
  157 + {
  158 + JZSDK_LOG_INFO("opus保存使用src32校验码");
  159 + //1、获取文件的src32校验码
  160 + ret = JZsdk_CheckSum(JZSDK_CHECK_SUM_TYPE_SRC32, OPUS_TEMP_SAVE_DIR, CheckCode, 4);
  161 + }
  162 +
  163 + default:
  164 + {
  165 + JZSDK_LOG_ERROR("opus保存校验码类型错误");
  166 + ret = JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  167 + }
  168 + break;
  169 + }
  170 +
  171 + if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
  172 + {
  173 + JZSDK_LOG_ERROR("opus保存校验失败");
  174 + memset(cmd, 0, sizeof(cmd));
  175 + sprintf(cmd, "rm -rf %s", OPUS_TEMP_SAVE_DIR);
  176 + JZsdk_RunSystemCmd(cmd);
  177 + g_OpusFile_SaveFlag = JZ_FLAGCODE_OFF;
  178 +
  179 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  180 + }
  181 +
  182 +
  183 +}
@@ -8,12 +8,15 @@ @@ -8,12 +8,15 @@
8 #include "Gimbal/Gimbal.h" 8 #include "Gimbal/Gimbal.h"
9 #include "Psdk_UI_io.h" 9 #include "Psdk_UI_io.h"
10 #include "ircut.h" 10 #include "ircut.h"
11 -#include "PowerManager_InAndOut.h" 11 +
  12 +
12 #include "DeviceInfo/DeviceInfo.h" 13 #include "DeviceInfo/DeviceInfo.h"
13 #include "MediaProc/VideoMgmt/VideoMgmt.h" 14 #include "MediaProc/VideoMgmt/VideoMgmt.h"
14 #include "MediaProc/Camera/Camera.h" 15 #include "MediaProc/Camera/Camera.h"
15 #include "./UI_control.h" 16 #include "./UI_control.h"
16 17
  18 +#include "CommonMod/CommonMod.h"
  19 +
17 #include "JZsdk_Hal.h" 20 #include "JZsdk_Hal.h"
18 21
19 #include "Hal_Send/HalSend.h" 22 #include "Hal_Send/HalSend.h"
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 #include "UI_control/UI_control.h" 8 #include "UI_control/UI_control.h"
9 #include "DeviceInfo/DeviceInfo.h" 9 #include "DeviceInfo/DeviceInfo.h"
10 10
11 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 11 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
12 #include "Megaphone/Megaphone.h" 12 #include "Megaphone/Megaphone.h"
13 #endif 13 #endif
14 14
@@ -16,7 +16,7 @@ T_JZsdkReturnCode Megphone_Attention() @@ -16,7 +16,7 @@ T_JZsdkReturnCode Megphone_Attention()
16 { 16 {
17 17
18 //如果是喊话器设备 18 //如果是喊话器设备
19 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 19 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
20 20
21 //引脚初始化 21 //引脚初始化
22 Ircut_Init(); 22 Ircut_Init();
@@ -82,7 +82,7 @@ static T_DjiReturnCode DjiTestWidget_GetWidgetValue(E_DjiWidgetType widgetType, @@ -82,7 +82,7 @@ static T_DjiReturnCode DjiTestWidget_GetWidgetValue(E_DjiWidgetType widgetType,
82 void *userData); 82 void *userData);
83 int get_num(char *str);//获取序列号 83 int get_num(char *str);//获取序列号
84 84
85 -#if IRC_CONFIG_STATUS == VERSION_SWITCH_ON 85 +#ifdef IRC_CONFIG_STATUS_ON
86 #include "MediaProc/IRC_funtion/IRC_funtion.h" 86 #include "MediaProc/IRC_funtion/IRC_funtion.h"
87 #endif 87 #endif
88 88
@@ -103,7 +103,7 @@ static const char *s_widgetTypeNameArray[] = { @@ -103,7 +103,7 @@ static const char *s_widgetTypeNameArray[] = {
103 // 按键编号 按键类型 发送数据 接收数据 103 // 按键编号 按键类型 发送数据 接收数据
104 104
105 //喊话器控件 105 //喊话器控件
106 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 106 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
107 static const T_DjiWidgetHandlerListItem s_widgetHandlerList[] = { 107 static const T_DjiWidgetHandlerListItem s_widgetHandlerList[] = {
108 //喊话器部分 108 //喊话器部分
109 {0, DJI_WIDGET_TYPE_BUTTON, DjiTestWidget_SetWidgetValue, DjiTestWidget_GetWidgetValue, NULL},//上一曲 109 {0, DJI_WIDGET_TYPE_BUTTON, DjiTestWidget_SetWidgetValue, DjiTestWidget_GetWidgetValue, NULL},//上一曲
@@ -154,7 +154,7 @@ int32_t s_widgetValueList[29] = { OFF, OFF, PLAY_PAUSE, 30, 30, PLAY_SPEED_ @@ -154,7 +154,7 @@ int32_t s_widgetValueList[29] = { OFF, OFF, PLAY_PAUSE, 30, 30, PLAY_SPEED_
154 #endif 154 #endif
155 155
156 //红外控件 156 //红外控件
157 -#if IRC_CONFIG_STATUS == VERSION_SWITCH_ON 157 +#ifdef IRC_CONFIG_STATUS_ON
158 static const T_DjiWidgetHandlerListItem s_widgetHandlerList[] = { 158 static const T_DjiWidgetHandlerListItem s_widgetHandlerList[] = {
159 //设备功能 159 //设备功能
160 {0, DJI_WIDGET_TYPE_LIST, DjiTestWidget_SetWidgetValue, DjiTestWidget_GetWidgetValue, NULL},//相机流切换 160 {0, DJI_WIDGET_TYPE_LIST, DjiTestWidget_SetWidgetValue, DjiTestWidget_GetWidgetValue, NULL},//相机流切换
@@ -460,7 +460,7 @@ static void *DjiTest_WidgetTask(void *arg) @@ -460,7 +460,7 @@ static void *DjiTest_WidgetTask(void *arg)
460 //喊话器控件 460 //喊话器控件
461 static T_JZsdkReturnCode Megphone_Widget(unsigned int index, unsigned int value) 461 static T_JZsdkReturnCode Megphone_Widget(unsigned int index, unsigned int value)
462 { 462 {
463 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 463 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
464 switch(index){ 464 switch(index){
465 //喊话器部分 465 //喊话器部分
466 case 0://上一曲 466 case 0://上一曲
@@ -724,7 +724,7 @@ static T_JZsdkReturnCode Megphone_Widget(unsigned int index, unsigned int value) @@ -724,7 +724,7 @@ static T_JZsdkReturnCode Megphone_Widget(unsigned int index, unsigned int value)
724 static int EnlargeScreen = JZ_FLAGCODE_OFF; //画面放大系数 724 static int EnlargeScreen = JZ_FLAGCODE_OFF; //画面放大系数
725 static T_JZsdkReturnCode Irc_Widget(unsigned int index, unsigned int value) 725 static T_JZsdkReturnCode Irc_Widget(unsigned int index, unsigned int value)
726 { 726 {
727 -#if IRC_CONFIG_STATUS == VERSION_SWITCH_ON 727 +#ifdef IRC_CONFIG_STATUS_ON
728 switch(index) 728 switch(index)
729 { 729 {
730 case 0://码流切换 730 case 0://码流切换
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 #include "version_choose.h" 46 #include "version_choose.h"
47 47
48 48
49 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 49 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
50 #include "opus.h" 50 #include "opus.h"
51 #include "Megaphone/Megaphone.h" 51 #include "Megaphone/Megaphone.h"
52 #endif 52 #endif
@@ -217,7 +217,7 @@ static uint32_t DjiTest_KillVoicePlayProcess(uint32_t pid) @@ -217,7 +217,7 @@ static uint32_t DjiTest_KillVoicePlayProcess(uint32_t pid)
217 //--------------------------------------------修改为线程---------------------------------------------------- 217 //--------------------------------------------修改为线程----------------------------------------------------
218 static void *DecodeAudioData_task(void *arg) 218 static void *DecodeAudioData_task(void *arg)
219 { 219 {
220 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 220 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
221 FILE *fin; 221 FILE *fin;
222 FILE *fout; 222 FILE *fout;
223 OpusDecoder *decoder; 223 OpusDecoder *decoder;
@@ -320,7 +320,7 @@ DecodeFinsh: @@ -320,7 +320,7 @@ DecodeFinsh:
320 static T_DjiReturnCode DjiTest_PlayAudioData(void) 320 static T_DjiReturnCode DjiTest_PlayAudioData(void)
321 { 321 {
322 USER_LOG_INFO("播放固定位置的录音DjiTest_PlayAudioData "); 322 USER_LOG_INFO("播放固定位置的录音DjiTest_PlayAudioData ");
323 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 323 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
324 do 324 do
325 { 325 {
326 delayMs(100); 326 delayMs(100);
@@ -390,7 +390,7 @@ static T_DjiReturnCode DjiTest_PlayTtsData(void) @@ -390,7 +390,7 @@ static T_DjiReturnCode DjiTest_PlayTtsData(void)
390 390
391 JZsdk_Psdk_UI_io_Set_TTS_Play( data, readLen); 391 JZsdk_Psdk_UI_io_Set_TTS_Play( data, readLen);
392 392
393 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 393 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
394 394
395 //增加一个标志位，确认播放完成 395 //增加一个标志位，确认播放完成
396 while (Megaphone_GetMegaphoneStatus() == 0x20) //如果仍然在播放opus录音 396 while (Megaphone_GetMegaphoneStatus() == 0x20) //如果仍然在播放opus录音
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 extern "C" { 32 extern "C" {
33 #endif 33 #endif
34 34
35 -#include "./version_choose.h" 35 +#include "version_choose.h"
36 36
37 /* Exported constants --------------------------------------------------------*/ 37 /* Exported constants --------------------------------------------------------*/
38 // ATTENTION: User must goto https://developer.dji.com/user/apps/#all to create your own dji sdk application, get dji sdk application 38 // ATTENTION: User must goto https://developer.dji.com/user/apps/#all to create your own dji sdk application, get dji sdk application
@@ -73,4 +73,4 @@ extern "C" { @@ -73,4 +73,4 @@ extern "C" {
73 #endif 73 #endif
74 74
75 #endif // DJI_SDK_APP_INFO_H 75 #endif // DJI_SDK_APP_INFO_H
76 -/************************ (C) COPYRIGHT DJI Innovations *******END OF FILE******/ 76 +/************************ (C) COPYRIGHT DJI Innovations *******END OF FILE******/
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 #define DJI_SDK_CONFIG_H 28 #define DJI_SDK_CONFIG_H
29 29
30 /* Includes ------------------------------------------------------------------*/ 30 /* Includes ------------------------------------------------------------------*/
31 -#include "./version_choose.h" 31 +#include "version_choose.h"
32 32
33 #ifdef __cplusplus 33 #ifdef __cplusplus
34 extern "C" { 34 extern "C" {
@@ -89,4 +89,4 @@ extern "C" { @@ -89,4 +89,4 @@ extern "C" {
89 #endif 89 #endif
90 90
91 #endif // DJI_SDK_CONFIG_H 91 #endif // DJI_SDK_CONFIG_H
92 -/************************ (C) COPYRIGHT DJI Innovations *******END OF FILE******/ 92 +/************************ (C) COPYRIGHT DJI Innovations *******END OF FILE******/
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 * to DJI and may be covered by U.S. and foreign patents, patents in process, 10 * to DJI and may be covered by U.S. and foreign patents, patents in process,
11 * and protected by trade secret or copyright law. Dissemination of this 11 * and protected by trade secret or copyright law. Dissemination of this
12 * information, including but not limited to data and other proprietary 12 * information, including but not limited to data and other proprietary
13 - * material(s) incorporated within the information, in any form, is strictly 13 + * material(s) incorporated within the information, in any form, is strictly0
14 * prohibited without the express written consent of DJI. 14 * prohibited without the express written consent of DJI.
15 * 15 *
16 * If you receive this source code without DJI’s authorization, you may not 16 * If you receive this source code without DJI’s authorization, you may not
@@ -60,8 +60,8 @@ @@ -60,8 +60,8 @@
60 #include <string.h> 60 #include <string.h>
61 61
62 #include "JZsdkLib.h" 62 #include "JZsdkLib.h"
63 -#include "./BaseConfig.h"  
64 -#include "./version_choose.h" 63 +#include "BaseConfig.h"
  64 +#include "version_choose.h"
65 #include "Psdk_UI_io.h" 65 #include "Psdk_UI_io.h"
66 #include "DeviceInfo/DeviceInfo.h" 66 #include "DeviceInfo/DeviceInfo.h"
67 67
@@ -486,7 +486,7 @@ int main(int argc, char *argv[]) @@ -486,7 +486,7 @@ int main(int argc, char *argv[])
486 // #endif 486 // #endif
487 487
488 //注册喊话器回调函数-------------------------------------------------------------------------------START 488 //注册喊话器回调函数-------------------------------------------------------------------------------START
489 -#if MEGAPHONE_CONFIG_STATUS == VERSION_SWITCH_ON 489 +#ifdef MEGAPHONE_CONFIG_STATUS_ON
490 returnCode = DjiTest_WidgetSpeakerStartService(); 490 returnCode = DjiTest_WidgetSpeakerStartService();
491 if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) { 491 if (returnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) {
492 USER_LOG_ERROR("widget speaker test init error"); 492 USER_LOG_ERROR("widget speaker test init error");
@@ -835,6 +835,8 @@ static T_DjiReturnCode DjiUser_FillInUserInfo(T_DjiUserInfo *userInfo) @@ -835,6 +835,8 @@ static T_DjiReturnCode DjiUser_FillInUserInfo(T_DjiUserInfo *userInfo)
835 memcpy(userInfo->baudRate, USER_BAUD_RATE, USER_UTIL_MIN(sizeof(userInfo->baudRate), strlen(USER_BAUD_RATE))); 835 memcpy(userInfo->baudRate, USER_BAUD_RATE, USER_UTIL_MIN(sizeof(userInfo->baudRate), strlen(USER_BAUD_RATE)));
836 strncpy(userInfo->developerAccount, USER_DEVELOPER_ACCOUNT, sizeof(userInfo->developerAccount) - 1); 836 strncpy(userInfo->developerAccount, USER_DEVELOPER_ACCOUNT, sizeof(userInfo->developerAccount) - 1);
837 837
  838 + USER_LOG_INFO("填充信息完毕");
  839 +
838 return DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 840 return DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
839 } 841 }
840 842
@@ -1086,4 +1088,4 @@ void *getworkmodeTask(void *arg) @@ -1086,4 +1088,4 @@ void *getworkmodeTask(void *arg)
1086 int flag = 0x01; 1088 int flag = 0x01;
1087 Main_StartupPriority(&flag); 1089 Main_StartupPriority(&flag);
1088 1090
1089 -} 1091 +}
@@ -72,4 +72,4 @@ T_DjiReturnCode HalNetWork_GetDeviceInfo(T_DjiHalNetworkDeviceInfo *deviceInfo); @@ -72,4 +72,4 @@ T_DjiReturnCode HalNetWork_GetDeviceInfo(T_DjiHalNetworkDeviceInfo *deviceInfo);
72 #endif 72 #endif
73 73
74 #endif // HAL_NETWORK_H 74 #endif // HAL_NETWORK_H
75 -/************************ (C) COPYRIGHT DJI Innovations *******END OF FILE******/ 75 +/************************ (C) COPYRIGHT DJI Innovations *******END OF FILE******/