潘浩彬 / JZSDK_Linux · 提交

转到一个项目

作者 ookk303
提交 97b0d40f9c3987e455675f54f38f0f47e2217fea 1 个父辈 2f430e65

保存内容

内嵌 并排对比
正在显示 34 个修改的文件 包含 707 行增加 和 514 行删除
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 ThirdParty 3 ThirdParty
4 ModuleLib 4 ModuleLib
5 备份 5 备份
6 - 6 +linux_kernel
7 7
8 project_build/AUTEL_道通PSDK 8 project_build/AUTEL_道通PSDK
9 project_build/GDU_普宙PSDK 9 project_build/GDU_普宙PSDK
  1 +{
  2 + "configurations": [
  3 + {
  4 + "name": "Win32",
  5 + "includePath": [
  6 + "${workspaceFolder}/**",
  7 + "${workspaceFolder}/linux_kernel/include/**"
  8 + ],
  9 + "defines": [
  10 + "_DEBUG",
  11 + "UNICODE",
  12 + "_UNICODE"
  13 + ],
  14 + "cStandard": "c99",
  15 + "intelliSenseMode": "${default}"
  16 + }
  17 + ],
  18 + "version": 4
  19 +}
@@ -42,7 +42,8 @@ @@ -42,7 +42,8 @@
42 "jzsdk_uart_send.h": "c", 42 "jzsdk_uart_send.h": "c",
43 "espeak_tts.h": "c", 43 "espeak_tts.h": "c",
44 "buffersrc.h": "c", 44 "buffersrc.h": "c",
45 - "audiodeal.h": "c" 45 + "audiodeal.h": "c",
  46 + "wiringpi.h": "c"
46 }, 47 },
47 "Codegeex.GenerationPreference": "automatic" 48 "Codegeex.GenerationPreference": "automatic"
48 } 49 }
1 # 编译链的配置 1 # 编译链的配置
2 2
3 #1、编译链与设备类型的选择 3 #1、编译链与设备类型的选择
4 -set(DEVICE_NAME JZ_H1E) 4 +set(DEVICE_NAME JZ_H150S)
5 #上一行为禁止修改行 5 #上一行为禁止修改行
6 6
  7 +message("**************************JZSDK构建编译开始***************************\n")
  8 +
7 if("${DEVICE_NAME}" STREQUAL "JZ_H1E") 9 if("${DEVICE_NAME}" STREQUAL "JZ_H1E")
8 set(MAKE_COMPILER ARM_CORTEXA9_LINUX) 10 set(MAKE_COMPILER ARM_CORTEXA9_LINUX)
9 set(DEVICE_TYPE MEGAPHONE) 11 set(DEVICE_TYPE MEGAPHONE)
@@ -70,4 +72,4 @@ else() @@ -70,4 +72,4 @@ else()
70 message(FATAL_ERROR "不支持的编译链") 72 message(FATAL_ERROR "不支持的编译链")
71 endif() 73 endif()
72 74
73 -message("编译链配置完毕\n")  
  75 +message("\n**************************编译链配置完毕***********************\n")
1 -# SubsidiaryThirdPartyConfig.cmake 附属第三方库配置文件  
2 -  
3 -set(IFLAY_TTS_MODULE VERSION_SWITCH_OFF)  
4 -set(ESPEAK_TTS_MODULE VERSION_SWITCH_OFF)  
5 -set(ALSALIB_MODULE VERSION_SWITCH_OFF)  
6 -set(OPUS_MODULE VERSION_SWITCH_OFF)  
7 -set(LIB_RTK_MMP VERSION_SWITCH_OFF)  
8 -set(LIB_USB VERSION_SWITCH_OFF)  
9 -set(LIB_KT_IRC VERSION_SWITCH_OFF)  
10 -  
11 -add_definitions(-D COMPILE_MODE_MODULE) #设置代码为编译模式  
12 -  
13 -if(${MEGAPHONE_MODULE} STREQUAL "VERSION_SWITCH_ON")  
14 - message("\n喊话器模块已加载")  
15 - add_definitions(-DMACRO_MEGAPHONE_MODULE) #加载喊话器模块  
16 -  
17 - message("加载讯飞TTS模块")  
18 - set(IFLAY_TTS_MODULE VERSION_SWITCH_ON)  
19 -  
20 - message("加载espeak模块")  
21 - set(ESPEAK_TTS_MODULE VERSION_SWITCH_ON)  
22 -  
23 - message("加载alsalib模块")  
24 - set(ALSALIB_MODULE VERSION_SWITCH_ON)  
25 -  
26 - message("加载OPUS模块")  
27 - set(OPUS_MODULE VERSION_SWITCH_ON)  
28 -endif()  
29 -  
30 -if(${IRC_MODULE} STREQUAL "VERSION_SWITCH_ON")  
31 - message("\n红外相机模块已加载")  
32 - add_definitions(-DMACRO_IRC_MODULE)  
33 -  
34 - message("加载RTK模块")  
35 - set(LIB_RTK_MMP VERSION_SWITCH_ON)  
36 -  
37 - message("加载USB模块")  
38 - set(LIB_USB VERSION_SWITCH_ON)  
39 -  
40 - message("\n媒体管理模块已加载")  
41 - add_definitions(-DMACRO_MEDIA_PROC_MODULE)  
42 - if(${IRC_MODULE} STREQUAL "VERSION_SWITCH_ON")  
43 - set(LIB_KT_IRC VERSION_SWITCH_ON)  
44 - endif()  
45 -endif()  
46 -  
47 -  
48 -  
49 -if(${SIDE_LASER_MODULE} STREQUAL "VERSION_SWITCH_ON")  
50 - message("加载侧面激光模块")  
51 - add_definitions(-DMACRO_SIDE_LASER_MODULE)  
52 -endif()  
53 -  
54 -  
55 -message("附属库已加载\n")  
  1 +# 模组构建文件，用于加载源代码 与 配置代码中的开关
  2 +# ${ROOT_DIRS}为cmakelist文件提供的工程根目录
  3 +
  4 +message("\n*************************开始模块构建***********************\n")
  5 +
  6 +set(IFLAY_TTS_MODULE VERSION_SWITCH_OFF)
  7 +set(ESPEAK_TTS_MODULE VERSION_SWITCH_OFF)
  8 +set(ALSALIB_MODULE VERSION_SWITCH_OFF)
  9 +set(OPUS_MODULE VERSION_SWITCH_OFF)
  10 +set(LIB_RTK_MMP VERSION_SWITCH_OFF)
  11 +set(LIB_USB VERSION_SWITCH_OFF)
  12 +set(LIB_KT_IRC VERSION_SWITCH_OFF)
  13 +
  14 +add_definitions(-D COMPILE_MODE_MODULE) #设置代码为编译模式
  15 +
  16 +#加载基础库JZSDK库基础代码
  17 +file(GLOB_RECURSE JZSDK_COMMON_SRC ${ROOT_DIRS}JZsdk_Common/*.c)
  18 +list(APPEND ALL_SRC_FILES ${JZSDK_COMMON_SRC})
  19 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}JZsdk_Common)
  20 +
  21 +file(GLOB_RECURSE JZSDK_CONFIG_SRC ${ROOT_DIRS}JZsdk_Config/*.c)
  22 +list(APPEND ALL_SRC_FILES ${JZSDK_CONFIG_SRC})
  23 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}JZsdk_Config)
  24 +
  25 +file(GLOB_RECURSE JZSDK_HAL_SRC ${ROOT_DIRS}JZsdk_hal/*.c)
  26 +list(APPEND ALL_SRC_FILES ${JZSDK_HAL_SRC})
  27 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}JZsdk_hal)
  28 +
  29 +file(GLOB_RECURSE JZSDK_OSAL_SRC ${ROOT_DIRS}JZsdk_osal/*.c)
  30 +list(APPEND ALL_SRC_FILES ${JZSDK_OSAL_SRC})
  31 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}JZsdk_osal)
  32 +
  33 +message("\nJZSDK基础代码加载完毕\n")
  34 +
  35 +#如果要加载设备信息模块，需要加载以下附属内容
  36 +if(${DEVICE_INFO_MODULE} STREQUAL "VERSION_SWITCH_ON")
  37 + message("\n设备信息模块源码加载中")
  38 + file(GLOB_RECURSE DEVICE_MESSAGE_SRC ${ROOT_DIRS}Module/DeviceInfo/*.c)
  39 + list(APPEND ALL_SRC_FILES ${DEVICE_MESSAGE_SRC})
  40 +
  41 +endif()
  42 +
  43 +#如果要加载云台模块，需要加载以下附属内容
  44 +if(${GIMBAL_MODULE} STREQUAL "VERSION_SWITCH_ON")
  45 + message("\n云台模块源码加载中")
  46 + file(GLOB_RECURSE GIMBAL_SRC ${ROOT_DIRS}Module/Gimbal/*.c)
  47 + list(APPEND ALL_SRC_FILES ${GIMBAL_SRC})
  48 +
  49 +endif()
  50 +
  51 +#如果要加载引脚模块，需要加载以下附属内容
  52 +if(${IRCUT_MODULE} STREQUAL "VERSION_SWITCH_ON")
  53 + message("\n引脚模块源码加载中")
  54 + file(GLOB_RECURSE MODULE_IRCUT_SRC ${ROOT_DIRS}Module/Ircut/*.c)
  55 + list(APPEND ALL_SRC_FILES ${MODULE_IRCUT_SRC})
  56 +
  57 +endif()
  58 +
  59 +#如果要加载光源模块，需要加载以下附属内容
  60 +if(${LIGHTING_MODULE} STREQUAL "VERSION_SWITCH_ON")
  61 + message("\n光源模块加载中")
  62 +
  63 + #打开光源的代码编译部分
  64 + add_definitions(-DMACRO_LIGHTING_MODULE)
  65 +
  66 + #将光源的源代码加入编译中
  67 + file(GLOB_RECURSE LIGHTING_SRC ${ROOT_DIRS}Module/Lighting/*.c)
  68 + list(APPEND ALL_SRC_FILES ${LIGHTING_SRC})
  69 +
  70 +endif()
  71 +
  72 +#如果要加载媒体管理模块，需要加载以下附属内容
  73 +if(${MEDIA_PROC_MODULE} STREQUAL "VERSION_SWITCH_ON")
  74 + message("\n媒体管理模块加载中")
  75 +
  76 + #将媒体管理模块的源代码加入编译中
  77 + add_definitions(-DMACRO_MEDIA_PROC_MODULE)
  78 +
  79 + file(GLOB_RECURSE MEDIA_PROC_SRC ${ROOT_DIRS}Module/MediaProc/*.c)
  80 + file(GLOB_RECURSE MEDIA_PROC_SRC_CPP ${ROOT_DIRS}Module/MediaProc/*.cpp)
  81 + list(APPEND ALL_SRC_FILES ${MEDIA_PROC_SRC})
  82 + list(APPEND ALL_SRC_FILES ${MEDIA_PROC_SRC_CPP})
  83 +
  84 + #如果要加载红外相机模块，额外加载以下附属内容
  85 + if(${IRC_MODULE} STREQUAL "VERSION_SWITCH_ON")
  86 + message("加载红外相机模块")
  87 + add_definitions(-DMACRO_IRC_MODULE)
  88 +
  89 + message("加载RTK模块")
  90 + set(LIB_RTK_MMP VERSION_SWITCH_ON)
  91 +
  92 + message("加载USB模块")
  93 + set(LIB_USB VERSION_SWITCH_ON)
  94 +
  95 + if(${IRC_MODULE} STREQUAL "VERSION_SWITCH_ON")
  96 + set(LIB_KT_IRC VERSION_SWITCH_ON)
  97 +
  98 + endif()
  99 + endif()
  100 +
  101 +endif()
  102 +
  103 +
  104 +
  105 +#如果要加载喊话器模块，需要加载以下附属内容
  106 +if(${MEGAPHONE_MODULE} STREQUAL "VERSION_SWITCH_ON")
  107 + message("\n喊话器模块加载中")
  108 +
  109 + message("加载喊话器")
  110 + add_definitions(-DMACRO_MEGAPHONE_MODULE) #加载喊话器模块
  111 + file(GLOB_RECURSE MEGAPHONE_SRC ${ROOT_DIRS}Module/Megaphone/*.c)
  112 + list(APPEND ALL_SRC_FILES ${MEGAPHONE_SRC})
  113 +
  114 + message("加载音频库")
  115 + file(GLOB_RECURSE AUDIODEAL_SRC ${ROOT_DIRS}Module/AudioDeal/*.c)
  116 + list(APPEND ALL_SRC_FILES ${AUDIODEAL_SRC})
  117 +
  118 + message("加载讯飞TTS模块")
  119 + set(IFLAY_TTS_MODULE VERSION_SWITCH_ON)
  120 +
  121 + message("加载espeak模块")
  122 + set(ESPEAK_TTS_MODULE VERSION_SWITCH_ON)
  123 +
  124 + message("加载alsalib模块")
  125 + set(ALSALIB_MODULE VERSION_SWITCH_ON)
  126 +
  127 + message("加载OPUS模块")
  128 + set(OPUS_MODULE VERSION_SWITCH_ON)
  129 +endif()
  130 +
  131 +#如果要加载电源管理模块，需要加载以下附属内容
  132 +if(${POWER_MANAGER_MODULE} STREQUAL "VERSION_SWITCH_ON")
  133 +
  134 + message("\n电源模块加载中")
  135 + file(GLOB_RECURSE POWERMANAGER_SRC ${ROOT_DIRS}Module/PowerManager/*.c)
  136 + list(APPEND ALL_SRC_FILES ${POWERMANAGER_SRC})
  137 +
  138 +endif()
  139 +
  140 +#如果要加载侧面激光模块，需要加载以下附属内容
  141 +if(${SIDE_LASER_MODULE} STREQUAL "VERSION_SWITCH_ON")
  142 + message("\n侧面激光模块加载中")
  143 +
  144 + #打开侧面激光的代码编译部分
  145 + add_definitions(-DMACRO_SIDE_LASER_MODULE)
  146 +
  147 + file(GLOB_RECURSE MODULE_SIDE_LASER_SRC ${ROOT_DIRS}Module/SideLaser/*.c)
  148 + list(APPEND ALL_SRC_FILES ${MODULE_SIDE_LASER_SRC})
  149 +endif()
  150 +
  151 +#如果要加载UI模块，需要加载以下附属内容
  152 +if(${UI_CONTROL_MODULE} STREQUAL "VERSION_SWITCH_ON")
  153 + message("\nUI模块源码加载中")
  154 +
  155 + file(GLOB_RECURSE MODULE_UICONTROL_SRC ${ROOT_DIRS}Module/UI_control/*.c)
  156 + list(APPEND ALL_SRC_FILES ${MODULE_UICONTROL_SRC})
  157 +
  158 +endif()
  159 +
  160 +# wiringPi
  161 +if(${WIRINGPI_MODULE} STREQUAL "VERSION_SWITCH_ON")
  162 + message("\nwiringPi模块加载中")
  163 +
  164 + file(GLOB_RECURSE WIRINGPI_SRC ${ROOT_DIRS}ThirdParty/wiringPi/*.c)
  165 + list(APPEND ALL_SRC_FILES ${WIRINGPI_SRC})
  166 + list(APPEND ALL_INC_FILES ${ROOT_DIRS}ThirdParty/wiringPi)
  167 +
  168 + #打开wiringPi的代码编译部分
  169 + add_definitions(-DMACRO_WIRINGPI_MODULE)
  170 +
  171 +endif()
  172 +
  173 +# 如果要加入特殊图像处理模块，需要加载以下附属内容
  174 +if(${IMAGEPROCESSING_MODULE} STREQUAL "VERSION_SWITCH_ON")
  175 + message("\n特殊图像处理模块加载中")
  176 +
  177 + file(GLOB_RECURSE MODULE_IMAGEPROCESSING_SRC ${ROOT_DIRS}Module/ImageProcessing/*.c)
  178 + file(GLOB_RECURSE MODULE_IMAGEPROCESSING_cpp_SRC ${ROOT_DIRS}Module/ImageProcessing/*.cpp)
  179 + list(APPEND ALL_SRC_FILES ${MODULE_IMAGEPROCESSING_SRC})
  180 + list(APPEND ALL_SRC_FILES ${MODULE_IMAGEPROCESSING_cpp_SRC})
  181 +endif()
  182 +
  183 +
  184 +
  185 +# 头文件加载，后续再进行优化
  186 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/Megaphone)
  187 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/Ircut)
  188 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/Gimbal)
  189 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/Lighting)
  190 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/UI_control)
  191 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/Camera)
  192 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/PowerManager)
  193 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/TestAPP)
  194 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/ImageProcessing)
  195 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module/SerialManagement)
  196 +list(APPEND ALL_INC_FILES ${ROOT_DIRS}Module)
  197 +
  198 +message("**************************库构建完毕***************************\n")
1 -# ModuleConfig.cmake 模组模块的配置文件 1 +# 设备类型的模块配置文件
  2 +# 主要用于根据设备类型
  3 +# 将对应的模块打开
2 4
3 ###################### 自己的库 ############################## 5 ###################### 自己的库 ##############################
4 # AudioDeal 音频处理模块 6 # AudioDeal 音频处理模块
@@ -16,8 +18,6 @@ set(IRCUT_MODULE VERSION_SWITCH_OFF) @@ -16,8 +18,6 @@ set(IRCUT_MODULE VERSION_SWITCH_OFF)
16 # LIGHTING 光源处理模块 18 # LIGHTING 光源处理模块
17 set(LIGHTING_MODULE VERSION_SWITCH_OFF) 19 set(LIGHTING_MODULE VERSION_SWITCH_OFF)
18 20
19 -# MediaProc 媒体管理模块  
20 -set(MEDIA_PROC_MODULE VERSION_SWITCH_OFF)  
21 21
22 # 喊话器模块 22 # 喊话器模块
23 set(MEGAPHONE_MODULE VERSION_SWITCH_OFF) 23 set(MEGAPHONE_MODULE VERSION_SWITCH_OFF)
@@ -28,6 +28,10 @@ set(POWER_MANAGER_MODULE VERSION_SWITCH_OFF) @@ -28,6 +28,10 @@ set(POWER_MANAGER_MODULE VERSION_SWITCH_OFF)
28 # UI管理模块 28 # UI管理模块
29 set(UI_CONTROL_MODULE VERSION_SWITCH_OFF) 29 set(UI_CONTROL_MODULE VERSION_SWITCH_OFF)
30 30
  31 +
  32 +# MediaProc 媒体管理模块
  33 +set(MEDIA_PROC_MODULE VERSION_SWITCH_OFF)
  34 +
31 # 红外相机模块 35 # 红外相机模块
32 set(IRC_MODULE VERSION_SWITCH_OFF) 36 set(IRC_MODULE VERSION_SWITCH_OFF)
33 37
@@ -42,7 +46,13 @@ set(FFMPEG_MODULE VERSION_SWITCH_OFF) @@ -42,7 +46,13 @@ set(FFMPEG_MODULE VERSION_SWITCH_OFF)
42 # cedarxLib 46 # cedarxLib
43 set(CedarxLib VERSION_SWITCH_OFF) 47 set(CedarxLib VERSION_SWITCH_OFF)
44 48
45 -########################## 通用库 ########################################### 49 +# wiringPi库
  50 +set(WIRINGPI_MODULE VERSION_SWITCH_OFF)
  51 +
  52 +# OpenCV库
  53 +set(IMAGEPROCESSING_MODULE VERSION_SWITCH_OFF)
  54 +
  55 +########################## 通用库加载 ###########################################
46 56
47 # 添加信息模块 57 # 添加信息模块
48 set(DEVICE_INFO_MODULE VERSION_SWITCH_ON) 58 set(DEVICE_INFO_MODULE VERSION_SWITCH_ON)
@@ -50,7 +60,12 @@ set(DEVICE_INFO_MODULE VERSION_SWITCH_ON) @@ -50,7 +60,12 @@ set(DEVICE_INFO_MODULE VERSION_SWITCH_ON)
50 # 添加UI管理模块 60 # 添加UI管理模块
51 set(UI_CONTROL_MODULE VERSION_SWITCH_ON) 61 set(UI_CONTROL_MODULE VERSION_SWITCH_ON)
52 62
53 -##################################################################### 63 +# 添加电源管理模块
  64 +set(POWER_MANAGER_MODULE VERSION_SWITCH_ON)
  65 +
  66 +message("通用库加载完成")
  67 +
  68 +########################### 独立库加载 ##########################################
54 69
55 if("${DEVICE_NAME}" STREQUAL "JZ_H1E") 70 if("${DEVICE_NAME}" STREQUAL "JZ_H1E")
56 # 添加AudioDeal 音频处理模块 71 # 添加AudioDeal 音频处理模块
@@ -68,9 +83,6 @@ if("${DEVICE_NAME}" STREQUAL "JZ_H1E") @@ -68,9 +83,6 @@ if("${DEVICE_NAME}" STREQUAL "JZ_H1E")
68 # 添加喊话器模块 83 # 添加喊话器模块
69 set(MEGAPHONE_MODULE VERSION_SWITCH_ON) 84 set(MEGAPHONE_MODULE VERSION_SWITCH_ON)
70 85
71 - # 添加电源管理模块  
72 - set(POWER_MANAGER_MODULE VERSION_SWITCH_ON)  
73 -  
74 # 添加FFMPEG及其附属模块 86 # 添加FFMPEG及其附属模块
75 set(FFMPEG_MODULE VERSION_SWITCH_ON) 87 set(FFMPEG_MODULE VERSION_SWITCH_ON)
76 88
@@ -91,9 +103,6 @@ elseif("${DEVICE_NAME}" STREQUAL "JZ_H1T") @@ -91,9 +103,6 @@ elseif("${DEVICE_NAME}" STREQUAL "JZ_H1T")
91 # 添加喊话器模块 103 # 添加喊话器模块
92 set(MEGAPHONE_MODULE VERSION_SWITCH_ON) 104 set(MEGAPHONE_MODULE VERSION_SWITCH_ON)
93 105
94 - # 添加电源管理模块  
95 - set(POWER_MANAGER_MODULE VERSION_SWITCH_ON)  
96 -  
97 # 添加FFMPEG及其附属模块 106 # 添加FFMPEG及其附属模块
98 set(FFMPEG_MODULE VERSION_SWITCH_ON) 107 set(FFMPEG_MODULE VERSION_SWITCH_ON)
99 108
@@ -114,9 +123,6 @@ elseif("${DEVICE_NAME}" STREQUAL "JZ_U3S") @@ -114,9 +123,6 @@ elseif("${DEVICE_NAME}" STREQUAL "JZ_U3S")
114 # 添加喊话器模块 123 # 添加喊话器模块
115 set(MEGAPHONE_MODULE VERSION_SWITCH_ON) 124 set(MEGAPHONE_MODULE VERSION_SWITCH_ON)
116 125
117 - # 添加电源管理模块  
118 - set(POWER_MANAGER_MODULE VERSION_SWITCH_ON)  
119 -  
120 # 添加FFMPEG及其附属模块 126 # 添加FFMPEG及其附属模块
121 set(FFMPEG_MODULE VERSION_SWITCH_ON) 127 set(FFMPEG_MODULE VERSION_SWITCH_ON)
122 128
@@ -140,9 +146,6 @@ elseif("${DEVICE_NAME}" STREQUAL "JZ_U3D") @@ -140,9 +146,6 @@ elseif("${DEVICE_NAME}" STREQUAL "JZ_U3D")
140 # 添加喊话器模块 146 # 添加喊话器模块
141 set(MEGAPHONE_MODULE VERSION_SWITCH_ON) 147 set(MEGAPHONE_MODULE VERSION_SWITCH_ON)
142 148
143 - # 添加电源管理模块  
144 - set(POWER_MANAGER_MODULE VERSION_SWITCH_ON)  
145 -  
146 # 添加FFMPEG及其附属模块 149 # 添加FFMPEG及其附属模块
147 set(FFMPEG_MODULE VERSION_SWITCH_ON) 150 set(FFMPEG_MODULE VERSION_SWITCH_ON)
148 151
@@ -163,8 +166,51 @@ elseif("${DEVICE_NAME}" STREQUAL "JZ_U30") @@ -163,8 +166,51 @@ elseif("${DEVICE_NAME}" STREQUAL "JZ_U30")
163 # 添加喊话器模块 166 # 添加喊话器模块
164 set(MEGAPHONE_MODULE VERSION_SWITCH_ON) 167 set(MEGAPHONE_MODULE VERSION_SWITCH_ON)
165 168
166 - # 添加电源管理模块  
167 - set(POWER_MANAGER_MODULE VERSION_SWITCH_ON) 169 + # 添加FFMPEG及其附属模块
  170 + set(FFMPEG_MODULE VERSION_SWITCH_ON)
  171 +
  172 +
  173 +elseif("${DEVICE_NAME}" STREQUAL "JZ_H150S")
  174 + # 添加AudioDeal 音频处理模块
  175 + set(AUDIODEAL_MODULE VERSION_SWITCH_ON)
  176 +
  177 + # 添加Gimbal 云台处理模块
  178 + set(GIMBAL_MODULE VERSION_SWITCH_ON)
  179 +
  180 + # 添加IRCUT 引脚处理模块
  181 + set(IRCUT_MODULE VERSION_SWITCH_ON)
  182 +
  183 + # 添加喊话器模块
  184 + set(MEGAPHONE_MODULE VERSION_SWITCH_ON)
  185 +
  186 + # 添加MediaProc 媒体管理模块
  187 + set(MEDIA_PROC_MODULE VERSION_SWITCH_ON)
  188 +
  189 + # 添加wringpi
  190 + set(WIRINGPI_MODULE VERSION_SWITCH_ON)
  191 +
  192 + # 添加FFMPEG及其附属模块
  193 + set(FFMPEG_MODULE VERSION_SWITCH_ON)
  194 +
  195 +elseif("${DEVICE_NAME}" STREQUAL "JZ_H150T")
  196 +
  197 + # 添加AudioDeal 音频处理模块
  198 + set(AUDIODEAL_MODULE VERSION_SWITCH_ON)
  199 +
  200 + # 添加Gimbal 云台处理模块
  201 + set(GIMBAL_MODULE VERSION_SWITCH_ON)
  202 +
  203 + # 添加IRCUT 引脚处理模块
  204 + set(IRCUT_MODULE VERSION_SWITCH_ON)
  205 +
  206 + # 添加喊话器模块
  207 + set(MEGAPHONE_MODULE VERSION_SWITCH_ON)
  208 +
  209 + # 添加MediaProc 媒体管理模块
  210 + set(MEDIA_PROC_MODULE VERSION_SWITCH_ON)
  211 +
  212 + # 添加wringpi
  213 + set(WIRINGPI_MODULE VERSION_SWITCH_ON)
168 214
169 # 添加FFMPEG及其附属模块 215 # 添加FFMPEG及其附属模块
170 set(FFMPEG_MODULE VERSION_SWITCH_ON) 216 set(FFMPEG_MODULE VERSION_SWITCH_ON)
@@ -183,9 +229,6 @@ elseif("${DEVICE_NAME}" STREQUAL "JZ_C1") @@ -183,9 +229,6 @@ elseif("${DEVICE_NAME}" STREQUAL "JZ_C1")
183 # 添加MediaProc 媒体管理模块 229 # 添加MediaProc 媒体管理模块
184 set(MEDIA_PROC_MODULE VERSION_SWITCH_ON) 230 set(MEDIA_PROC_MODULE VERSION_SWITCH_ON)
185 231
186 - # 添加电源管理模块  
187 - set(POWER_MANAGER_MODULE VERSION_SWITCH_ON)  
188 -  
189 # 添加红外相机模块 232 # 添加红外相机模块
190 set(IRC_MODULE VERSION_SWITCH_ON) 233 set(IRC_MODULE VERSION_SWITCH_ON)
191 234
@@ -193,4 +236,4 @@ elseif("${DEVICE_NAME}" STREQUAL "JZ_C1") @@ -193,4 +236,4 @@ elseif("${DEVICE_NAME}" STREQUAL "JZ_C1")
193 set(LIB_KT_MODULE VERSION_SWITCH_ON) 236 set(LIB_KT_MODULE VERSION_SWITCH_ON)
194 endif() 237 endif()
195 238
196 -message("模组模块已加载\n")  
  239 +message("***********************模组模块配置完毕*********************************\n")
1 -  
2 -# ModuleLoading.cmake 模块加载文件 1 +# 第一方/第三方 模块加载文件
  2 +# 主要用于加载动态库给编译使用
  3 +# ${ROOT_DIRS}为cmakelist文件提供的工程根目录
3 4
4 5
5 if(${IFLAY_TTS_MODULE} STREQUAL "VERSION_SWITCH_ON") 6 if(${IFLAY_TTS_MODULE} STREQUAL "VERSION_SWITCH_ON")
@@ -170,5 +171,7 @@ if(${LIB_KT_IRC} STREQUAL "VERSION_SWITCH_ON") @@ -170,5 +171,7 @@ if(${LIB_KT_IRC} STREQUAL "VERSION_SWITCH_ON")
170 ${PROJECT_NAME} 171 ${PROJECT_NAME}
171 ${ROOT_DIRS}/ThirdParty/KT_IRC/aarch64-none-linux-gnu/lib/libktlib.so 172 ${ROOT_DIRS}/ThirdParty/KT_IRC/aarch64-none-linux-gnu/lib/libktlib.so
172 ) 173 )
  174 + add_definitions(-DMACRO_KTIRC_MODULE)
173 endif() 175 endif()
174 176
  177 +message("**************************动态库加载完毕***************************\n")
@@ -7,25 +7,25 @@ @@ -7,25 +7,25 @@
7 #define VERSION_CHOOSE_H 7 #define VERSION_CHOOSE_H
8 #include "./ConfigParams.h" 8 #include "./ConfigParams.h"
9 //1~10行 除了D可以修改版本选择 禁止动任何东西 9 //1~10行 除了D可以修改版本选择 禁止动任何东西
10 -#define DEVICE_VERSION JZ_H1E 10 +#define DEVICE_VERSION JZ_H150S
11 11
12 //禁止修改行 选择是串口程序 还是 psdk程序 12 //禁止修改行 选择是串口程序 还是 psdk程序
13 #define APP_VERSION APP_PSDK 13 #define APP_VERSION APP_PSDK
14 14
15 //禁止修改行 板子型号 15 //禁止修改行 板子型号
16 -#define PLATFORM_VERSION PLATFORM_V3S 16 +#define PLATFORM_VERSION PLATFORM_H3
17 17
18 //禁止修改行 串口连接程序的软件版本号 18 //禁止修改行 串口连接程序的软件版本号
19 #define MAJOR_VERSION 0x01 19 #define MAJOR_VERSION 0x01
20 #define MINOR_VERSION 0x03 20 #define MINOR_VERSION 0x03
21 #define MODIFY_VERSION 0x09 21 #define MODIFY_VERSION 0x09
22 -#define DEBUG_VERSION 0x01 22 +#define DEBUG_VERSION 0x02
23 23
24 //禁止修改行 滤波方式 24 //禁止修改行 滤波方式
25 #define FILTERING_TYPE HIGH_PASS_FILTERING 25 #define FILTERING_TYPE HIGH_PASS_FILTERING
26 26
27 //禁止修改行固件属地 目前 国内版/海外版 27 //禁止修改行固件属地 目前 国内版/海外版
28 -#define FIRMWARE_ORIGIN OVERSEAS_VERSION 28 +#define FIRMWARE_ORIGIN DOMESTIC_VERSION
29 29
30 //禁止修改行指定特殊固件 30 //禁止修改行指定特殊固件
31 #define SPECIAL_VERSION SPECIAL_NORMAL 31 #define SPECIAL_VERSION SPECIAL_NORMAL
@@ -60,6 +60,11 @@ @@ -60,6 +60,11 @@
60 #define IRC_CONFIG_STATUS VERSION_SWITCH_OFF 60 #define IRC_CONFIG_STATUS VERSION_SWITCH_OFF
61 #endif 61 #endif
62 62
  63 + //是否加载ktirclib
  64 + #ifdef DMACRO_KTIRC_MODULE
  65 + #define KTIRC_LIB_STATUS_ON
  66 + #endif
  67 +
63 //是否加载usb模块 68 //是否加载usb模块
64 #ifdef MACRO_USB_MODULE 69 #ifdef MACRO_USB_MODULE
65 #define USB_CONFIG_STATUS VERSION_SWITCH_ON 70 #define USB_CONFIG_STATUS VERSION_SWITCH_ON
@@ -76,9 +81,7 @@ @@ -76,9 +81,7 @@
76 81
77 //是否加载WIRINGPI模块 82 //是否加载WIRINGPI模块
78 #ifdef MACRO_WIRINGPI_MODULE 83 #ifdef MACRO_WIRINGPI_MODULE
79 - #define WIRINGPI_STATUS VERSION_SWITCH_ON  
80 - #else  
81 - #define WIRINGPI_STATUS VERSION_SWITCH_OFF 84 + #define WIRINGPI_STATUS_ON
82 #endif 85 #endif
83 86
84 //是否加载侧边激光模块 87 //是否加载侧边激光模块
@@ -86,7 +89,12 @@ @@ -86,7 +89,12 @@
86 #define SIDE_LASER_STATUS_ON 89 #define SIDE_LASER_STATUS_ON
87 #endif 90 #endif
88 91
89 -#else 92 + //是否加载光源模块
  93 + #ifdef MACRO_LIGHTING_MODULE
  94 + #define LIGHTING_STATUS_ON
  95 + #endif
  96 +
  97 +#else //这里用于方便调试使用，不是实际加载的模组
90 //是否开启喊话器功能 98 //是否开启喊话器功能
91 #define MEGAPHONE_CONFIG_STATUS VERSION_SWITCH_ON 99 #define MEGAPHONE_CONFIG_STATUS VERSION_SWITCH_ON
92 100
@@ -103,10 +111,16 @@ @@ -103,10 +111,16 @@
103 #define RTK_MPP_STATUS VERSION_SWITCH_ON 111 #define RTK_MPP_STATUS VERSION_SWITCH_ON
104 112
105 //是否加载WIRINGPI模块 113 //是否加载WIRINGPI模块
106 - #define WIRINGPI_STATUS VERSION_SWITCH_ON 114 + #define WIRINGPI_STATUS_ON
107 115
108 //是否加载侧边激光模块 116 //是否加载侧边激光模块
109 #define SIDE_LASER_STATUS_ON 117 #define SIDE_LASER_STATUS_ON
  118 +
  119 + //默认开启ktlib
  120 + #define KTIRC_LIB_STATUS_ON
  121 +
  122 + //默认开启光源模块
  123 + #define LIGHTING_STATUS_ON
110 #endif 124 #endif
111 125
112 #endif 126 #endif
@@ -681,9 +681,6 @@ int JZsdk_Uart_SendDeal_Set_GimbalPitchAngle(int Uartport ,int angle) @@ -681,9 +681,6 @@ int JZsdk_Uart_SendDeal_Set_GimbalPitchAngle(int Uartport ,int angle)
681 //1、获取帧样板 681 //1、获取帧样板
682 JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_GIMBAL_PITCH_CONTROL, sendbuf, &send_buf_len); 682 JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_GIMBAL_PITCH_CONTROL, sendbuf, &send_buf_len);
683 683
684 - //char sendbuf[14] = {0x5A ,0x5A ,0x77 ,0x00 ,0x0E ,0x00 ,0x00 ,0x64 ,0x51 ,0x00 ,0x00 ,0x00 ,0x00 ,0x23};  
685 - //send_buf_len = 14;  
686 -  
687 //2、写入数据 684 //2、写入数据
688 if (angle < 0) 685 if (angle < 0)
689 { 686 {
@@ -239,23 +239,25 @@ T_JZsdkReturnCode Gimbal_Set_PitchFineTuning(int pitch) @@ -239,23 +239,25 @@ T_JZsdkReturnCode Gimbal_Set_PitchFineTuning(int pitch)
239 } 239 }
240 240
241 //设置本地微调值 241 //设置本地微调值
242 - g_MotorFineTuningPitch = g_MotorFineTuningPitch + pitch;  
243 -  
244 - //组合机是发到另外一个设备  
245 -#if DEVICE_VERSION == JZ_H1T  
246 - JZsdk_Uart_Send_SetGimbalFineTuningPitch(UART_DEV_1, g_MotorFineTuningPitch);  
247 -#else 242 + int temp_pitch = g_MotorFineTuningPitch + pitch;
248 //微调值要小于20度 243 //微调值要小于20度
249 - if (g_MotorFineTuningPitch >= 200) 244 + if (temp_pitch >= 200)
250 { 245 {
251 - g_MotorFineTuningPitch = 200; 246 + temp_pitch = 200;
252 } 247 }
253 248
254 - if (g_MotorFineTuningPitch <= -200) 249 + if (temp_pitch <= -200)
255 { 250 {
256 - g_MotorFineTuningPitch = -200; 251 + temp_pitch = -200;
257 } 252 }
258 253
  254 + g_MotorFineTuningPitch = temp_pitch;
  255 +
  256 + //组合机是发到另外一个设备
  257 +#if DEVICE_VERSION == JZ_H1T
  258 + JZsdk_Uart_Send_SetGimbalFineTuningPitch(UART_DEV_1, g_MotorFineTuningPitch);
  259 +#else
  260 +
259 //存储到文件 261 //存储到文件
260 MotorFineTuning_WritePitch(g_MotorFineTuningPitch); 262 MotorFineTuning_WritePitch(g_MotorFineTuningPitch);
261 #endif 263 #endif
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 10
11 #include "JZsdk_TaskManagement/TaskManagement.h" 11 #include "JZsdk_TaskManagement/TaskManagement.h"
12 #include "Gimbal_SpecialUart/Gimbal_SpecialUart.h" 12 #include "Gimbal_SpecialUart/Gimbal_SpecialUart.h"
  13 +#include "../Gimbal_Param.h"
13 14
14 #if WIRINGPI_STATUS == VERSION_SWITCH_ON 15 #if WIRINGPI_STATUS == VERSION_SWITCH_ON
15 #include <wiringPi.h> 16 #include <wiringPi.h>
@@ -66,16 +67,22 @@ T_JZsdkReturnCode Gimbal_DataDeal_SetRealAngle(int angle) @@ -66,16 +67,22 @@ T_JZsdkReturnCode Gimbal_DataDeal_SetRealAngle(int angle)
66 67
67 Gimbal_SpecialUart_UartSend(send_angle, 4); 68 Gimbal_SpecialUart_UartSend(send_angle, 4);
68 #elif DEVICE_VERSION == JZ_H10 69 #elif DEVICE_VERSION == JZ_H10
69 - int base = 200;  
70 - //完整计算公式  
71 - //angle_PWM = base + angle*195/((abs(MAX_PITCH)+abs(MIN_PITCH)))  
72 70
73 - //简化为  
74 - angle_PWM = base + angle*195/MIN_PITCH; 71 + int base_offset = 0; //最大最小值的偏移量 //正整数时，则总体角度向0偏移 为负数时，向-900便宜
  72 + //计算方法 设置最小角度时 为 PwM - 195 - 200 //设置最大角度时 为 PwM - 0 - 200
  73 + int base = 200; //0度
75 74
  75 + //每43.5对饮20度
  76 +
  77 + //完整计算公式
  78 + //angle_PWM = base + angle*195/((abs(MAX_PITCH) + abs(MIN_PITCH)))
76 //上调15度 79 //上调15度
77 //angle_PWM = 200 -angle*195/900 -150*195/900; //上调15度 80 //angle_PWM = 200 -angle*195/900 -150*195/900; //上调15度
78 -#if WIRINGPI_STATUS == VERSION_SWITCH_ON 81 +
  82 + //简化为
  83 + angle_PWM = + base_offset +angle*195/MIN_PITCH;
  84 +
  85 +#ifdef WIRINGPI_STATUS_ON
79 pwmWrite(18,angle_PWM); 86 pwmWrite(18,angle_PWM);
80 #endif 87 #endif
81 88
1 #include <stdlib.h> 1 #include <stdlib.h>
2 #include <stdio.h> 2 #include <stdio.h>
3 #include <string.h> 3 #include <string.h>
4 -#include "H3_ircut.h"  
5 -#include "version_choose.h"  
6 4
7 -#if WIRINGPI_STATUS == VERSION_SWITCH_ON 5 +#include "./H3_ircut.h"
  6 +#include "BaseConfig.h"
  7 +
  8 +//如果wiringPi库安装了，则使用wiringPi库，否则使用sysfs
  9 +#ifdef WIRINGPI_STATUS_ON
8 #include <wiringPi.h> 10 #include <wiringPi.h>
9 #endif 11 #endif
10 -#define AC 7  
11 -#define AC2 19  
12 12
13 -int now_ircut_mode=0; 13 +#define AMPLIFIER_IRCUT_PIN_1 7
  14 +#define AMPLIFIER_IRCUT_PIN_2 19
  15 +#define MOTOR_IRCUT_PIN 18
  16 +
  17 +//sys方案输入，未进行测试
14 int gpio_test_in(unsigned int gpio_chip_num, unsigned int gpio_offset_num) 18 int gpio_test_in(unsigned int gpio_chip_num, unsigned int gpio_offset_num)
15 { 19 {
16 FILE *fp; 20 FILE *fp;
@@ -62,7 +66,7 @@ int gpio_test_in(unsigned int gpio_chip_num, unsigned int gpio_offset_num) @@ -62,7 +66,7 @@ int gpio_test_in(unsigned int gpio_chip_num, unsigned int gpio_offset_num)
62 return (int)(buf[0]-48); 66 return (int)(buf[0]-48);
63 } 67 }
64 68
65 -//���ܣ�����GPIO��� 69 +//sys方案输入，未进行测试
66 int gpio_test_out(unsigned int gpio_chip_num, unsigned int gpio_offset_num,unsigned int gpio_out_val) 70 int gpio_test_out(unsigned int gpio_chip_num, unsigned int gpio_offset_num,unsigned int gpio_out_val)
67 { 71 {
68 FILE *fp; 72 FILE *fp;
@@ -116,60 +120,62 @@ int gpio_test_out(unsigned int gpio_chip_num, unsigned int gpio_offset_num,unsig @@ -116,60 +120,62 @@ int gpio_test_out(unsigned int gpio_chip_num, unsigned int gpio_offset_num,unsig
116 return 0; 120 return 0;
117 } 121 }
118 122
119 -void set_mute(int mutemode){//��������  
120 - if(mutemode==1)  
121 - {//ȡ������  
122 123
123 - //gpio_test_out(1,2,1);//gpio1_2 �����  
124 - }  
125 - if(mutemode==0)  
126 - {//����  
127 - //gpio_test_out(1,2,0);//gpio1_2 �����  
128 - }  
129 - else{  
130 - printf("mutemode error\n");  
131 - }  
132 -} 124 +/********************
  125 + *
  126 + *
  127 + * H3引脚初始化
  128 + *
  129 + *
  130 + * ****************/
  131 +T_JZsdkReturnCode H3_ircut_init()
  132 +{
  133 +#ifdef WIRINGPI_STATUS_ON
133 134
  135 + //wiringPi库的初始化
  136 + wiringPiSetup() ;
  137 +
  138 + //静音引脚初始化
  139 + pinMode (AMPLIFIER_IRCUT_PIN_1, OUTPUT) ;
  140 + digitalWrite(AMPLIFIER_IRCUT_PIN_1,LOW);
  141 + pinMode (AMPLIFIER_IRCUT_PIN_2, OUTPUT) ;
  142 + digitalWrite(AMPLIFIER_IRCUT_PIN_2,LOW);
  143 +
  144 + //H10要初始化电机引脚
  145 + if (DEVICE_VERSION == JZ_H10)
  146 + {
  147 + pinMode(MOTOR_IRCUT_PIN,PWM_OUTPUT);//设置输出模式
  148 + }
134 149
135 -void H3_init_amplifier(void)  
136 -{  
137 -#if WIRINGPI_STATUS == VERSION_SWITCH_ON  
138 - wiringPiSetup() ; //��ʼ��GPIO  
139 - pinMode (AC, OUTPUT) ;//�������ģʽ  
140 - digitalWrite(AC,LOW);  
141 - pinMode (AC2, OUTPUT) ;//�������ģʽ  
142 - digitalWrite(AC2,LOW);  
143 #endif 150 #endif
  151 +
  152 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
144 } 153 }
145 154
146 -void H3_set_amplifier(int amplifier_mode){  
147 -#if WIRINGPI_STATUS == VERSION_SWITCH_ON  
148 - if(amplifier_mode==1)  
149 - {//���Ŵ�  
150 - if(now_ircut_mode==0){  
151 - digitalWrite(AC,HIGH);//gpio1_3 �����  
152 - digitalWrite(AC2,HIGH);//gpio1_3 �����  
153 - now_ircut_mode=1;  
154 - printf("open!!!\n");  
155 - }  
156 - //gpio_test_out(1,2,1);//gpio1_2 �����  
157 - return;  
158 - }  
159 - if(amplifier_mode==0)  
160 - {//���Źر�  
161 - if(now_ircut_mode==1){  
162 - digitalWrite(AC,LOW);  
163 - digitalWrite(AC2,LOW);//gpio1_3 �����  
164 - now_ircut_mode=0;  
165 - printf("close!!!\n"); 155 +/***********************
  156 + *
  157 + * H3引脚控制
  158 + * 静音角控制
  159 + *
  160 + * *******************/
  161 +T_JZsdkReturnCode H3_ircut_set_amplifier(int ircut_mode)
  162 +{
  163 +#ifdef WIRINGPI_STATUS_ON
  164 + if (ircut_mode == JZ_FLAGCODE_ON)
  165 + {
  166 + digitalWrite(AMPLIFIER_IRCUT_PIN_1,HIGH);
  167 + digitalWrite(AMPLIFIER_IRCUT_PIN_2,HIGH);
166 } 168 }
167 - //gpio_test_out(1,2,0);//gpio1_2 �����  
168 - return; 169 + else if (ircut_mode == JZ_FLAGCODE_OFF)
  170 + {
  171 + digitalWrite(AMPLIFIER_IRCUT_PIN_1,LOW);
  172 + digitalWrite(AMPLIFIER_IRCUT_PIN_2,LOW);
169 } 173 }
170 - else{  
171 - printf("amplifier_mode error\n");  
172 - return; 174 + else
  175 + {
  176 + JZSDK_LOG_ERROR("H3引脚控制错误");
  177 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
173 } 178 }
174 #endif 179 #endif
  180 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
175 } 181 }
  1 +/**
  2 + ********************************************************************
  3 + * @file
  4 + *
  5 + *
  6 + *********************************************************************
  7 + */
  8 +
  9 +/* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/
1 #ifndef H3_IRCUT_H 10 #ifndef H3_IRCUT_H
2 #define H3_IRCUT_H 11 #define H3_IRCUT_H
3 -#include <stdio.h>  
4 -#include <stdint.h>  
5 12
6 -int gpio_test_in(unsigned int gpio_chip_num, unsigned int gpio_offset_num);  
7 -int gpio_test_out(unsigned int gpio_chip_num, unsigned int gpio_offset_num,unsigned int gpio_out_val);  
8 -void set_mute(int mutemode);//�������ܣ�0���� 1�رվ���  
9 -void H3_set_amplifier(int amplifier_mode);//���ſ��� 0�ر� 1��  
10 -void H3_init_amplifier(void); 13 +/* Includes ------------------------------------------------------------------*/
  14 +#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
  15 +
  16 +#ifdef __cplusplus
  17 +extern "C" {
  18 +#endif
  19 +
  20 +/* Exported constants --------------------------------------------------------*/
  21 +/* 常亮定义*/
  22 +
  23 +/* Exported types ------------------------------------------------------------*/
  24 +
  25 +/* Exported functions --------------------------------------------------------*/
  26 +
  27 +T_JZsdkReturnCode H3_ircut_init();
  28 +T_JZsdkReturnCode H3_ircut_set_amplifier(int ircut_mode);
  29 +
  30 +
  31 +#ifdef __cplusplus
  32 +}
  33 +#endif
11 34
12 -#endif //IRCUT_H  
  35 +#endif
1 -  
2 -#include "Ircut_H3_H10.h"  
3 -#include "version_choose.h"  
4 -#include <stdio.h>  
5 -  
6 -#if WIRINGPI_STATUS == VERSION_SWITCH_ON  
7 - #include <wiringPi.h>  
8 -#endif  
9 -  
10 -#define AC 7  
11 -#define AC2 19  
12 -#define MOTOR 18  
13 -  
14 -int H3_H10_now_ircut_mode=0;  
15 -  
16 -int H3_H10_Gimbal_IrcutInit()  
17 -{  
18 -#if WIRINGPI_STATUS == VERSION_SWITCH_ON  
19 - pinMode(MOTOR,PWM_OUTPUT);//设置输出模式  
20 -#endif  
21 -}  
22 -  
23 -void H3_H10_init_amplifier(void)  
24 -{  
25 -#if WIRINGPI_STATUS == VERSION_SWITCH_ON  
26 - pinMode (AC, OUTPUT) ;//�������ģʽ  
27 - digitalWrite(AC,LOW);  
28 - pinMode (AC2, OUTPUT) ;//�������ģʽ  
29 - digitalWrite(AC2,LOW);  
30 -#endif  
31 -}  
32 -  
33 -int H3_H10_IrcutInit()  
34 -{  
35 - printf("正在进行H3_H10的引脚初始化\n");  
36 -#if WIRINGPI_STATUS == VERSION_SWITCH_ON  
37 - //wiringPi库的初始化  
38 - wiringPiSetup() ;  
39 -  
40 - //声音引脚初始化  
41 - H3_H10_init_amplifier();  
42 -  
43 - //电机引脚初始化  
44 - H3_H10_Gimbal_IrcutInit();  
45 -  
46 - printf("H3_H10引脚初始化完成\n");  
47 -#endif  
48 -}  
49 -  
50 -void H3_H10_set_amplifier(int amplifier_mode)  
51 -{  
52 -#if WIRINGPI_STATUS == VERSION_SWITCH_ON  
53 - if(amplifier_mode==1)  
54 - {//���Ŵ�  
55 - if(H3_H10_now_ircut_mode==0){  
56 - digitalWrite(AC,HIGH);//gpio1_3 �����  
57 - digitalWrite(AC2,HIGH);//gpio1_3 �����  
58 - H3_H10_now_ircut_mode=1;  
59 - printf("open!!!\n");  
60 - }  
61 - //gpio_test_out(1,2,1);//gpio1_2 �����  
62 - return;  
63 - }  
64 - if(amplifier_mode==0)  
65 - {//���Źر�  
66 - if(H3_H10_now_ircut_mode==1){  
67 - digitalWrite(AC,LOW);  
68 - digitalWrite(AC2,LOW);//gpio1_3 �����  
69 - H3_H10_now_ircut_mode=0;  
70 - printf("close!!!\n");  
71 - }  
72 - //gpio_test_out(1,2,0);//gpio1_2 �����  
73 - return;  
74 - }  
75 - else{  
76 - printf("amplifier_mode error\n");  
77 - return;  
78 - }  
79 -#endif  
80 -}  
1 -#ifndef IRCUT_H3_H10_H  
2 -#define IRCUT_H3_H10_H  
3 -  
4 -void H3_H10_set_amplifier(int amplifier_mode);  
5 -int H3_H10_IrcutInit();  
6 -#endif  
@@ -2,14 +2,13 @@ @@ -2,14 +2,13 @@
2 #include "version_choose.h" 2 #include "version_choose.h"
3 #include "./V3s_ircut/V3s_ircut.h" 3 #include "./V3s_ircut/V3s_ircut.h"
4 #include "./H3_ircut/H3_ircut.h" 4 #include "./H3_ircut/H3_ircut.h"
5 -#include "./H3_ircut/Ircut_H3_H10/Ircut_H3_H10.h"  
6 #include "ircut.h" 5 #include "ircut.h"
7 6
8 #include "JZsdkLib.h" 7 #include "JZsdkLib.h"
9 8
10 static int OutPutPower = JZ_FLAGCODE_OFF; 9 static int OutPutPower = JZ_FLAGCODE_OFF;
11 10
12 -void Ircut_Init()//引脚初始化 11 +T_JZsdkReturnCode Ircut_Init()//引脚初始化
13 { 12 {
14 if (DEVICE_VERSION == JZ_H1E || DEVICE_VERSION == JZ_H1T || DEVICE_VERSION == JZ_H10T || 13 if (DEVICE_VERSION == JZ_H1E || DEVICE_VERSION == JZ_H1T || DEVICE_VERSION == JZ_H10T ||
15 DEVICE_VERSION == JZ_U3 || DEVICE_VERSION == JZ_U3S || DEVICE_VERSION == JZ_U3D || DEVICE_VERSION == JZ_U30|| 14 DEVICE_VERSION == JZ_U3 || DEVICE_VERSION == JZ_U3S || DEVICE_VERSION == JZ_U3D || DEVICE_VERSION == JZ_U30||
@@ -18,13 +17,9 @@ void Ircut_Init()//引脚初始化 @@ -18,13 +17,9 @@ void Ircut_Init()//引脚初始化
18 V3s_Ircut_Init(); 17 V3s_Ircut_Init();
19 } 18 }
20 19
21 - else if (DEVICE_VERSION == JZ_H150S || DEVICE_VERSION == JZ_H150T) 20 + else if (DEVICE_VERSION == JZ_H150S || DEVICE_VERSION == JZ_H150T || DEVICE_VERSION == JZ_H10)
22 { 21 {
23 - H3_init_amplifier();  
24 - }  
25 - else if (DEVICE_VERSION == JZ_H10)  
26 - {  
27 - H3_H10_IrcutInit(); 22 + H3_ircut_init();
28 } 23 }
29 else if (DEVICE_VERSION == JZ_C1) 24 else if (DEVICE_VERSION == JZ_C1)
30 { 25 {
@@ -38,19 +33,23 @@ void Ircut_Init()//引脚初始化 @@ -38,19 +33,23 @@ void Ircut_Init()//引脚初始化
38 } 33 }
39 34
40 JZSDK_LOG_INFO("MODULE_IRCUT_INIT_COMPLETE"); 35 JZSDK_LOG_INFO("MODULE_IRCUT_INIT_COMPLETE");
  36 +
  37 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
41 } 38 }
42 39
43 40
44 -int Ircut_uInit() 41 +T_JZsdkReturnCode Ircut_uInit()
45 { 42 {
46 if (DEVICE_VERSION == JZ_H1E) 43 if (DEVICE_VERSION == JZ_H1E)
47 { 44 {
48 V3s_Ircut_uInit(); 45 V3s_Ircut_uInit();
49 } 46 }
  47 +
  48 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
50 } 49 }
51 50
52 //功放开关 51 //功放开关
53 -void set_amplifier(int amplifier_mode) 52 +T_JZsdkReturnCode set_amplifier(int amplifier_mode)
54 { 53 {
55 if (DEVICE_VERSION == JZ_H1E || DEVICE_VERSION == JZ_H1T || DEVICE_VERSION == JZ_H10T || 54 if (DEVICE_VERSION == JZ_H1E || DEVICE_VERSION == JZ_H1T || DEVICE_VERSION == JZ_H10T ||
56 DEVICE_VERSION == JZ_U3 || DEVICE_VERSION == JZ_U3S || DEVICE_VERSION == JZ_U3D || DEVICE_VERSION == JZ_U30 || 55 DEVICE_VERSION == JZ_U3 || DEVICE_VERSION == JZ_U3S || DEVICE_VERSION == JZ_U3D || DEVICE_VERSION == JZ_U30 ||
@@ -59,15 +58,12 @@ void set_amplifier(int amplifier_mode) @@ -59,15 +58,12 @@ void set_amplifier(int amplifier_mode)
59 V3s_set_amplifier(amplifier_mode); 58 V3s_set_amplifier(amplifier_mode);
60 } 59 }
61 60
62 - if (DEVICE_VERSION == JZ_H150S || DEVICE_VERSION == JZ_H150T) 61 + if (DEVICE_VERSION == JZ_H150S || DEVICE_VERSION == JZ_H150T || DEVICE_VERSION == JZ_H10)
63 { 62 {
64 - H3_set_amplifier(amplifier_mode); 63 + H3_ircut_set_amplifier(amplifier_mode);
65 } 64 }
66 65
67 - if (DEVICE_VERSION == JZ_H10)  
68 - {  
69 - H3_H10_set_amplifier(amplifier_mode);  
70 - } 66 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
71 } 67 }
72 68
73 //PWM控制 69 //PWM控制
@@ -77,7 +73,6 @@ int Ircut_PWM_control(int pwm_num) @@ -77,7 +73,6 @@ int Ircut_PWM_control(int pwm_num)
77 { 73 {
78 V3s_PWM_contrl(pwm_num); 74 V3s_PWM_contrl(pwm_num);
79 } 75 }
80 -  
81 } 76 }
82 77
83 //对外电源控制 78 //对外电源控制
@@ -25,9 +25,9 @@ extern "C" { @@ -25,9 +25,9 @@ extern "C" {
25 /* Exported types ------------------------------------------------------------*/ 25 /* Exported types ------------------------------------------------------------*/
26 26
27 /* Exported functions --------------------------------------------------------*/ 27 /* Exported functions --------------------------------------------------------*/
28 -void Ircut_Init();  
29 -int Ircut_uInit() ;  
30 -void set_amplifier(int amplifier_mode); 28 +T_JZsdkReturnCode Ircut_Init();
  29 +T_JZsdkReturnCode Ircut_uInit() ;
  30 +T_JZsdkReturnCode set_amplifier(int amplifier_mode);
31 int Ircut_PWM_control(int pwm_num); 31 int Ircut_PWM_control(int pwm_num);
32 T_JZsdkReturnCode Ircut_Set_OutPutPower_Control(int value); 32 T_JZsdkReturnCode Ircut_Set_OutPutPower_Control(int value);
33 T_JZsdkReturnCode Ircut_CheckStatus_OutPutPower(int *value); 33 T_JZsdkReturnCode Ircut_CheckStatus_OutPutPower(int *value);
@@ -386,8 +386,8 @@ T_JZsdkReturnCode Lighting_Obtain_WarningLight_Color(int color1, int color2) @@ -386,8 +386,8 @@ T_JZsdkReturnCode Lighting_Obtain_WarningLight_Color(int color1, int color2)
386 //获取探警灯颜色 386 //获取探警灯颜色
387 T_JZsdkReturnCode Lighting_Get_WarningLight_Color(int *color1, int *color2) 387 T_JZsdkReturnCode Lighting_Get_WarningLight_Color(int *color1, int *color2)
388 { 388 {
389 - *color1 = WarningLight_Status;  
390 - *color2 = WarningLight_Mode; 389 + *color1 = WarningLight_Color1;
  390 + *color2 = WarningLight_Color2;
391 391
392 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 392 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
393 } 393 }
@@ -406,7 +406,7 @@ T_JZsdkReturnCode Lighting_CheckStatus_WarningLightColor(int *ValueColor1, int * @@ -406,7 +406,7 @@ T_JZsdkReturnCode Lighting_CheckStatus_WarningLightColor(int *ValueColor1, int *
406 } 406 }
407 407
408 //2、获取一次本地探警灯颜色 408 //2、获取一次本地探警灯颜色
409 - Lighting_Get_WarningLight_Status(ValueColor1, ValueColor2); 409 + Lighting_Get_WarningLight_Color(ValueColor1, ValueColor2);
410 410
411 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 411 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
412 } 412 }
@@ -93,6 +93,8 @@ T_JZsdkReturnCode JZsdk_Camera_GasEnhancementCorrectSwitch() @@ -93,6 +93,8 @@ T_JZsdkReturnCode JZsdk_Camera_GasEnhancementCorrectSwitch()
93 * ******************/ 93 * ******************/
94 T_JZsdkReturnCode Camera_RegionBox(unsigned int PointX, unsigned int PointY) 94 T_JZsdkReturnCode Camera_RegionBox(unsigned int PointX, unsigned int PointY)
95 { 95 {
  96 + printf("设置框选点X:%d Y:%d\n",PointX,PointY);
  97 +
96 //1、检查该点是否合法 98 //1、检查该点是否合法
97 #if DEVICE_VERSION == JZ_C1 99 #if DEVICE_VERSION == JZ_C1
98 //红外相机下的坐标参数是0~319 0~255 100 //红外相机下的坐标参数是0~319 0~255
@@ -101,10 +103,6 @@ T_JZsdkReturnCode Camera_RegionBox(unsigned int PointX, unsigned int PointY) @@ -101,10 +103,6 @@ T_JZsdkReturnCode Camera_RegionBox(unsigned int PointX, unsigned int PointY)
101 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 103 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
102 } 104 }
103 105
104 -#endif  
105 -  
106 - printf("设置框选点X:%d Y:%d\n",PointX,PointY);  
107 -  
108 //如果本次操作是画第一个点 106 //如果本次操作是画第一个点
109 if (g_CameraRegionBox_ClickTime+1 == 1) 107 if (g_CameraRegionBox_ClickTime+1 == 1)
110 { 108 {
@@ -130,6 +128,7 @@ T_JZsdkReturnCode Camera_RegionBox(unsigned int PointX, unsigned int PointY) @@ -130,6 +128,7 @@ T_JZsdkReturnCode Camera_RegionBox(unsigned int PointX, unsigned int PointY)
130 g_CameraRegionBox_ClickTime=0; 128 g_CameraRegionBox_ClickTime=0;
131 IRC_Set_RegionMode(0); 129 IRC_Set_RegionMode(0);
132 } 130 }
  131 +#endif
133 132
134 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 133 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
135 } 134 }
@@ -9,6 +9,8 @@ @@ -9,6 +9,8 @@
9 #include "BaseConfig.h" 9 #include "BaseConfig.h"
10 10
11 #include "../V4L2_camera/V4L2_Record.h" 11 #include "../V4L2_camera/V4L2_Record.h"
  12 +#include "../V4L2_camera/V4L2_CameraParameterSetting.h"
  13 +
12 #include "../../StreamProc/StreamProc.h" 14 #include "../../StreamProc/StreamProc.h"
13 #include "../../MediaParm.h" 15 #include "../../MediaParm.h"
14 #include "../../VideoMgmt/VideoMgmt.h" 16 #include "../../VideoMgmt/VideoMgmt.h"
@@ -17,6 +19,8 @@ @@ -17,6 +19,8 @@
17 #include "../Camera.h" 19 #include "../Camera.h"
18 20
19 #include "UI_control/UI_control.h" 21 #include "UI_control/UI_control.h"
  22 +
  23 +
20 static int CameraFd = 0; 24 static int CameraFd = 0;
21 25
22 //光学相机数据读取线程 26 //光学相机数据读取线程
@@ -30,6 +34,8 @@ static void *JZsdk_Cam_Data_Thread(void *args) @@ -30,6 +34,8 @@ static void *JZsdk_Cam_Data_Thread(void *args)
30 //从相机中读取一张照片 34 //从相机中读取一张照片
31 V4L2_CameraFrameRecord_OnlyGetFrame(&buf, &buf_size); 35 V4L2_CameraFrameRecord_OnlyGetFrame(&buf, &buf_size);
32 36
  37 + //printf("read: len:%d data[3]:%x data[4]:%x\n", buf_size, buf[3], buf[4]);
  38 +
33 if (buf == NULL) 39 if (buf == NULL)
34 { 40 {
35 JZSDK_LOG_ERROR("相机数据读取失败"); 41 JZSDK_LOG_ERROR("相机数据读取失败");
@@ -56,6 +62,14 @@ T_JZsdkReturnCode JZsdk_H150ST_CameraInit(int width, int height, int frame_num) @@ -56,6 +62,14 @@ T_JZsdkReturnCode JZsdk_H150ST_CameraInit(int width, int height, int frame_num)
56 return ret; 62 return ret;
57 } 63 }
58 64
  65 + //初始化摄像头参数
  66 + ret = V4L2_Parameter_Setting(CameraFd);
  67 + if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
  68 + {
  69 + JZSDK_LOG_ERROR("摄像头参数调整失败");
  70 + return ret;
  71 + }
  72 +
59 73
60 //初始化数据接收线程 74 //初始化数据接收线程
61 pthread_t ReadDataTask; 75 pthread_t ReadDataTask;
  1 +
  2 +#include <stdio.h>
  3 +#include <stdlib.h>
  4 +#include <string.h>
  5 +#include <assert.h>
  6 +#include <getopt.h> /* getopt_long() */
  7 +#include <fcntl.h> /* low-level i/o */
  8 +#include <unistd.h>
  9 +#include <errno.h>
  10 +#include <sys/stat.h>
  11 +#include <sys/types.h>
  12 +#include <sys/time.h>
  13 +#include <sys/mman.h>
  14 +#include <sys/ioctl.h>
  15 +
  16 +#include <linux/videodev2.h>
  17 +#include "./V4L2_CameraParameterSetting.h"
  18 +#include "JZsdkLib.h"
  19 +
  20 +#include "MediaProc/MediaParm.h"
  21 +
  22 +T_JZsdkReturnCode V4L2_Parameter_Setting(int cam_fd)
  23 +{
  24 + struct v4l2_control ctrl;
  25 +
  26 + //设置亮度*
  27 + ctrl.id= V4L2_CID_BRIGHTNESS;
  28 + ctrl.value = BRIGHTNESS;
  29 + if(ioctl(cam_fd,VIDIOC_S_CTRL,&ctrl)==-1)
  30 + {
  31 + JZSDK_LOG_INFO("相机亮度设置失败");
  32 + }
  33 +
  34 + //设置对比度
  35 + ctrl.id = V4L2_CID_CONTRAST;
  36 + ctrl.value= CONTRAST;
  37 + if(ioctl(cam_fd,VIDIOC_S_CTRL,&ctrl)==-1)
  38 + {
  39 + JZSDK_LOG_INFO("相机对比度设置失败");
  40 + }
  41 +
  42 + //设置饱和度
  43 + ctrl.id = V4L2_CID_SATURATION;
  44 + ctrl.value= SATURATION;
  45 + if(ioctl(cam_fd,VIDIOC_S_CTRL,&ctrl)==-1)
  46 + {
  47 + perror("相机饱和度设置失败");
  48 + }
  49 +/*
  50 + //设置色度
  51 + ctrl.id = V4L2_CID_HUE;
  52 + ctrl.value = 1;
  53 + if(ioctl(cam_fd,VIDIOC_S_CTRL,&ctrl)==-1)
  54 + {
  55 + perror("ioctl");
  56 + exit(EXIT_FAILURE);
  57 + }
  58 +
  59 + //设置手动白平衡
  60 + ctrl.id = V4L2_CID_AUTO_WHITE_BALANCE;
  61 + ctrl.value = V4L2_WHITE_BALANCE_MANUAL ;
  62 + if(ioctl(cam_fd,VIDIOC_G_CTRL,&ctrl)==-1)
  63 + {
  64 + perror("ioctl");
  65 + exit(EXIT_FAILURE);
  66 + }
  67 +
  68 +
  69 + //设置白平衡色温
  70 + ctrl.id = V4L2_CID_WHITE_BALANCE_TEMPERATURE;
  71 + ctrl.value = 5100;
  72 + if(ioctl(cam_fd,VIDIOC_S_CTRL,&ctrl)==-1)
  73 + {
  74 + perror("ioctl");
  75 + exit(EXIT_FAILURE);
  76 + }
  77 +
  78 +
  79 + //设置锐度
  80 + ctrl.id = V4L2_CID_SHARPNESS;
  81 + ctrl.value = 4;
  82 + if(ioctl(cam_fd,VIDIOC_S_CTRL,&ctrl)==-1)
  83 + {
  84 + perror("ioctl");
  85 + exit(EXIT_FAILURE);
  86 + }
  87 +
  88 +
  89 + //设置背光补偿
  90 + ctrl.id = V4L2_CID_BACKLIGHT_COMPENSATION;
  91 + ctrl.value = 3;
  92 + if(ioctl(cam_fd,VIDIOC_S_CTRL,&ctrl)==-1)
  93 + {
  94 + perror("ioctl");
  95 + exit(EXIT_FAILURE);
  96 + }
  97 +
  98 + //设置伽玛值
  99 + ctrl.id = V4L2_CID_GAMMA;
  100 + ctrl.value = 120;
  101 + if(ioctl(cam_fd,VIDIOC_S_CTRL,&ctrl)==-1)
  102 + {
  103 + perror("ioctl");
  104 + exit(EXIT_FAILURE);
  105 + }
  106 +*/
  107 +
  108 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  109 +}
  110 +
  1 +/**
  2 + ********************************************************************
  3 + * @file V4L2_CameraParameterSetting.h
  4 + * 用于转码拍下来的照片以及视频
  5 + *
  6 + *********************************************************************
  7 + */
  8 +
  9 +/* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/
  10 +#ifndef V4L2_CAMERA_PARAMETER_SETTING_H
  11 +#define V4L2_CAMERA_PARAMETER_SETTING_H
  12 +
  13 +/* Includes ------------------------------------------------------------------*/
  14 +#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
  15 +
  16 +
  17 +#ifdef __cplusplus
  18 +extern "C" {
  19 +#endif
  20 +
  21 +/* Exported constants --------------------------------------------------------*/
  22 +/* 常亮定义*/
  23 +
  24 +
  25 +/* Exported types ------------------------------------------------------------*/
  26 +
  27 +
  28 +/* Exported functions --------------------------------------------------------*/
  29 +T_JZsdkReturnCode V4L2_Parameter_Setting(int cam_fd);
  30 +
  31 +
  32 +#ifdef __cplusplus
  33 +}
  34 +#endif
  35 +
  36 +#endif
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
19 19
20 #include "JZsdkLib.h" 20 #include "JZsdkLib.h"
21 #include "./V4L2_Record.h" 21 #include "./V4L2_Record.h"
  22 +#include "MediaProc/MediaParm.h"
22 23
23 /* Private constants ---------------------------------------------------------*/ 24 /* Private constants ---------------------------------------------------------*/
24 // 清空 25 // 清空
@@ -42,7 +43,6 @@ static struct v4l2_buffer buf; @@ -42,7 +43,6 @@ static struct v4l2_buffer buf;
42 static int camera_width; 43 static int camera_width;
43 static int camera_height; 44 static int camera_height;
44 static int camera_record_frame; 45 static int camera_record_frame;
45 -#define CAMERA_DEVICE_NAME ("/dev/video21")  
46 46
47 //unsigned char* pucVideBuf[4]; // 视频BUFF空间地址 47 //unsigned char* pucVideBuf[4]; // 视频BUFF空间地址
48 48
@@ -213,8 +213,7 @@ static int init_device() @@ -213,8 +213,7 @@ static int init_device()
213 fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; 213 fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
214 fmt.fmt.pix.width = camera_width; 214 fmt.fmt.pix.width = camera_width;
215 fmt.fmt.pix.height = camera_height; 215 fmt.fmt.pix.height = camera_height;
216 - fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_MJPEG;  
217 - //fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_H264; 216 + fmt.fmt.pix.pixelformat = CAMERA_CATCH_PIXEL;
218 fmt.fmt.pix.field = V4L2_FIELD_INTERLACED; 217 fmt.fmt.pix.field = V4L2_FIELD_INTERLACED;
219 218
220 //写入格式参数 219 //写入格式参数
@@ -288,7 +287,7 @@ T_JZsdkReturnCode V4l2_Camarainit2(int *dev_fd, int width, int height, int frame @@ -288,7 +287,7 @@ T_JZsdkReturnCode V4l2_Camarainit2(int *dev_fd, int width, int height, int frame
288 ret = open_device(); 287 ret = open_device();
289 if (ret != 0) 288 if (ret != 0)
290 { 289 {
291 - JZSDK_LOG_ERROR("打开摄像头失败"); 290 + JZSDK_LOG_ERROR("打开摄像头失败%s", CAMERA_DEVICE_NAME);
292 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 291 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
293 } 292 }
294 293
@@ -3,11 +3,18 @@ @@ -3,11 +3,18 @@
3 #include <string.h> 3 #include <string.h>
4 #include "JZsdkLib.h" 4 #include "JZsdkLib.h"
5 5
  6 +#include "BaseConfig.h"
6 7
7 #include "../IRC_data_deal/IRC_data_deal.h" 8 #include "../IRC_data_deal/IRC_data_deal.h"
8 9
9 #include <vector> 10 #include <vector>
10 -#include "KTv330_CPP.h" 11 +
  12 +#ifdef KTIRC_LIB_STATUS_ON
  13 + #include "KTv330_CPP.h"
  14 +#endif
  15 +
  16 +
  17 +
11 #include "MediaProc/MediaProc_Param.h" 18 #include "MediaProc/MediaProc_Param.h"
12 19
13 #include "KtLibProc.h" 20 #include "KtLibProc.h"
@@ -15,7 +22,9 @@ @@ -15,7 +22,9 @@
15 #include "../IRC_Param.h" 22 #include "../IRC_Param.h"
16 23
17 // 创建一个 ClassKT 类对象 24 // 创建一个 ClassKT 类对象
18 -KTv330Space::ClassKT* KtObject = new KTv330Space::ClassKT(); 25 +#ifdef KTIRC_LIB_STATUS_ON
  26 + KTv330Space::ClassKT* KtObject = new KTv330Space::ClassKT();
  27 +#endif
19 28
20 29
21 30
@@ -24,7 +33,7 @@ T_JZsdkReturnCode KtLib_DataDeal(U16_t* U16_data, unsigned int U16_dataSize, @@ -24,7 +33,7 @@ T_JZsdkReturnCode KtLib_DataDeal(U16_t* U16_data, unsigned int U16_dataSize,
24 struct IRC_param *dealInfo) 33 struct IRC_param *dealInfo)
25 { 34 {
26 T_JZsdkReturnCode ret; 35 T_JZsdkReturnCode ret;
27 - 36 +#ifdef KTIRC_LIB_STATUS_ON
28 // 创建一个存储转换后数据的 vector<int> 37 // 创建一个存储转换后数据的 vector<int>
29 std::vector<int> inputDataVector(U16_data, U16_data + U16_dataSize); 38 std::vector<int> inputDataVector(U16_data, U16_data + U16_dataSize);
30 39
@@ -117,12 +126,14 @@ T_JZsdkReturnCode KtLib_DataDeal(U16_t* U16_data, unsigned int U16_dataSize, @@ -117,12 +126,14 @@ T_JZsdkReturnCode KtLib_DataDeal(U16_t* U16_data, unsigned int U16_dataSize,
117 } 126 }
118 127
119 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 128 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  129 +#endif
120 } 130 }
121 131
122 T_JZsdkReturnCode KtLib_Init() 132 T_JZsdkReturnCode KtLib_Init()
123 { 133 {
  134 +#ifdef KTIRC_LIB_STATUS_ON
124 KtObject->KT_M330_InfraredLogin("192.168.1.3", 6666, "192.168.1.2", 6666, 320, 256, 14, NULL, 0, 0); 135 KtObject->KT_M330_InfraredLogin("192.168.1.3", 6666, "192.168.1.2", 6666, 320, 256, 14, NULL, 0, 0);
125 - 136 +#endif
126 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 137 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
127 } 138 }
128 139
@@ -34,16 +34,26 @@ extern "C" { @@ -34,16 +34,26 @@ extern "C" {
34 #define SECOND_WIDTH 1920 34 #define SECOND_WIDTH 1920
35 #define SECOND_HEIGHT 1080 35 #define SECOND_HEIGHT 1080
36 #define SECOND_FRAME_NUM 30 36 #define SECOND_FRAME_NUM 30
  37 +#define CAMERA_DEVICE_NAME ("/dev/video21")
  38 +#define CAMERA_CATCH_PIXEL V4L2_PIX_FMT_MJPEG
37 39
38 #elif DEVICE_VERSION == JZ_H150S || DEVICE_VERSION == JZ_H150T 40 #elif DEVICE_VERSION == JZ_H150S || DEVICE_VERSION == JZ_H150T
39 41
40 -#define FIRST_WIDTH 1280  
41 -#define FIRST_HEIGHT 720 42 +#define FIRST_WIDTH 1980
  43 +#define FIRST_HEIGHT 1080
42 #define FIRST_FRAME_NUM 25 44 #define FIRST_FRAME_NUM 25
43 45
  46 +#define BRIGHTNESS (80) //亮度，该摄像头亮度范围为 1-255 默认128
  47 +#define CONTRAST (155) //对比度，摄像头对比度范围为 1-255 默认128
  48 +#define SATURATION (128) //饱和度 摄像头饱和度范围为 1-255 默认128
  49 +#define EXPSURE (100) //曝光值 摄像头曝光值范围： 5-2500 默认auto设置
  50 +
44 #define SECOND_WIDTH 0 51 #define SECOND_WIDTH 0
45 #define SECOND_HEIGHT 0 52 #define SECOND_HEIGHT 0
46 #define SECOND_FRAME_NUM 25 53 #define SECOND_FRAME_NUM 25
  54 +#define CAMERA_DEVICE_NAME ("/dev/video0")
  55 +#define CAMERA_CATCH_PIXEL V4L2_PIX_FMT_H264
  56 +
47 57
48 #else 58 #else
49 59
@@ -55,6 +65,9 @@ extern "C" { @@ -55,6 +65,9 @@ extern "C" {
55 #define SECOND_HEIGHT 720 65 #define SECOND_HEIGHT 720
56 #define SECOND_FRAME_NUM 25 66 #define SECOND_FRAME_NUM 25
57 67
  68 +#define CAMERA_DEVICE_NAME ("/dev/video0")
  69 +
  70 +
58 #endif 71 #endif
59 72
60 73
@@ -14,13 +14,11 @@ @@ -14,13 +14,11 @@
14 #include "./Camera/Camera.h" 14 #include "./Camera/Camera.h"
15 #include "./Camera/Kt_Irc/Kt_Irc.h" 15 #include "./Camera/Kt_Irc/Kt_Irc.h"
16 16
17 -static int Kt_irc_flag = JZ_FLAGCODE_ON;  
18 -  
19 //视频流模块初始化 17 //视频流模块初始化
20 T_JZsdkReturnCode MediaProc_Init() 18 T_JZsdkReturnCode MediaProc_Init()
21 { 19 {
22 //如果是昆腾相机 红外+光学 则红外为1号，光学为2号 20 //如果是昆腾相机 红外+光学 则红外为1号，光学为2号
23 - if (Kt_irc_flag == JZ_FLAGCODE_ON) 21 + if (DEVICE_VERSION == JZ_C1)
24 { 22 {
25 //1、启动视频流缓冲区模块 23 //1、启动视频流缓冲区模块
26 VideoMgmt_init_buffer(&VideoMgmt_FirstVideo_index); 24 VideoMgmt_init_buffer(&VideoMgmt_FirstVideo_index);
@@ -65,6 +63,9 @@ T_JZsdkReturnCode MediaProc_Init() @@ -65,6 +63,9 @@ T_JZsdkReturnCode MediaProc_Init()
65 //3、启用推流模块 63 //3、启用推流模块
66 VideoMgmt_VideoStreamFlow_Init(FIRST_FRAME_NUM, &VideoMgmt_FirstVideo_index, VIDEOMGMT_STREAMING_FLOW_INDEX_FIRST); 64 VideoMgmt_VideoStreamFlow_Init(FIRST_FRAME_NUM, &VideoMgmt_FirstVideo_index, VIDEOMGMT_STREAMING_FLOW_INDEX_FIRST);
67 65
  66 + //转码模块
  67 + VideoStreamTransCode_Init();
  68 +
68 VideoMgmt_VideoStreamFlowIndex(VIDEOMGMT_STREAMING_FLOW_INDEX_FIRST); //默认推送光学摄像头 69 VideoMgmt_VideoStreamFlowIndex(VIDEOMGMT_STREAMING_FLOW_INDEX_FIRST); //默认推送光学摄像头
69 } 70 }
70 71
@@ -29,7 +29,7 @@ T_JZsdkReturnCode VideoStream_PushFrame(unsigned char* h264_data, unsigned int d @@ -29,7 +29,7 @@ T_JZsdkReturnCode VideoStream_PushFrame(unsigned char* h264_data, unsigned int d
29 } 29 }
30 else 30 else
31 { 31 {
32 - JZSDK_LOG_ERROR("视频传输发送了错误帧\n"); 32 + JZSDK_LOG_ERROR("视频传输发送了错误帧，长度%d [0]:%x [1]:%x [2]:%x [3]:%x [4]:%x",data_len, h264_data[0], h264_data[1], h264_data[2], h264_data[3], h264_data[4]);
33 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 33 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
34 } 34 }
35 35
@@ -190,6 +190,8 @@ static int Video_TransCode_Thread_Init() @@ -190,6 +190,8 @@ static int Video_TransCode_Thread_Init()
190 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 190 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
191 } 191 }
192 192
  193 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  194 +
193 } 195 }
194 196
195 /***** 197 /*****
@@ -211,5 +213,7 @@ T_JZsdkReturnCode VideoStreamTransCode_Init() @@ -211,5 +213,7 @@ T_JZsdkReturnCode VideoStreamTransCode_Init()
211 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 213 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
212 } 214 }
213 215
  216 + JZSDK_LOG_INFO("transcode module init success");
  217 +
214 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 218 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
215 } 219 }
@@ -171,6 +171,8 @@ T_JZsdkReturnCode Opus_RecordVoice_PlayFixedFile() @@ -171,6 +171,8 @@ T_JZsdkReturnCode Opus_RecordVoice_PlayFixedFile()
171 JZSDK_LOG_ERROR("创建Opus_PlayFixedFile线程失败!\n"); 171 JZSDK_LOG_ERROR("创建Opus_PlayFixedFile线程失败!\n");
172 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 172 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
173 } 173 }
  174 +
  175 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
174 } 176 }
175 177
176 178
@@ -423,7 +425,7 @@ static T_JZsdkReturnCode Opus_Decode() @@ -423,7 +425,7 @@ static T_JZsdkReturnCode Opus_Decode()
423 425
424 for (i = 0; i < OPUS_CHANNELS * frame_size; i++) { 426 for (i = 0; i < OPUS_CHANNELS * frame_size; i++) {
425 TempPcm [i] = out[i] & 0xFF | (out[i] >> 8) << 8; 427 TempPcm [i] = out[i] & 0xFF | (out[i] >> 8) << 8;
426 - TempPcm[i] = PcmNoiseReduction(TempPcm[i]); 428 + //TempPcm[i] = PcmNoiseReduction(TempPcm[i]);
427 } 429 }
428 430
429 fwrite(TempPcm, sizeof(short), frame_size * OPUS_CHANNELS, fout); 431 fwrite(TempPcm, sizeof(short), frame_size * OPUS_CHANNELS, fout);
@@ -1049,6 +1049,7 @@ T_JZsdkReturnCode UIcontrol_Obtain_GimbalLinkage(int DeviceName, int GimbalLinka @@ -1049,6 +1049,7 @@ T_JZsdkReturnCode UIcontrol_Obtain_GimbalLinkage(int DeviceName, int GimbalLinka
1049 **********/ 1049 **********/
1050 T_JZsdkReturnCode UIcontrol_Set_SearchLightFrequency(int DeviceName,int value) 1050 T_JZsdkReturnCode UIcontrol_Set_SearchLightFrequency(int DeviceName,int value)
1051 { 1051 {
  1052 +#ifdef LIGHTING_STATUS_ON
1052 //调用探照灯的接口 1053 //调用探照灯的接口
1053 T_JZsdkReturnCode ret = Lighting_Set_SearchLightFrequency(value); 1054 T_JZsdkReturnCode ret = Lighting_Set_SearchLightFrequency(value);
1054 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1055 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -1086,6 +1087,7 @@ T_JZsdkReturnCode UIcontrol_Set_SearchLightFrequency(int DeviceName,int value) @@ -1086,6 +1087,7 @@ T_JZsdkReturnCode UIcontrol_Set_SearchLightFrequency(int DeviceName,int value)
1086 } 1087 }
1087 1088
1088 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 1089 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  1090 +#endif
1089 1091
1090 } 1092 }
1091 1093
@@ -1096,6 +1098,7 @@ T_JZsdkReturnCode UIcontrol_Set_SearchLightFrequency(int DeviceName,int value) @@ -1096,6 +1098,7 @@ T_JZsdkReturnCode UIcontrol_Set_SearchLightFrequency(int DeviceName,int value)
1096 **********/ 1098 **********/
1097 T_JZsdkReturnCode UIcontrol_SearchLightControl(int DeviceName, int value) 1099 T_JZsdkReturnCode UIcontrol_SearchLightControl(int DeviceName, int value)
1098 { 1100 {
  1101 +#ifdef LIGHTING_STATUS_ON
1099 //调用探照灯的灯光模式接口 1102 //调用探照灯的灯光模式接口
1100 T_JZsdkReturnCode ret = Lighting_SearchLightControl(value); 1103 T_JZsdkReturnCode ret = Lighting_SearchLightControl(value);
1101 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1104 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -1133,6 +1136,8 @@ T_JZsdkReturnCode UIcontrol_SearchLightControl(int DeviceName, int value) @@ -1133,6 +1136,8 @@ T_JZsdkReturnCode UIcontrol_SearchLightControl(int DeviceName, int value)
1133 } 1136 }
1134 1137
1135 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 1138 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  1139 +
  1140 +#endif
1136 } 1141 }
1137 1142
1138 /********* 1143 /*********
@@ -1142,6 +1147,7 @@ T_JZsdkReturnCode UIcontrol_SearchLightControl(int DeviceName, int value) @@ -1142,6 +1147,7 @@ T_JZsdkReturnCode UIcontrol_SearchLightControl(int DeviceName, int value)
1142 **********/ 1147 **********/
1143 T_JZsdkReturnCode UIcontrol_Set_SearchLightLumen(int DeviceName, int WeatherFlush, int value1, int value2) 1148 T_JZsdkReturnCode UIcontrol_Set_SearchLightLumen(int DeviceName, int WeatherFlush, int value1, int value2)
1144 { 1149 {
  1150 +#ifdef LIGHTING_STATUS_ON
1145 //检查是否合法 1151 //检查是否合法
1146 if (value1 >= 100) 1152 if (value1 >= 100)
1147 { 1153 {
@@ -1204,6 +1210,7 @@ T_JZsdkReturnCode UIcontrol_Set_SearchLightLumen(int DeviceName, int WeatherFlus @@ -1204,6 +1210,7 @@ T_JZsdkReturnCode UIcontrol_Set_SearchLightLumen(int DeviceName, int WeatherFlus
1204 } 1210 }
1205 1211
1206 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 1212 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  1213 +#endif
1207 } 1214 }
1208 1215
1209 /********* 1216 /*********
@@ -1213,8 +1220,10 @@ T_JZsdkReturnCode UIcontrol_Set_SearchLightLumen(int DeviceName, int WeatherFlus @@ -1213,8 +1220,10 @@ T_JZsdkReturnCode UIcontrol_Set_SearchLightLumen(int DeviceName, int WeatherFlus
1213 **********/ 1220 **********/
1214 T_JZsdkReturnCode UIcontrol_CheckStatus_SearchLightLightAttribute(int *ValueFrequency, int *ValueMode, int *ValueLeftLumen, int *ValueRightLumen) 1221 T_JZsdkReturnCode UIcontrol_CheckStatus_SearchLightLightAttribute(int *ValueFrequency, int *ValueMode, int *ValueLeftLumen, int *ValueRightLumen)
1215 { 1222 {
  1223 +#ifdef LIGHTING_STATUS_ON
1216 //获取本地的灯光属性，并主动刷新一次灯光属性 1224 //获取本地的灯光属性，并主动刷新一次灯光属性
1217 Lighting_CheckStatus_SearchLightLightAttribute(ValueFrequency, ValueMode, ValueLeftLumen, ValueRightLumen); 1225 Lighting_CheckStatus_SearchLightLightAttribute(ValueFrequency, ValueMode, ValueLeftLumen, ValueRightLumen);
  1226 +#endif
1218 } 1227 }
1219 1228
1220 /********* 1229 /*********
@@ -1224,8 +1233,10 @@ T_JZsdkReturnCode UIcontrol_CheckStatus_SearchLightLightAttribute(int *ValueFreq @@ -1224,8 +1233,10 @@ T_JZsdkReturnCode UIcontrol_CheckStatus_SearchLightLightAttribute(int *ValueFreq
1224 **********/ 1233 **********/
1225 T_JZsdkReturnCode UIcontrol_CheckStatus_SearchLightTemperture(int *ValueLeftTemperature, int *ValueRightTemperaturen) 1234 T_JZsdkReturnCode UIcontrol_CheckStatus_SearchLightTemperture(int *ValueLeftTemperature, int *ValueRightTemperaturen)
1226 { 1235 {
  1236 +#ifdef LIGHTING_STATUS_ON
1227 //获取本地的灯光温度，并主动刷新一次灯光温度 1237 //获取本地的灯光温度，并主动刷新一次灯光温度
1228 Lighting_CheckStatus_SearchLightTemperture(ValueLeftTemperature, ValueRightTemperaturen); 1238 Lighting_CheckStatus_SearchLightTemperture(ValueLeftTemperature, ValueRightTemperaturen);
  1239 +#endif
1229 } 1240 }
1230 1241
1231 /**************************************************************************************************************************************** 1242 /****************************************************************************************************************************************
@@ -1236,6 +1247,7 @@ T_JZsdkReturnCode UIcontrol_CheckStatus_SearchLightTemperture(int *ValueLeftTemp @@ -1236,6 +1247,7 @@ T_JZsdkReturnCode UIcontrol_CheckStatus_SearchLightTemperture(int *ValueLeftTemp
1236 //设置警灯状态 1247 //设置警灯状态
1237 T_JZsdkReturnCode UIcontrol_Set_WarningLight_ModeControl(int DeviceName, int value1, int value2) 1248 T_JZsdkReturnCode UIcontrol_Set_WarningLight_ModeControl(int DeviceName, int value1, int value2)
1238 { 1249 {
  1250 +#ifdef LIGHTING_STATUS_ON
1239 //调用探照灯的接口 1251 //调用探照灯的接口
1240 T_JZsdkReturnCode ret = Lighting_Set_WarningLight_Status(value1, value2); 1252 T_JZsdkReturnCode ret = Lighting_Set_WarningLight_Status(value1, value2);
1241 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1253 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -1274,11 +1286,13 @@ T_JZsdkReturnCode UIcontrol_Set_WarningLight_ModeControl(int DeviceName, int val @@ -1274,11 +1286,13 @@ T_JZsdkReturnCode UIcontrol_Set_WarningLight_ModeControl(int DeviceName, int val
1274 1286
1275 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 1287 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
1276 1288
  1289 +#endif
1277 } 1290 }
1278 1291
1279 //设置警灯颜色 1292 //设置警灯颜色
1280 T_JZsdkReturnCode UIcontrol_Set_WarningLight_Color(int DeviceName, int value1, int value2) 1293 T_JZsdkReturnCode UIcontrol_Set_WarningLight_Color(int DeviceName, int value1, int value2)
1281 { 1294 {
  1295 +#ifdef LIGHTING_STATUS_ON
1282 //调用探照灯的接口 1296 //调用探照灯的接口
1283 T_JZsdkReturnCode ret = Lighting_Set_WarningLight_Color(value1, value2); 1297 T_JZsdkReturnCode ret = Lighting_Set_WarningLight_Color(value1, value2);
1284 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1298 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
@@ -1316,6 +1330,7 @@ T_JZsdkReturnCode UIcontrol_Set_WarningLight_Color(int DeviceName, int value1, i @@ -1316,6 +1330,7 @@ T_JZsdkReturnCode UIcontrol_Set_WarningLight_Color(int DeviceName, int value1, i
1316 } 1330 }
1317 1331
1318 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 1332 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  1333 +#endif
1319 } 1334 }
1320 1335
1321 1336
@@ -1326,8 +1341,10 @@ T_JZsdkReturnCode UIcontrol_Set_WarningLight_Color(int DeviceName, int value1, i @@ -1326,8 +1341,10 @@ T_JZsdkReturnCode UIcontrol_Set_WarningLight_Color(int DeviceName, int value1, i
1326 **********/ 1341 **********/
1327 T_JZsdkReturnCode UIcontrol_CheckStatus_WarningLightStatus(int *ValueSwitch, int *ValueMode) 1342 T_JZsdkReturnCode UIcontrol_CheckStatus_WarningLightStatus(int *ValueSwitch, int *ValueMode)
1328 { 1343 {
  1344 +#ifdef LIGHTING_STATUS_ON
1329 //获取本地的警灯状态，并主动刷新一次警灯状态 1345 //获取本地的警灯状态，并主动刷新一次警灯状态
1330 Lighting_CheckStatus_WarningLightStatus(ValueSwitch, ValueMode); 1346 Lighting_CheckStatus_WarningLightStatus(ValueSwitch, ValueMode);
  1347 +#endif
1331 } 1348 }
1332 1349
1333 /********* 1350 /*********
@@ -1337,8 +1354,10 @@ T_JZsdkReturnCode UIcontrol_CheckStatus_WarningLightStatus(int *ValueSwitch, int @@ -1337,8 +1354,10 @@ T_JZsdkReturnCode UIcontrol_CheckStatus_WarningLightStatus(int *ValueSwitch, int
1337 **********/ 1354 **********/
1338 T_JZsdkReturnCode UIcontrol_CheckStatus_WarningLightColor(int *ValueColor1, int *ValueColor2) 1355 T_JZsdkReturnCode UIcontrol_CheckStatus_WarningLightColor(int *ValueColor1, int *ValueColor2)
1339 { 1356 {
  1357 +#ifdef LIGHTING_STATUS_ON
1340 //获取本地的警灯颜色，并主动刷新一次警灯颜色 1358 //获取本地的警灯颜色，并主动刷新一次警灯颜色
1341 Lighting_CheckStatus_WarningLightColor(ValueColor1, ValueColor2); 1359 Lighting_CheckStatus_WarningLightColor(ValueColor1, ValueColor2);
  1360 +#endif
1342 } 1361 }
1343 1362
1344 /**************************************************************************************************************************************** 1363 /****************************************************************************************************************************************
@@ -1469,6 +1488,7 @@ T_JZsdkReturnCode UIcontrol_CheckStatus_OutPutPowerValue(int *Value) @@ -1469,6 +1488,7 @@ T_JZsdkReturnCode UIcontrol_CheckStatus_OutPutPowerValue(int *Value)
1469 **********/ 1488 **********/
1470 T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Frequency(int DeviceName, int Frequency) 1489 T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Frequency(int DeviceName, int Frequency)
1471 { 1490 {
  1491 +#ifdef LIGHTING_STATUS_ON
1472 //1、设置本地存储值 1492 //1、设置本地存储值
1473 Lighting_Obtain_SearchLightFrequency(Frequency); 1493 Lighting_Obtain_SearchLightFrequency(Frequency);
1474 1494
@@ -1494,6 +1514,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Frequency(int DeviceName, int Freq @@ -1494,6 +1514,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Frequency(int DeviceName, int Freq
1494 } 1514 }
1495 1515
1496 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 1516 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  1517 +#endif
1497 } 1518 }
1498 1519
1499 /********* 1520 /*********
@@ -1503,6 +1524,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Frequency(int DeviceName, int Freq @@ -1503,6 +1524,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Frequency(int DeviceName, int Freq
1503 **********/ 1524 **********/
1504 T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Mode(int DeviceName, int mode) 1525 T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Mode(int DeviceName, int mode)
1505 { 1526 {
  1527 +#ifdef LIGHTING_STATUS_ON
1506 //1、设置本地存储值 1528 //1、设置本地存储值
1507 Lighting_Obtain_SearchLightMode(mode); 1529 Lighting_Obtain_SearchLightMode(mode);
1508 1530
@@ -1528,6 +1550,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Mode(int DeviceName, int mode) @@ -1528,6 +1550,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Mode(int DeviceName, int mode)
1528 } 1550 }
1529 1551
1530 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 1552 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  1553 +#endif
1531 } 1554 }
1532 1555
1533 /********* 1556 /*********
@@ -1537,6 +1560,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Mode(int DeviceName, int mode) @@ -1537,6 +1560,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Mode(int DeviceName, int mode)
1537 **********/ 1560 **********/
1538 T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Lumen(int DeviceName, int LeftLumen, int RightLumen) 1561 T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Lumen(int DeviceName, int LeftLumen, int RightLumen)
1539 { 1562 {
  1563 +#ifdef LIGHTING_STATUS_ON
1540 //1、设置本地存储值 1564 //1、设置本地存储值
1541 Lighting_Obtain_SearchLightLumen(LeftLumen, RightLumen); 1565 Lighting_Obtain_SearchLightLumen(LeftLumen, RightLumen);
1542 1566
@@ -1563,6 +1587,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Lumen(int DeviceName, int LeftLume @@ -1563,6 +1587,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Lumen(int DeviceName, int LeftLume
1563 } 1587 }
1564 1588
1565 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 1589 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  1590 +#endif
1566 } 1591 }
1567 1592
1568 /********* 1593 /*********
@@ -1572,6 +1597,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Lumen(int DeviceName, int LeftLume @@ -1572,6 +1597,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Lumen(int DeviceName, int LeftLume
1572 **********/ 1597 **********/
1573 T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Temperature(int DeviceName, int LeftTemperature, int RightTemperature) 1598 T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Temperature(int DeviceName, int LeftTemperature, int RightTemperature)
1574 { 1599 {
  1600 +#ifdef LIGHTING_STATUS_ON
1575 //1、设置本地存储值 1601 //1、设置本地存储值
1576 Lighting_Obtain_SearchLightTemperature(LeftTemperature, RightTemperature); 1602 Lighting_Obtain_SearchLightTemperature(LeftTemperature, RightTemperature);
1577 1603
@@ -1598,6 +1624,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Temperature(int DeviceName, int Le @@ -1598,6 +1624,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Temperature(int DeviceName, int Le
1598 } 1624 }
1599 1625
1600 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 1626 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  1627 +#endif
1601 } 1628 }
1602 1629
1603 /**************************************************************************************************************************************** 1630 /****************************************************************************************************************************************
@@ -1612,6 +1639,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Temperature(int DeviceName, int Le @@ -1612,6 +1639,7 @@ T_JZsdkReturnCode UIcontrol_ObtainSearchLight_Temperature(int DeviceName, int Le
1612 **********/ 1639 **********/
1613 T_JZsdkReturnCode UIcontrol_ObtainWarningLight_Status(int DeviceName, int status, int mode) 1640 T_JZsdkReturnCode UIcontrol_ObtainWarningLight_Status(int DeviceName, int status, int mode)
1614 { 1641 {
  1642 +#ifdef LIGHTING_STATUS_ON
1615 //1、设置本地存储值 1643 //1、设置本地存储值
1616 Lighting_Obtain_WarningLight_Status(status, mode); 1644 Lighting_Obtain_WarningLight_Status(status, mode);
1617 1645
@@ -1637,6 +1665,7 @@ T_JZsdkReturnCode UIcontrol_ObtainWarningLight_Status(int DeviceName, int status @@ -1637,6 +1665,7 @@ T_JZsdkReturnCode UIcontrol_ObtainWarningLight_Status(int DeviceName, int status
1637 } 1665 }
1638 1666
1639 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 1667 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  1668 +#endif
1640 } 1669 }
1641 1670
1642 /********* 1671 /*********
@@ -1646,6 +1675,7 @@ T_JZsdkReturnCode UIcontrol_ObtainWarningLight_Status(int DeviceName, int status @@ -1646,6 +1675,7 @@ T_JZsdkReturnCode UIcontrol_ObtainWarningLight_Status(int DeviceName, int status
1646 **********/ 1675 **********/
1647 T_JZsdkReturnCode UIcontrol_ObtainWarningLight_Color(int DeviceName, int color1, int color2) 1676 T_JZsdkReturnCode UIcontrol_ObtainWarningLight_Color(int DeviceName, int color1, int color2)
1648 { 1677 {
  1678 +#ifdef LIGHTING_STATUS_ON
1649 //1、设置本地存储值 1679 //1、设置本地存储值
1650 Lighting_Obtain_WarningLight_Color(color1, color2); 1680 Lighting_Obtain_WarningLight_Color(color1, color2);
1651 1681
@@ -1671,6 +1701,7 @@ T_JZsdkReturnCode UIcontrol_ObtainWarningLight_Color(int DeviceName, int color1, @@ -1671,6 +1701,7 @@ T_JZsdkReturnCode UIcontrol_ObtainWarningLight_Color(int DeviceName, int color1,
1671 } 1701 }
1672 1702
1673 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 1703 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  1704 +#endif
1674 } 1705 }
1675 1706
1676 /**************************************************************************************************************************************** 1707 /****************************************************************************************************************************************
@@ -287,7 +287,7 @@ static void *DecodeAudioData_task(void *arg) @@ -287,7 +287,7 @@ static void *DecodeAudioData_task(void *arg)
287 287
288 for (i = 0; i < WIDGET_SPEAKER_AUDIO_OPUS_CHANNELS * frame_size; i++) { 288 for (i = 0; i < WIDGET_SPEAKER_AUDIO_OPUS_CHANNELS * frame_size; i++) {
289 TempPcm [i] = out[i] & 0xFF | (out[i] >> 8) << 8; 289 TempPcm [i] = out[i] & 0xFF | (out[i] >> 8) << 8;
290 - TempPcm[i] = PcmNoiseReduction(TempPcm[i]); 290 + //TempPcm[i] = PcmNoiseReduction(TempPcm[i]);
291 } 291 }
292 292
293 fwrite(TempPcm, sizeof(short), frame_size * WIDGET_SPEAKER_AUDIO_OPUS_CHANNELS, fout); 293 fwrite(TempPcm, sizeof(short), frame_size * WIDGET_SPEAKER_AUDIO_OPUS_CHANNELS, fout);
1 # cmake 最低版本要求 第三行名字不能动 1 # cmake 最低版本要求 第三行名字不能动
2 cmake_minimum_required(VERSION 2.8) 2 cmake_minimum_required(VERSION 2.8)
3 -project(JZ-H1E) 3 +project(JZ_H150S)
4 4
5 set(CMAKE_C_FLAGS "-pthread -std=gnu99 -lm -ldl -lstdc++") 5 set(CMAKE_C_FLAGS "-pthread -std=gnu99 -lm -ldl -lstdc++")
6 #"-pthread":指定在编译时链接POSIX线程库,以支持多线程程序。 6 #"-pthread":指定在编译时链接POSIX线程库,以支持多线程程序。
@@ -27,8 +27,8 @@ set(ROOT_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../../../../../../") @@ -27,8 +27,8 @@ set(ROOT_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../../../../../../")
27 27
28 # 包含模块配置 28 # 包含模块配置
29 include(${ROOT_DIRS}CmakeConfig/Compiler.cmake) 29 include(${ROOT_DIRS}CmakeConfig/Compiler.cmake)
30 -include(${ROOT_DIRS}CmakeConfig/ModuleConfig.cmake)  
31 -include(${ROOT_DIRS}CmakeConfig/SubsidiaryThirdPartyConfig.cmake) 30 +include(${ROOT_DIRS}CmakeConfig/module_config.cmake)
  31 +include(${ROOT_DIRS}CmakeConfig/module_build.cmake)
32 #PSDK动态库 32 #PSDK动态库
33 link_libraries(${CMAKE_CURRENT_LIST_DIR}/../../../../../psdk_lib/lib/${TOOLCHAIN_NAME}/libpayloadsdk.a) 33 link_libraries(${CMAKE_CURRENT_LIST_DIR}/../../../../../psdk_lib/lib/${TOOLCHAIN_NAME}/libpayloadsdk.a)
34 34
@@ -57,111 +57,16 @@ file(GLOB_RECURSE MODULE_HAL_SRC hal/*.c) #网络串口usb文件 MODULE_HA @@ -57,111 +57,16 @@ file(GLOB_RECURSE MODULE_HAL_SRC hal/*.c) #网络串口usb文件 MODULE_HA
57 file(GLOB_RECURSE MODULE_APP_SRC application/*.c) #main MODULE_APP_SRC 57 file(GLOB_RECURSE MODULE_APP_SRC application/*.c) #main MODULE_APP_SRC
58 file(GLOB_RECURSE MODULE_SAMPLE_SRC ../../../module_sample/*.c) #基础功能文件 MODULE_SAMPLE_SRC 58 file(GLOB_RECURSE MODULE_SAMPLE_SRC ../../../module_sample/*.c) #基础功能文件 MODULE_SAMPLE_SRC
59 59
60 -# 指定源文件  
61 -  
62 -file(GLOB_RECURSE JZSDK_COMMON_SRC ${ROOT_DIRS}JZsdk_Common/*.c)  
63 -list(APPEND ALL_SRC_FILES ${JZSDK_COMMON_SRC})  
64 -  
65 -file(GLOB_RECURSE JZSDK_CONFIG_SRC ${ROOT_DIRS}JZsdk_Config/*.c)  
66 -list(APPEND ALL_SRC_FILES ${JZSDK_CONFIG_SRC})  
67 -  
68 -file(GLOB_RECURSE JZSDK_HAL_SRC ${ROOT_DIRS}JZsdk_hal/*.c)  
69 -list(APPEND ALL_SRC_FILES ${JZSDK_HAL_SRC})  
70 -  
71 -file(GLOB_RECURSE JZSDK_OSAL_SRC ${ROOT_DIRS}JZsdk_osal/*.c)  
72 -list(APPEND ALL_SRC_FILES ${JZSDK_OSAL_SRC})  
73 -  
74 -if(${AUDIODEAL_MODULE} STREQUAL "VERSION_SWITCH_ON")  
75 - file(GLOB_RECURSE AUDIODEAL_SRC ${ROOT_DIRS}Module/AudioDeal/*.c)  
76 - list(APPEND ALL_SRC_FILES ${AUDIODEAL_SRC})  
77 - message("音频处理模块源码已加载")  
78 -endif()  
79 -  
80 -if(${DEVICE_INFO_MODULE} STREQUAL "VERSION_SWITCH_ON")  
81 - file(GLOB_RECURSE DEVICE_MESSAGE_SRC ${ROOT_DIRS}Module/DeviceInfo/*.c)  
82 - list(APPEND ALL_SRC_FILES ${DEVICE_MESSAGE_SRC})  
83 - message("设备信息模块源码已加载")  
84 -endif()  
85 -  
86 -if(${GIMBAL_MODULE} STREQUAL "VERSION_SWITCH_ON")  
87 - file(GLOB_RECURSE GIMBAL_SRC ${ROOT_DIRS}Module/Gimbal/*.c)  
88 - list(APPEND ALL_SRC_FILES ${GIMBAL_SRC})  
89 - message("云台模块源码已加载")  
90 -endif()  
91 -  
92 -if(${IRCUT_MODULE} STREQUAL "VERSION_SWITCH_ON")  
93 - file(GLOB_RECURSE MODULE_IRCUT_SRC ${ROOT_DIRS}Module/Ircut/*.c)  
94 - list(APPEND ALL_SRC_FILES ${MODULE_IRCUT_SRC})  
95 - message("引脚模块源码已加载")  
96 -endif()  
97 -  
98 -if(${LIGHTING_MODULE} STREQUAL "VERSION_SWITCH_ON")  
99 - file(GLOB_RECURSE LIGHTING_SRC ${ROOT_DIRS}Module/Lighting/*.c)  
100 - list(APPEND ALL_SRC_FILES ${LIGHTING_SRC})  
101 - message("光源模块源码已加载")  
102 -endif()  
103 -  
104 -if(${MEDIA_PROC_MODULE} STREQUAL "VERSION_SWITCH_ON")  
105 - file(GLOB_RECURSE MEDIA_PROC_SRC ${ROOT_DIRS}Module/MediaProc/*.c)  
106 - file(GLOB_RECURSE MEDIA_PROC_SRC_CPP ${ROOT_DIRS}Module/MediaProc/*.cpp)  
107 - list(APPEND ALL_SRC_FILES ${MEDIA_PROC_SRC})  
108 - list(APPEND ALL_SRC_FILES ${MEDIA_PROC_SRC_CPP})  
109 - message("媒体管理模块已加载")  
110 -endif()  
111 -  
112 -if(${MEGAPHONE_MODULE} STREQUAL "VERSION_SWITCH_ON")  
113 - file(GLOB_RECURSE MEGAPHONE_SRC ${ROOT_DIRS}Module/Megaphone/*.c)  
114 - list(APPEND ALL_SRC_FILES ${MEGAPHONE_SRC})  
115 - message("喊话器模块源码已加载")  
116 -endif()  
117 -  
118 -if(${POWER_MANAGER_MODULE} STREQUAL "VERSION_SWITCH_ON")  
119 - file(GLOB_RECURSE POWERMANAGER_SRC ${ROOT_DIRS}Module/PowerManager/*.c)  
120 - list(APPEND ALL_SRC_FILES ${POWERMANAGER_SRC})  
121 - message("电源模块已加载")  
122 -endif()  
123 -  
124 -if(${UI_CONTROL_MODULE} STREQUAL "VERSION_SWITCH_ON")  
125 - file(GLOB_RECURSE MODULE_UICONTROL_SRC ${ROOT_DIRS}Module/UI_control/*.c)  
126 - list(APPEND ALL_SRC_FILES ${MODULE_UICONTROL_SRC})  
127 - message("UI模块源码已加载")  
128 -endif()  
129 -  
130 -  
131 -if(${SIDE_LASER_MODULE} STREQUAL "VERSION_SWITCH_ON")  
132 - file(GLOB_RECURSE MODULE_SIDE_LASER_SRC ${ROOT_DIRS}Module/SideLaser/*.c)  
133 - list(APPEND ALL_SRC_FILES ${MODULE_SIDE_LASER_SRC})  
134 - message("侧边激光模块源码已加载")  
135 -endif()  
136 -  
137 -file(GLOB_RECURSE MODULE_IMAGEPROCESSING_SRC ${ROOT_DIRS}Module/ImageProcessing/*.c)  
138 -file(GLOB_RECURSE MODULE_IMAGEPROCESSING_cpp_SRC ${ROOT_DIRS}Module/ImageProcessing/*.cpp)  
139 -  
140 -#进入.h文件  
141 -include_directories(./application)  
142 -include_directories(${ROOT_DIRS}JZsdk_Common)  
143 -include_directories(${ROOT_DIRS}JZsdk_Config)  
144 -include_directories(${ROOT_DIRS}JZsdk_hal)  
145 -include_directories(${ROOT_DIRS}JZsdk_osal)  
146 -  
147 -include_directories(${ROOT_DIRS}Module/Megaphone)  
148 -include_directories(${ROOT_DIRS}Module/Ircut)  
149 -include_directories(${ROOT_DIRS}Module/Ircut/H3_ircut/wiringPi)  
150 -include_directories(${ROOT_DIRS}Module/Gimbal)  
151 -include_directories(${ROOT_DIRS}Module/Lighting)  
152 -include_directories(${ROOT_DIRS}Module/UI_control)  
153 -include_directories(${ROOT_DIRS}Module/Camera)  
154 -include_directories(${ROOT_DIRS}Module/PowerManager)  
155 -include_directories(${ROOT_DIRS}Module/TestAPP)  
156 -include_directories(${ROOT_DIRS}Module/ImageProcessing)  
157 -include_directories(${ROOT_DIRS}Module/SerialManagement)  
158 -include_directories(${ROOT_DIRS}Module)  
159 - 60 +# psdk额外加载的.h文件
160 include_directories(./application) 61 include_directories(./application)
161 include_directories(../../../module_sample) 62 include_directories(../../../module_sample)
162 include_directories(../common) 63 include_directories(../common)
163 include_directories(../../../../../psdk_lib/include) #PSDK头文件 64 include_directories(../../../../../psdk_lib/include) #PSDK头文件
164 65
  66 +
  67 +# 加载jzsdk的头文件　 *****************************************************
  68 +include_directories(${ALL_INC_FILES})
  69 +
165 # 工程输出目录 70 # 工程输出目录
166 if (NOT EXECUTABLE_OUTPUT_PATH) 71 if (NOT EXECUTABLE_OUTPUT_PATH)
167 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) 72 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
@@ -177,12 +82,10 @@ add_executable( @@ -177,12 +82,10 @@ add_executable(
177 ${MODULE_HAL_SRC} 82 ${MODULE_HAL_SRC}
178 ${MODULE_SAMPLE_SRC} 83 ${MODULE_SAMPLE_SRC}
179 84
180 - ${ALL_SRC_FILES}  
181 - ${MODULE_IMAGEPROCESSING_SRC}  
182 - ${MODULE_IMAGEPROCESSING_cpp_SRC} 85 + ${ALL_SRC_FILES} #加载jzsdk的源文件 *****************************************************
183 ) 86 )
184 87
185 -include(${ROOT_DIRS}CmakeConfig/ModuleLoading.cmake) 88 +include(${ROOT_DIRS}CmakeConfig/module_lib_loading.cmake)
186 89
187 add_custom_command(TARGET ${PROJECT_NAME} 90 add_custom_command(TARGET ${PROJECT_NAME}
188 PRE_LINK COMMAND cmake .. 91 PRE_LINK COMMAND cmake ..
@@ -24,117 +24,18 @@ set(ROOT_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../") @@ -24,117 +24,18 @@ set(ROOT_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../")
24 24
25 # 包含模块配置 25 # 包含模块配置
26 include(${ROOT_DIRS}CmakeConfig/Compiler.cmake) 26 include(${ROOT_DIRS}CmakeConfig/Compiler.cmake)
27 -include(${ROOT_DIRS}CmakeConfig/ModuleConfig.cmake)  
28 -include(${ROOT_DIRS}CmakeConfig/SubsidiaryThirdPartyConfig.cmake) 27 +include(${ROOT_DIRS}CmakeConfig/module_config.cmake)
  28 +include(${ROOT_DIRS}CmakeConfig/module_build.cmake)
29 29
30 -# 指定源文件  
31 -file(GLOB_RECURSE JZSDK_COMMON_SRC ${ROOT_DIRS}JZsdk_Common/*.c)  
32 -list(APPEND ALL_SRC_FILES ${JZSDK_COMMON_SRC})  
33 -  
34 -file(GLOB_RECURSE JZSDK_CONFIG_SRC ${ROOT_DIRS}JZsdk_Config/*.c)  
35 -list(APPEND ALL_SRC_FILES ${JZSDK_CONFIG_SRC})  
36 -  
37 -file(GLOB_RECURSE JZSDK_HAL_SRC ${ROOT_DIRS}JZsdk_hal/*.c)  
38 -list(APPEND ALL_SRC_FILES ${JZSDK_HAL_SRC})  
39 -  
40 -file(GLOB_RECURSE JZSDK_OSAL_SRC ${ROOT_DIRS}JZsdk_osal/*.c)  
41 -list(APPEND ALL_SRC_FILES ${JZSDK_OSAL_SRC})  
42 -  
43 -if(${AUDIODEAL_MODULE} STREQUAL "VERSION_SWITCH_ON")  
44 - file(GLOB_RECURSE AUDIODEAL_SRC ${ROOT_DIRS}Module/AudioDeal/*.c)  
45 - list(APPEND ALL_SRC_FILES ${AUDIODEAL_SRC})  
46 - message("音频处理模块源码已加载")  
47 -endif()  
48 -  
49 -if(${DEVICE_INFO_MODULE} STREQUAL "VERSION_SWITCH_ON")  
50 - file(GLOB_RECURSE DEVICE_MESSAGE_SRC ${ROOT_DIRS}Module/DeviceInfo/*.c)  
51 - list(APPEND ALL_SRC_FILES ${DEVICE_MESSAGE_SRC})  
52 - message("设备信息模块源码已加载")  
53 -endif()  
54 -  
55 -if(${GIMBAL_MODULE} STREQUAL "VERSION_SWITCH_ON")  
56 - file(GLOB_RECURSE GIMBAL_SRC ${ROOT_DIRS}Module/Gimbal/*.c)  
57 - list(APPEND ALL_SRC_FILES ${GIMBAL_SRC})  
58 - message("云台模块源码已加载")  
59 -endif()  
60 -  
61 -if(${IRCUT_MODULE} STREQUAL "VERSION_SWITCH_ON")  
62 - file(GLOB_RECURSE MODULE_IRCUT_SRC ${ROOT_DIRS}Module/Ircut/*.c)  
63 - list(APPEND ALL_SRC_FILES ${MODULE_IRCUT_SRC})  
64 - message("引脚模块源码已加载")  
65 -endif()  
66 -  
67 -if(${LIGHTING_MODULE} STREQUAL "VERSION_SWITCH_ON")  
68 - file(GLOB_RECURSE LIGHTING_SRC ${ROOT_DIRS}Module/Lighting/*.c)  
69 - list(APPEND ALL_SRC_FILES ${LIGHTING_SRC})  
70 - message("光源模块源码已加载")  
71 -endif()  
72 -  
73 -if(${MEDIA_PROC_MODULE} STREQUAL "VERSION_SWITCH_ON")  
74 - file(GLOB_RECURSE MEDIA_PROC_SRC ${ROOT_DIRS}Module/MediaProc/*.c)  
75 - file(GLOB_RECURSE MEDIA_PROC_SRC_CPP ${ROOT_DIRS}Module/MediaProc/*.cpp)  
76 - list(APPEND ALL_SRC_FILES ${MEDIA_PROC_SRC})  
77 - list(APPEND ALL_SRC_FILES ${MEDIA_PROC_SRC_CPP})  
78 - message("媒体管理模块已加载")  
79 -endif()  
80 -  
81 -if(${MEGAPHONE_MODULE} STREQUAL "VERSION_SWITCH_ON")  
82 - file(GLOB_RECURSE MEGAPHONE_SRC ${ROOT_DIRS}Module/Megaphone/*.c)  
83 - list(APPEND ALL_SRC_FILES ${MEGAPHONE_SRC})  
84 - message("喊话器模块源码已加载")  
85 -endif()  
86 -  
87 -if(${POWER_MANAGER_MODULE} STREQUAL "VERSION_SWITCH_ON")  
88 - file(GLOB_RECURSE POWERMANAGER_SRC ${ROOT_DIRS}Module/PowerManager/*.c)  
89 - list(APPEND ALL_SRC_FILES ${POWERMANAGER_SRC})  
90 - message("电源模块已加载")  
91 -endif()  
92 -  
93 -if(${UI_CONTROL_MODULE} STREQUAL "VERSION_SWITCH_ON")  
94 - file(GLOB_RECURSE MODULE_UICONTROL_SRC ${ROOT_DIRS}Module/UI_control/*.c)  
95 - list(APPEND ALL_SRC_FILES ${MODULE_UICONTROL_SRC})  
96 - message("UI模块源码已加载")  
97 -endif()  
98 -  
99 -  
100 -if(${SIDE_LASER_MODULE} STREQUAL "VERSION_SWITCH_ON")  
101 - file(GLOB_RECURSE MODULE_SIDE_LASER_SRC ${ROOT_DIRS}Module/SideLaser/*.c)  
102 - list(APPEND ALL_SRC_FILES ${MODULE_SIDE_LASER_SRC})  
103 - message("侧边激光模块源码已加载")  
104 -endif()  
105 -  
106 -file(GLOB_RECURSE MODULE_IMAGEPROCESSING_SRC ${ROOT_DIRS}Module/ImageProcessing/*.c)  
107 -file(GLOB_RECURSE MODULE_IMAGEPROCESSING_cpp_SRC ${ROOT_DIRS}Module/ImageProcessing/*.cpp)  
108 -  
109 -# 头文件路径  
110 -include_directories(./application)  
111 -include_directories(${ROOT_DIRS}JZsdk_Common)  
112 -include_directories(${ROOT_DIRS}JZsdk_Config)  
113 -include_directories(${ROOT_DIRS}JZsdk_hal)  
114 -include_directories(${ROOT_DIRS}JZsdk_osal)  
115 -  
116 -include_directories(${ROOT_DIRS}Module)  
117 -  
118 -include_directories(${ROOT_DIRS}Module/Megaphone)  
119 -include_directories(${ROOT_DIRS}Module/Ircut)  
120 -include_directories(${ROOT_DIRS}Module/Ircut/H3_ircut/wiringPi)  
121 -include_directories(${ROOT_DIRS}Module/Gimbal)  
122 -include_directories(${ROOT_DIRS}Module/Lighting)  
123 -include_directories(${ROOT_DIRS}Module/UI_control)  
124 -include_directories(${ROOT_DIRS}Module/Camera)  
125 -include_directories(${ROOT_DIRS}Module/PowerManager)  
126 -include_directories(${ROOT_DIRS}Module/TestAPP)  
127 -include_directories(${ROOT_DIRS}Module/ImageProcessing)  
128 -include_directories(${ROOT_DIRS}Module/SerialManagement) 30 +# 加载jzsdk的头文件　 *****************************************************
  31 +include_directories(${ALL_INC_FILES})
129 32
130 # 生成可执行文件 33 # 生成可执行文件
131 add_executable( 34 add_executable(
132 JZ_UART_APP 35 JZ_UART_APP
133 ./application/main.c 36 ./application/main.c
134 - ${ALL_SRC_FILES}  
135 - ${MODULE_IMAGEPROCESSING_SRC}  
136 - ${MODULE_IMAGEPROCESSING_cpp_SRC} 37 + ${ALL_SRC_FILES} #加载jzsdk的源文件 *****************************************************
137 ) 38 )
138 39
139 40
140 -include(${ROOT_DIRS}CmakeConfig/ModuleLoading.cmake) 41 +include(${ROOT_DIRS}CmakeConfig/module_lib_loading.cmake)