正在显示
100 个修改的文件
包含
2148 行增加
和
881 行删除
.vscode/c_cpp_properties.json
0 → 100644
| 1 | +{ | ||
| 2 | + "configurations": [ | ||
| 3 | + { | ||
| 4 | + "name": "Win32", | ||
| 5 | + "includePath": [ | ||
| 6 | + "${workspaceFolder}/**" | ||
| 7 | + ], | ||
| 8 | + "defines": [ | ||
| 9 | + "_DEBUG", | ||
| 10 | + "UNICODE", | ||
| 11 | + "_UNICODE" | ||
| 12 | + ], | ||
| 13 | + "cStandard": "c99", | ||
| 14 | + "cppStandard": "c++98", | ||
| 15 | + "intelliSenseMode": "linux-gcc-arm64", | ||
| 16 | + "compilerPath": "E:\\share_build\\4.9.3\\bin\\arm-cortexa9-linux-gnueabihf-gcc" | ||
| 17 | + } | ||
| 18 | + ], | ||
| 19 | + "version": 4 | ||
| 20 | +} |
| @@ -50,6 +50,8 @@ | @@ -50,6 +50,8 @@ | ||
| 50 | "ui_control.h": "c", | 50 | "ui_control.h": "c", |
| 51 | "jz_searchlighttemp_calculation.h": "c", | 51 | "jz_searchlighttemp_calculation.h": "c", |
| 52 | "searchlighttemcontrol.h": "c", | 52 | "searchlighttemcontrol.h": "c", |
| 53 | - "taskmanagement.h": "c" | ||
| 54 | - } | 53 | + "taskmanagement.h": "c", |
| 54 | + "jzsdk_network.h": "c" | ||
| 55 | + }, | ||
| 56 | + "C_Cpp.default.compilerPath": "e:\\share_build\\4.9.3\\bin\\arm-cortexa9-linux-gnueabihf-gcc" | ||
| 55 | } | 57 | } |
| @@ -24,23 +24,43 @@ set(CMAKE_EXE_LINKER_FLAGS "-pthread") | @@ -24,23 +24,43 @@ set(CMAKE_EXE_LINKER_FLAGS "-pthread") | ||
| 24 | set(filtering_type high_pass_filtering) | 24 | set(filtering_type high_pass_filtering) |
| 25 | 25 | ||
| 26 | # 海外版本 27行不能改动 | 26 | # 海外版本 27行不能改动 |
| 27 | -set(firewarm_origin OVERSEAS_VERSION) | 27 | +set(firewarm_origin DOMESTIC_VERSION) |
| 28 | 28 | ||
| 29 | # 添加Cedar库 30行不能改动 | 29 | # 添加Cedar库 30行不能改动 |
| 30 | set(CedarxLib VERSION_SWITCH_OFF) | 30 | set(CedarxLib VERSION_SWITCH_OFF) |
| 31 | 31 | ||
| 32 | -if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON") | ||
| 33 | - set(CMAKE_C_COMPILER "/opt/gcc-linaro-6.3.1-2017.05-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc") | ||
| 34 | - set(CMAKE_CXX_COMPILER "/opt/gcc-linaro-6.3.1-2017.05-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++") | 32 | +# 添加编译链选择 33行禁止改动 |
| 33 | +set(MAKE_COMPILER ARM_CORTEXA9_LINUX) | ||
| 34 | + | ||
| 35 | +if(${MAKE_COMPILER} STREQUAL "ARM_CORTEXA9_LINUX") | ||
| 36 | + if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON") | ||
| 37 | + # 交叉编译链1 | ||
| 38 | + set(TOOLCHAIN_NAME arm-linux-gnueabihf-gcc) | ||
| 39 | + set(CMAKE_C_COMPILER "/opt/gcc-linaro-6.3.1-2017.05-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc") | ||
| 40 | + set(CMAKE_CXX_COMPILER "/opt/gcc-linaro-6.3.1-2017.05-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++") | ||
| 41 | + else() | ||
| 42 | + # 交叉编译链2 | ||
| 43 | + set(TOOLCHAIN_NAME arm-linux-gnueabihf-gcc) | ||
| 44 | + set(CMAKE_C_COMPILER "/usr/local/arm/4.9.3/bin/arm-cortexa9-linux-gnueabihf-gcc") | ||
| 45 | + set(CMAKE_CXX_COMPILER "/usr/local/arm/4.9.3/bin/arm-cortexa9-linux-gnueabihf-g++") | ||
| 46 | + endif() | ||
| 47 | +elseif(${MAKE_COMPILER} STREQUAL "ARM_X86_64_ARRCH64") | ||
| 48 | + # 交叉编译链3 | ||
| 49 | + set(TOOLCHAIN_NAME aarch64-linux-gnu-gcc) | ||
| 50 | + set(CMAKE_C_COMPILER "/opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-gcc") | ||
| 51 | + set(CMAKE_CXX_COMPILER "/opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-g++") | ||
| 52 | +elseif(${MAKE_COMPILER} STREQUAL "LOCAL") | ||
| 53 | + # 本地测试编译链 | ||
| 54 | + set(CMAKE_C_COMPILER "/usr/bin/gcc") | ||
| 55 | + set(CMAKE_CXX_COMPILER "/usr/bin/g++") | ||
| 35 | else() | 56 | else() |
| 36 | - # 交叉编译链① | ||
| 37 | - set(CMAKE_C_COMPILER "/usr/local/arm/4.9.3/bin/arm-cortexa9-linux-gnueabihf-gcc") | ||
| 38 | - set(CMAKE_CXX_COMPILER "/usr/local/arm/4.9.3/bin/arm-cortexa9-linux-gnueabihf-g++") | 57 | + message(FATAL_ERROR "不支持的编译链") |
| 39 | endif() | 58 | endif() |
| 40 | 59 | ||
| 41 | # 指定源文件 | 60 | # 指定源文件 |
| 42 | file(GLOB_RECURSE APPLICATION_SRC application/*.c) #main MODULE_APP_SRC | 61 | file(GLOB_RECURSE APPLICATION_SRC application/*.c) #main MODULE_APP_SRC |
| 43 | file(GLOB_RECURSE JZSDK_SRC JZsdk/*.c) | 62 | file(GLOB_RECURSE JZSDK_SRC JZsdk/*.c) |
| 63 | +file(GLOB_RECURSE JZSDK_HAL_SRC JZsdk_hal/*.c) | ||
| 44 | file(GLOB_RECURSE JZSDK_UART_DEAL_SRC JZsdk_Uart/*.c) | 64 | file(GLOB_RECURSE JZSDK_UART_DEAL_SRC JZsdk_Uart/*.c) |
| 45 | file(GLOB_RECURSE GIMBAL_SRC Module/Gimbal/*.c) | 65 | file(GLOB_RECURSE GIMBAL_SRC Module/Gimbal/*.c) |
| 46 | file(GLOB_RECURSE MEGAPHONE_SRC Module/Megaphone/*.c) | 66 | file(GLOB_RECURSE MEGAPHONE_SRC Module/Megaphone/*.c) |
| @@ -62,6 +82,7 @@ add_executable( | @@ -62,6 +82,7 @@ add_executable( | ||
| 62 | JZ_UART_APP | 82 | JZ_UART_APP |
| 63 | ${APPLICATION_SRC} | 83 | ${APPLICATION_SRC} |
| 64 | ${JZSDK_SRC} | 84 | ${JZSDK_SRC} |
| 85 | + ${JZSDK_HAL_SRC} | ||
| 65 | ${JZSDK_UART_DEAL_SRC} | 86 | ${JZSDK_UART_DEAL_SRC} |
| 66 | ${MEGAPHONE_SRC} | 87 | ${MEGAPHONE_SRC} |
| 67 | ${MODULE_IRCUT_SRC} | 88 | ${MODULE_IRCUT_SRC} |
| @@ -80,6 +101,7 @@ add_executable( | @@ -80,6 +101,7 @@ add_executable( | ||
| 80 | include_directories(./application) | 101 | include_directories(./application) |
| 81 | include_directories(./JZsdk) | 102 | include_directories(./JZsdk) |
| 82 | include_directories(./JZsdk_Uart) | 103 | include_directories(./JZsdk_Uart) |
| 104 | +include_directories(./JZsdk_hal) | ||
| 83 | 105 | ||
| 84 | include_directories(./Module/Megaphone) | 106 | include_directories(./Module/Megaphone) |
| 85 | include_directories(./Module/Ircut) | 107 | include_directories(./Module/Ircut) |
| @@ -87,18 +109,40 @@ include_directories(./Module/Ircut/H3_ircut/wiringPi) | @@ -87,18 +109,40 @@ include_directories(./Module/Ircut/H3_ircut/wiringPi) | ||
| 87 | include_directories(./Module/Gimbal) | 109 | include_directories(./Module/Gimbal) |
| 88 | include_directories(./Module/Lighting) | 110 | include_directories(./Module/Lighting) |
| 89 | include_directories(./Module/UI_control) | 111 | include_directories(./Module/UI_control) |
| 90 | -include_directories(./Module/PowerManager) | ||
| 91 | include_directories(./Module/Camera) | 112 | include_directories(./Module/Camera) |
| 113 | +include_directories(./Module/PowerManager) | ||
| 92 | include_directories(./Module/TestAPP) | 114 | include_directories(./Module/TestAPP) |
| 93 | include_directories(./Module/ImageProcessing) | 115 | include_directories(./Module/ImageProcessing) |
| 94 | include_directories(./Module/SerialManagement) | 116 | include_directories(./Module/SerialManagement) |
| 95 | 117 | ||
| 96 | # 库文件路径 | 118 | # 库文件路径 |
| 119 | + | ||
| 120 | + | ||
| 97 | if(${filtering_type} STREQUAL "directed_stopband_filtering") | 121 | if(${filtering_type} STREQUAL "directed_stopband_filtering") |
| 122 | + | ||
| 98 | message("\n滤波库:带阻滤波\n") | 123 | message("\n滤波库:带阻滤波\n") |
| 99 | - target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/directed_stopband_filtering/libAudioPlayer.so) | 124 | + add_definitions(-DFUNTION_MEGAPHONE) #加载喊话器模块 |
| 125 | + | ||
| 126 | + target_link_libraries( | ||
| 127 | + ${PROJECT_NAME} | ||
| 128 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/directed_stopband_filtering/libAudioPlayer.so | ||
| 129 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/libmsc.so | ||
| 130 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/opus/libopus.so | ||
| 131 | + ) | ||
| 132 | + | ||
| 133 | + if(${firewarm_origin} STREQUAL "OVERSEAS_VERSION") | ||
| 134 | + message("\n固件版本为海外版\n") | ||
| 135 | + target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/intl_tts/libportaudio.so.2) | ||
| 136 | + target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/intl_tts/libTTS_Player.so) | ||
| 137 | + | ||
| 138 | + else() | ||
| 139 | + message("\n固件版本为国内版\n") | ||
| 140 | + endif() | ||
| 141 | + | ||
| 100 | elseif(${filtering_type} STREQUAL "high_pass_filtering") | 142 | elseif(${filtering_type} STREQUAL "high_pass_filtering") |
| 101 | message("\n滤波库:高通滤波\n") | 143 | message("\n滤波库:高通滤波\n") |
| 144 | + add_definitions(-DFUNTION_MEGAPHONE) #加载喊话器模块 | ||
| 145 | + | ||
| 102 | if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON") | 146 | if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON") |
| 103 | target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/high_pass_filtering_gcclinaro/libAudioPlayer.so) | 147 | target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/high_pass_filtering_gcclinaro/libAudioPlayer.so) |
| 104 | target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/high_pass_filtering_gcclinaro/libasound.so.2) | 148 | target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/high_pass_filtering_gcclinaro/libasound.so.2) |
| @@ -106,18 +150,27 @@ elseif(${filtering_type} STREQUAL "high_pass_filtering") | @@ -106,18 +150,27 @@ elseif(${filtering_type} STREQUAL "high_pass_filtering") | ||
| 106 | target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/high_pass_filtering/libAudioPlayer.so) | 150 | target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/high_pass_filtering/libAudioPlayer.so) |
| 107 | endif() | 151 | endif() |
| 108 | 152 | ||
| 153 | + target_link_libraries( | ||
| 154 | + ${PROJECT_NAME} | ||
| 155 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/libmsc.so | ||
| 156 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/opus/libopus.so) | ||
| 157 | + | ||
| 158 | + if(${firewarm_origin} STREQUAL "OVERSEAS_VERSION") | ||
| 159 | + message("\n固件版本为海外版\n") | ||
| 160 | + target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/intl_tts/libportaudio.so.2) | ||
| 161 | + target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/intl_tts/libTTS_Player.so) | ||
| 162 | + | ||
| 163 | + else() | ||
| 164 | + message("\n固件版本为国内版\n") | ||
| 165 | + endif() | ||
| 166 | + | ||
| 167 | +elseif(${filtering_type} STREQUAL "OFF") | ||
| 168 | + message("\n无音频库加载\n") | ||
| 109 | else() | 169 | else() |
| 110 | message(FATAL_ERROR "Invalid filtering type") | 170 | message(FATAL_ERROR "Invalid filtering type") |
| 111 | endif() | 171 | endif() |
| 112 | 172 | ||
| 113 | -if(${firewarm_origin} STREQUAL "OVERSEAS_VERSION") | ||
| 114 | - message("\n固件版本为海外版\n") | ||
| 115 | - target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/intl_tts/libportaudio.so.2) | ||
| 116 | - target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/intl_tts/libTTS_Player.so) | ||
| 117 | 173 | ||
| 118 | -else() | ||
| 119 | - message("\n固件版本为国内版\n") | ||
| 120 | -endif() | ||
| 121 | 174 | ||
| 122 | if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON") | 175 | if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON") |
| 123 | message("\nCedarX已加载\n") | 176 | message("\nCedarX已加载\n") |
| @@ -132,23 +185,23 @@ if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON") | @@ -132,23 +185,23 @@ if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON") | ||
| 132 | 185 | ||
| 133 | message("\n OpenCV已加载\n") | 186 | message("\n OpenCV已加载\n") |
| 134 | target_link_libraries(${PROJECT_NAME} | 187 | target_link_libraries(${PROJECT_NAME} |
| 135 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_calib3d.so #动态库 | ||
| 136 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_core.so #动态库 | ||
| 137 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_dnn.so #动态库 | ||
| 138 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_features2d.so #动态库 | ||
| 139 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_flann.so #动态库 | ||
| 140 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_highgui.so #动态库 | ||
| 141 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_imgcodecs.so #动态库 | ||
| 142 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_imgproc.so #动态库 | ||
| 143 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_ml.so #动态库 | ||
| 144 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_objdetect.so #动态库 | ||
| 145 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_photo.so #动态库 | ||
| 146 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_shape.so #动态库 | ||
| 147 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_stitching.so #动态库 | ||
| 148 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_superres.so #动态库 | ||
| 149 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_videoio.so #动态库 | ||
| 150 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_video.so #动态库 | ||
| 151 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_videostab.so #动态库 | 188 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_calib3d.so |
| 189 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_core.so | ||
| 190 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_dnn.so | ||
| 191 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_features2d.so | ||
| 192 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_flann.so | ||
| 193 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_highgui.so | ||
| 194 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_imgcodecs.so | ||
| 195 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_imgproc.so | ||
| 196 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_ml.so | ||
| 197 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_objdetect.so | ||
| 198 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_photo.so | ||
| 199 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_shape.so | ||
| 200 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_stitching.so | ||
| 201 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_superres.so | ||
| 202 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_videoio.so | ||
| 203 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_video.so | ||
| 204 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_videostab.so | ||
| 152 | ) | 205 | ) |
| 153 | 206 | ||
| 154 | message("\n ffmpeg已加载\n") | 207 | message("\n ffmpeg已加载\n") |
| @@ -168,9 +221,3 @@ if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON") | @@ -168,9 +221,3 @@ if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON") | ||
| 168 | ) | 221 | ) |
| 169 | 222 | ||
| 170 | endif() | 223 | endif() |
| 171 | - | ||
| 172 | -target_link_libraries(${PROJECT_NAME} | ||
| 173 | - | ||
| 174 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/libmsc.so | ||
| 175 | - ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/opus/libopus.so | ||
| 176 | -) |
CMakeLists.txt.bak
0 → 100644
| 1 | +# cmake 最低版本要求 第三行名字不能动 | ||
| 2 | +cmake_minimum_required(VERSION 2.8) | ||
| 3 | +project(JZ_UART_APP) | ||
| 4 | + | ||
| 5 | +set(CMAKE_C_FLAGS "-pthread -std=gnu99 -lm -ldl -lstdc++") | ||
| 6 | +#"-pthread":指定在编译时链接POSIX线程库,以支持多线程程序。 | ||
| 7 | +#"-std=gnu99":指定C语言标准为GNU C99(也就是C99加上GNU的扩展特性),该标准对于一些特性和库的使用是必须的。 | ||
| 8 | +#"-lm":指定在编译时链接数学库,以使用一些数学函数。 | ||
| 9 | +#"-ldl":指定在编译时链接动态库加载库,以使用动态加载。 | ||
| 10 | +#"-lstdc++":指定在编译时链接C++标准库,以使用C++的一些特性和函数。 | ||
| 11 | + | ||
| 12 | +set(CMAKE_EXE_LINKER_FLAGS "-pthread") | ||
| 13 | + | ||
| 14 | +#预留行 | ||
| 15 | +#预留行 | ||
| 16 | +#预留行 | ||
| 17 | +#预留行 | ||
| 18 | +#预留行 | ||
| 19 | +#预留行 | ||
| 20 | +#预留行 | ||
| 21 | +#预留行 | ||
| 22 | + | ||
| 23 | +# 设置滤波方式 24行不能被改动,因为会被sh修改滤波方式 | ||
| 24 | +set(filtering_type high_pass_filtering) | ||
| 25 | + | ||
| 26 | +# 海外版本 27行不能改动 | ||
| 27 | +set(firewarm_origin DOMESTIC_VERSION) | ||
| 28 | + | ||
| 29 | +# 添加Cedar库 30行不能改动 | ||
| 30 | +set(CedarxLib VERSION_SWITCH_OFF) | ||
| 31 | + | ||
| 32 | +# 添加编译链选择 33行禁止改动 | ||
| 33 | +set(MAKE_COMPILER ARM_X86_64_ARRCH64) | ||
| 34 | + | ||
| 35 | +if(${MAKE_COMPILER} STREQUAL "ARM_CORTEXA9_LINUX") | ||
| 36 | + if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON") | ||
| 37 | + # 交叉编译链1 | ||
| 38 | + set(TOOLCHAIN_NAME arm-linux-gnueabihf-gcc) | ||
| 39 | + set(CMAKE_C_COMPILER "/opt/gcc-linaro-6.3.1-2017.05-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc") | ||
| 40 | + set(CMAKE_CXX_COMPILER "/opt/gcc-linaro-6.3.1-2017.05-x86_64_arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++") | ||
| 41 | + else() | ||
| 42 | + # 交叉编译链2 | ||
| 43 | + set(TOOLCHAIN_NAME arm-linux-gnueabihf-gcc) | ||
| 44 | + set(CMAKE_C_COMPILER "/usr/local/arm/4.9.3/bin/arm-cortexa9-linux-gnueabihf-gcc") | ||
| 45 | + set(CMAKE_CXX_COMPILER "/usr/local/arm/4.9.3/bin/arm-cortexa9-linux-gnueabihf-g++") | ||
| 46 | + endif() | ||
| 47 | +elseif(${MAKE_COMPILER} STREQUAL "ARM_X86_64_ARRCH64") | ||
| 48 | + # 交叉编译链3 | ||
| 49 | + set(TOOLCHAIN_NAME aarch64-linux-gnu-gcc) | ||
| 50 | + set(CMAKE_C_COMPILER "/opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-gcc") | ||
| 51 | + set(CMAKE_CXX_COMPILER "/opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-g++") | ||
| 52 | +elseif(${MAKE_COMPILER} STREQUAL "LOCAL") | ||
| 53 | + # 本地测试编译链 | ||
| 54 | + set(CMAKE_C_COMPILER "/usr/bin/gcc") | ||
| 55 | + set(CMAKE_CXX_COMPILER "/usr/bin/g++") | ||
| 56 | +else() | ||
| 57 | + message(FATAL_ERROR "不支持的编译链") | ||
| 58 | +endif() | ||
| 59 | + | ||
| 60 | +# 指定源文件 | ||
| 61 | +file(GLOB_RECURSE APPLICATION_SRC application/*.c) #main MODULE_APP_SRC | ||
| 62 | +file(GLOB_RECURSE JZSDK_SRC JZsdk/*.c) | ||
| 63 | +file(GLOB_RECURSE JZSDK_UART_DEAL_SRC JZsdk_Uart/*.c) | ||
| 64 | +file(GLOB_RECURSE GIMBAL_SRC Module/Gimbal/*.c) | ||
| 65 | +file(GLOB_RECURSE MEGAPHONE_SRC Module/Megaphone/*.c) | ||
| 66 | +file(GLOB_RECURSE LIGHTING_SRC Module/Lighting/*.c) | ||
| 67 | +file(GLOB_RECURSE CAMERA_SRC Module/Camera/*.c) | ||
| 68 | +file(GLOB_RECURSE POWERMANAGER_SRC Module/PowerManager/*.c) | ||
| 69 | +file(GLOB_RECURSE TESTAPP_SRC Module/TestAPP/*.c) | ||
| 70 | +file(GLOB_RECURSE SERIALMAT_SRC Module/SerialManagement/*.c) | ||
| 71 | + | ||
| 72 | +file(GLOB_RECURSE MODULE_IRCUT_SRC Module/Ircut/*.c) | ||
| 73 | +file(GLOB_RECURSE MODULE_UICONTROL_SRC Module/UI_control/*.c) | ||
| 74 | + | ||
| 75 | +file(GLOB_RECURSE MODULE_IMAGEPROCESSING_SRC Module/ImageProcessing/*.c) | ||
| 76 | +file(GLOB_RECURSE MODULE_IMAGEPROCESSING_cpp_SRC Module/ImageProcessing/*.cpp) | ||
| 77 | + | ||
| 78 | + | ||
| 79 | +# 生成可执行文件 | ||
| 80 | +add_executable( | ||
| 81 | + JZ_UART_APP | ||
| 82 | + ${APPLICATION_SRC} | ||
| 83 | + ${JZSDK_SRC} | ||
| 84 | + ${JZSDK_UART_DEAL_SRC} | ||
| 85 | + ${MEGAPHONE_SRC} | ||
| 86 | + ${MODULE_IRCUT_SRC} | ||
| 87 | + ${GIMBAL_SRC} | ||
| 88 | + ${MODULE_UICONTROL_SRC} | ||
| 89 | + ${LIGHTING_SRC} | ||
| 90 | + ${POWERMANAGER_SRC} | ||
| 91 | + ${CAMERA_SRC} | ||
| 92 | + ${TESTAPP_SRC} | ||
| 93 | + ${SERIALMAT_SRC} | ||
| 94 | + ${MODULE_IMAGEPROCESSING_SRC} | ||
| 95 | + ${MODULE_IMAGEPROCESSING_cpp_SRC} | ||
| 96 | +) | ||
| 97 | + | ||
| 98 | +# 头文件路径 | ||
| 99 | +include_directories(./application) | ||
| 100 | +include_directories(./JZsdk) | ||
| 101 | +include_directories(./JZsdk_Uart) | ||
| 102 | + | ||
| 103 | +include_directories(./Module/Megaphone) | ||
| 104 | +include_directories(./Module/Ircut) | ||
| 105 | +include_directories(./Module/Ircut/H3_ircut/wiringPi) | ||
| 106 | +include_directories(./Module/Gimbal) | ||
| 107 | +include_directories(./Module/Lighting) | ||
| 108 | +include_directories(./Module/UI_control) | ||
| 109 | +include_directories(./Module/Camera) | ||
| 110 | +include_directories(./Module/PowerManager) | ||
| 111 | +include_directories(./Module/TestAPP) | ||
| 112 | +include_directories(./Module/ImageProcessing) | ||
| 113 | +include_directories(./Module/SerialManagement) | ||
| 114 | + | ||
| 115 | +# 库文件路径 | ||
| 116 | + | ||
| 117 | + | ||
| 118 | +if(${filtering_type} STREQUAL "directed_stopband_filtering") | ||
| 119 | + | ||
| 120 | + message("\n滤波库:带阻滤波\n") | ||
| 121 | + add_definitions(-DFUNTION_MEGAPHONE) #加载喊话器模块 | ||
| 122 | + | ||
| 123 | + target_link_libraries( | ||
| 124 | + ${PROJECT_NAME} | ||
| 125 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/directed_stopband_filtering/libAudioPlayer.so | ||
| 126 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/libmsc.so | ||
| 127 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/opus/libopus.so | ||
| 128 | + ) | ||
| 129 | + | ||
| 130 | + if(${firewarm_origin} STREQUAL "OVERSEAS_VERSION") | ||
| 131 | + message("\n固件版本为海外版\n") | ||
| 132 | + target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/intl_tts/libportaudio.so.2) | ||
| 133 | + target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/intl_tts/libTTS_Player.so) | ||
| 134 | + | ||
| 135 | + else() | ||
| 136 | + message("\n固件版本为国内版\n") | ||
| 137 | + endif() | ||
| 138 | + | ||
| 139 | +elseif(${filtering_type} STREQUAL "high_pass_filtering") | ||
| 140 | + message("\n滤波库:高通滤波\n") | ||
| 141 | + add_definitions(-DFUNTION_MEGAPHONE) #加载喊话器模块 | ||
| 142 | + | ||
| 143 | + if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON") | ||
| 144 | + target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/high_pass_filtering_gcclinaro/libAudioPlayer.so) | ||
| 145 | + target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/high_pass_filtering_gcclinaro/libasound.so.2) | ||
| 146 | + else() | ||
| 147 | + target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/high_pass_filtering/libAudioPlayer.so) | ||
| 148 | + endif() | ||
| 149 | + | ||
| 150 | + target_link_libraries( | ||
| 151 | + ${PROJECT_NAME} | ||
| 152 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/libmsc.so | ||
| 153 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/opus/libopus.so) | ||
| 154 | + | ||
| 155 | + if(${firewarm_origin} STREQUAL "OVERSEAS_VERSION") | ||
| 156 | + message("\n固件版本为海外版\n") | ||
| 157 | + target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/intl_tts/libportaudio.so.2) | ||
| 158 | + target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/intl_tts/libTTS_Player.so) | ||
| 159 | + | ||
| 160 | + else() | ||
| 161 | + message("\n固件版本为国内版\n") | ||
| 162 | + endif() | ||
| 163 | + | ||
| 164 | +elseif(${filtering_type} STREQUAL "OFF") | ||
| 165 | + message("\n无音频库加载\n") | ||
| 166 | +else() | ||
| 167 | + message(FATAL_ERROR "Invalid filtering type") | ||
| 168 | +endif() | ||
| 169 | + | ||
| 170 | +if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON") | ||
| 171 | + message("\nCedarX已加载\n") | ||
| 172 | + target_link_libraries(${PROJECT_NAME} | ||
| 173 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/Camera/CedarX/libawh264.so | ||
| 174 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/Camera/CedarX/libMemAdapter.so | ||
| 175 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/Camera/CedarX/libVE.so | ||
| 176 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/Camera/CedarX/libvencoder.so | ||
| 177 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/Camera/CedarX/libvideoengine.so | ||
| 178 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/Camera/CedarX/libvdecoder.so | ||
| 179 | + ) | ||
| 180 | + | ||
| 181 | + message("\n OpenCV已加载\n") | ||
| 182 | + target_link_libraries(${PROJECT_NAME} | ||
| 183 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_calib3d.so #动态库 | ||
| 184 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_core.so #动态库 | ||
| 185 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_dnn.so #动态库 | ||
| 186 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_features2d.so #动态库 | ||
| 187 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_flann.so #动态库 | ||
| 188 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_highgui.so #动态库 | ||
| 189 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_imgcodecs.so #动态库 | ||
| 190 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_imgproc.so #动态库 | ||
| 191 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_ml.so #动态库 | ||
| 192 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_objdetect.so #动态库 | ||
| 193 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_photo.so #动态库 | ||
| 194 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_shape.so #动态库 | ||
| 195 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_stitching.so #动态库 | ||
| 196 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_superres.so #动态库 | ||
| 197 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_videoio.so #动态库 | ||
| 198 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_video.so #动态库 | ||
| 199 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/OpenCV/libopencv_videostab.so #动态库 | ||
| 200 | + ) | ||
| 201 | + | ||
| 202 | + message("\n ffmpeg已加载\n") | ||
| 203 | + target_link_libraries(${PROJECT_NAME} | ||
| 204 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/ffmpeg/libavcodec.so | ||
| 205 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/ffmpeg/libavdevice.so | ||
| 206 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/ffmpeg/libavfilter.so | ||
| 207 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/ffmpeg/libavformat.so | ||
| 208 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/ffmpeg/libavutil.so | ||
| 209 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/ffmpeg/libswresample.so | ||
| 210 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/ffmpeg/libswscale.so | ||
| 211 | + ) | ||
| 212 | + | ||
| 213 | + message("\n SearchLightCenter已加载\n") | ||
| 214 | + target_link_libraries(${PROJECT_NAME} | ||
| 215 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/SearchLightCenter/libcenter.so | ||
| 216 | + ) | ||
| 217 | + | ||
| 218 | +endif() | ||
| 219 | + | ||
| 220 | +target_link_libraries(${PROJECT_NAME} | ||
| 221 | + | ||
| 222 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/libmsc.so | ||
| 223 | + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/opus/libopus.so | ||
| 224 | +) |
| @@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
| 12 | #include "./TaskManagement.h" | 12 | #include "./TaskManagement.h" |
| 13 | #include <JZsdkLib.h> | 13 | #include <JZsdkLib.h> |
| 14 | 14 | ||
| 15 | -#define THREAD_POOL_SIZE 4 // 线程池大小 | 15 | +#define THREAD_POOL_SIZE 5 // 线程池大小 |
| 16 | 16 | ||
| 17 | typedef struct { | 17 | typedef struct { |
| 18 | void (*task_function)(void*); //任务函数指针,用于指定 执行的任务 | 18 | void (*task_function)(void*); //任务函数指针,用于指定 执行的任务 |
| @@ -27,7 +27,8 @@ static int SecondaryDeviceName = 0x00; // 从设备名,用于多设备相连 | @@ -27,7 +27,8 @@ static int SecondaryDeviceName = 0x00; // 从设备名,用于多设备相连 | ||
| 27 | T_JZsdkReturnCode JZsdk_Uart_ActivateStatusCheck(int flag) | 27 | T_JZsdkReturnCode JZsdk_Uart_ActivateStatusCheck(int flag) |
| 28 | { | 28 | { |
| 29 | //如果不是激活帧,也不是已激活状态,返回失败,并且发出错误帧 | 29 | //如果不是激活帧,也不是已激活状态,返回失败,并且发出错误帧 |
| 30 | - if( SerialMAT_Get_SerialNumberStatus() != 0x01) | 30 | + T_JZsdkReturnCode ret = SerialMAT_Get_SerialNumberStatus(); |
| 31 | + if(ret == 0x02 || ret == 0x03) | ||
| 31 | { | 32 | { |
| 32 | return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | 33 | return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; |
| 33 | } | 34 | } |
| @@ -35,7 +36,6 @@ T_JZsdkReturnCode JZsdk_Uart_ActivateStatusCheck(int flag) | @@ -35,7 +36,6 @@ T_JZsdkReturnCode JZsdk_Uart_ActivateStatusCheck(int flag) | ||
| 35 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | 36 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; |
| 36 | } | 37 | } |
| 37 | 38 | ||
| 38 | - | ||
| 39 | /********** | 39 | /********** |
| 40 | * | 40 | * |
| 41 | * 电源状态设置 | 41 | * 电源状态设置 |
| 1 | #include <stdio.h> | 1 | #include <stdio.h> |
| 2 | #include <string.h> | 2 | #include <string.h> |
| 3 | +#include <stdlib.h> | ||
| 4 | + | ||
| 3 | #include "JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h" | 5 | #include "JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h" |
| 4 | #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h" | 6 | #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h" |
| 5 | #include "JZsdkLib.h" | 7 | #include "JZsdkLib.h" |
| @@ -454,40 +456,78 @@ static int Uart_4G_RecvDeal_audio_NextSong(char *getbuf) | @@ -454,40 +456,78 @@ static int Uart_4G_RecvDeal_audio_NextSong(char *getbuf) | ||
| 454 | * | 456 | * |
| 455 | * | 457 | * |
| 456 | **********/ | 458 | **********/ |
| 457 | -static int Uart_4G_RecvDeal_audio_GetMusicList(char *getbuf) | 459 | +static T_JZsdkReturnCode Uart_4G_RecvDeal_audio_GetMusicList(char *getbuf) |
| 458 | { | 460 | { |
| 459 | JZSDK_LOG_INFO("获取音乐列表\n"); | 461 | JZSDK_LOG_INFO("获取音乐列表\n"); |
| 460 | //获取帧的序列号 | 462 | //获取帧的序列号 |
| 461 | int FrameSequence = JZsdk_Get_FrameSequence(getbuf); | 463 | int FrameSequence = JZsdk_Get_FrameSequence(getbuf); |
| 462 | 464 | ||
| 463 | - //回复操作成功 | ||
| 464 | - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence); | ||
| 465 | - | ||
| 466 | //0、刷新歌曲列表 | 465 | //0、刷新歌曲列表 |
| 467 | JZsdk_Uart_Flush_MusicList(); | 466 | JZsdk_Uart_Flush_MusicList(); |
| 468 | 467 | ||
| 469 | //1、获取歌曲总数 | 468 | //1、获取歌曲总数 |
| 470 | int music_sum = JZsdk_Uart_get_music_list_sum(); | 469 | int music_sum = JZsdk_Uart_get_music_list_sum(); |
| 471 | 470 | ||
| 472 | - //2、获取歌曲名字 与 长度 | ||
| 473 | - char MusicName[128][128]; | ||
| 474 | - int MusicNameLength[128]; | ||
| 475 | - for (int i = 0; i < music_sum; i++) | 471 | + //2、注册一个歌曲数组 |
| 472 | + char **MusicName = (char **)malloc(music_sum * sizeof(char*)); | ||
| 473 | + if (MusicName == NULL) | ||
| 476 | { | 474 | { |
| 477 | - JZsdk_Uart_get_music_list_name(i, MusicName[i], &MusicNameLength[i]); | 475 | + //回复操作失败 |
| 476 | + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence); | ||
| 477 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 478 | } | 478 | } |
| 479 | 479 | ||
| 480 | - //3、发送开始帧 | ||
| 481 | - JZsdk_Uart_SendDeal_Reply_Musiclist_start(UART_4G, music_sum); | ||
| 482 | - | ||
| 483 | - //4、逐一调用发送函数将歌曲名发出 | ||
| 484 | - for (int i = 0; i < music_sum; i++) | 480 | + //3、注册一个歌曲名字长度的数组 |
| 481 | + int *MusicNameLength = (int *)malloc(music_sum * sizeof(int)); | ||
| 482 | + if (MusicNameLength == NULL) | ||
| 485 | { | 483 | { |
| 486 | - JZsdk_Uart_SendDeal_Reply_Musiclist(UART_4G, MusicName[i], MusicNameLength[i]); | 484 | + free(MusicName); |
| 485 | + //回复操作失败 | ||
| 486 | + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence); | ||
| 487 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 487 | } | 488 | } |
| 489 | + | ||
| 490 | + //4、为每一首歌曲分配内存 | ||
| 491 | + for (int i = 0; i < music_sum; i++) | ||
| 492 | + { | ||
| 493 | + MusicName[i] = (char*)malloc(128); | ||
| 494 | + if (MusicName[i] == NULL) | ||
| 495 | + { | ||
| 496 | + // 内存分配失败,需要释放之前分配的内存 | ||
| 497 | + for (int j = 0; j < i; j++) | ||
| 498 | + { | ||
| 499 | + free(MusicName[j]); | ||
| 500 | + } | ||
| 501 | + free(MusicNameLength); | ||
| 502 | + free(MusicName); | ||
| 503 | + | ||
| 504 | + //回复操作失败 | ||
| 505 | + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence); | ||
| 506 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 507 | + } | ||
| 488 | 508 | ||
| 489 | - //5、发送结束帧 | ||
| 490 | - JZsdk_Uart_SendDeal_Reply_Musiclist_end(UART_4G); | 509 | + //如果成功分配内存,则写入名字 |
| 510 | + JZsdk_Uart_get_music_list_name(i, MusicName[i], &MusicNameLength[i]); | ||
| 511 | + } | ||
| 512 | + | ||
| 513 | + //开始发送歌曲列表 | ||
| 514 | + T_JZsdkReturnCode ret = JZsdk_Uart_SentDeal_Reply_Musiclist(UART_4G, FrameSequence, music_sum, MusicName, MusicNameLength); | ||
| 515 | + if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) | ||
| 516 | + { | ||
| 517 | + for (int i = 0; i < music_sum; i++) | ||
| 518 | + { | ||
| 519 | + free(MusicName[i]); | ||
| 520 | + } | ||
| 521 | + free(MusicNameLength); | ||
| 522 | + free(MusicName); | ||
| 523 | + | ||
| 524 | + //回复操作失败 | ||
| 525 | + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence); | ||
| 526 | + | ||
| 527 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 528 | + } | ||
| 529 | + | ||
| 530 | + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | ||
| 491 | } | 531 | } |
| 492 | 532 | ||
| 493 | /********* | 533 | /********* |
| 1 | #include <stdio.h> | 1 | #include <stdio.h> |
| 2 | #include <string.h> | 2 | #include <string.h> |
| 3 | +#include <stdlib.h> | ||
| 4 | + | ||
| 3 | #include "JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h" | 5 | #include "JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h" |
| 4 | #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h" | 6 | #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h" |
| 5 | #include "JZsdkLib.h" | 7 | #include "JZsdkLib.h" |
| @@ -457,40 +459,78 @@ static int Uart_DEV1_RecvDeal_audio_NextSong(char *getbuf) | @@ -457,40 +459,78 @@ static int Uart_DEV1_RecvDeal_audio_NextSong(char *getbuf) | ||
| 457 | * | 459 | * |
| 458 | * | 460 | * |
| 459 | **********/ | 461 | **********/ |
| 460 | -static int Uart_DEV1_RecvDeal_audio_GetMusicList(char *getbuf) | 462 | +static T_JZsdkReturnCode Uart_DEV1_RecvDeal_audio_GetMusicList(char *getbuf) |
| 461 | { | 463 | { |
| 462 | JZSDK_LOG_INFO("获取音乐列表\n"); | 464 | JZSDK_LOG_INFO("获取音乐列表\n"); |
| 463 | //获取帧的序列号 | 465 | //获取帧的序列号 |
| 464 | int FrameSequence = JZsdk_Get_FrameSequence(getbuf); | 466 | int FrameSequence = JZsdk_Get_FrameSequence(getbuf); |
| 465 | 467 | ||
| 466 | - //回复操作成功 | ||
| 467 | - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); | ||
| 468 | - | ||
| 469 | //0、刷新歌曲列表 | 468 | //0、刷新歌曲列表 |
| 470 | JZsdk_Uart_Flush_MusicList(); | 469 | JZsdk_Uart_Flush_MusicList(); |
| 471 | 470 | ||
| 472 | //1、获取歌曲总数 | 471 | //1、获取歌曲总数 |
| 473 | int music_sum = JZsdk_Uart_get_music_list_sum(); | 472 | int music_sum = JZsdk_Uart_get_music_list_sum(); |
| 474 | 473 | ||
| 475 | - //2、获取歌曲名字 与 长度 | ||
| 476 | - char MusicName[128][128]; | ||
| 477 | - int MusicNameLength[128]; | ||
| 478 | - for (int i = 0; i < music_sum; i++) | 474 | + //2、注册一个歌曲数组 |
| 475 | + char **MusicName = (char **)malloc(music_sum * sizeof(char*)); | ||
| 476 | + if (MusicName == NULL) | ||
| 479 | { | 477 | { |
| 480 | - JZsdk_Uart_get_music_list_name(i, MusicName[i], &MusicNameLength[i]); | 478 | + //回复操作失败 |
| 479 | + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); | ||
| 480 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 481 | } | 481 | } |
| 482 | 482 | ||
| 483 | - //3、发送开始帧 | ||
| 484 | - JZsdk_Uart_SendDeal_Reply_Musiclist_start(UART_DEV_1, music_sum); | ||
| 485 | - | ||
| 486 | - //4、逐一调用发送函数将歌曲名发出 | ||
| 487 | - for (int i = 0; i < music_sum; i++) | 483 | + //3、注册一个歌曲名字长度的数组 |
| 484 | + int *MusicNameLength = (int *)malloc(music_sum * sizeof(int)); | ||
| 485 | + if (MusicNameLength == NULL) | ||
| 488 | { | 486 | { |
| 489 | - JZsdk_Uart_SendDeal_Reply_Musiclist(UART_DEV_1, MusicName[i], MusicNameLength[i]); | 487 | + free(MusicName); |
| 488 | + //回复操作失败 | ||
| 489 | + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); | ||
| 490 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 490 | } | 491 | } |
| 492 | + | ||
| 493 | + //4、为每一首歌曲分配内存 | ||
| 494 | + for (int i = 0; i < music_sum; i++) | ||
| 495 | + { | ||
| 496 | + MusicName[i] = (char*)malloc(128); | ||
| 497 | + if (MusicName[i] == NULL) | ||
| 498 | + { | ||
| 499 | + // 内存分配失败,需要释放之前分配的内存 | ||
| 500 | + for (int j = 0; j < i; j++) | ||
| 501 | + { | ||
| 502 | + free(MusicName[j]); | ||
| 503 | + } | ||
| 504 | + free(MusicNameLength); | ||
| 505 | + free(MusicName); | ||
| 506 | + | ||
| 507 | + //回复操作失败 | ||
| 508 | + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); | ||
| 509 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 510 | + } | ||
| 491 | 511 | ||
| 492 | - //5、发送结束帧 | ||
| 493 | - JZsdk_Uart_SendDeal_Reply_Musiclist_end(UART_DEV_1); | 512 | + //如果成功分配内存,则写入名字 |
| 513 | + JZsdk_Uart_get_music_list_name(i, MusicName[i], &MusicNameLength[i]); | ||
| 514 | + } | ||
| 515 | + | ||
| 516 | + //开始发送歌曲列表 | ||
| 517 | + T_JZsdkReturnCode ret = JZsdk_Uart_SentDeal_Reply_Musiclist(UART_DEV_1, FrameSequence, music_sum, MusicName, MusicNameLength); | ||
| 518 | + if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) | ||
| 519 | + { | ||
| 520 | + for (int i = 0; i < music_sum; i++) | ||
| 521 | + { | ||
| 522 | + free(MusicName[i]); | ||
| 523 | + } | ||
| 524 | + free(MusicNameLength); | ||
| 525 | + free(MusicName); | ||
| 526 | + | ||
| 527 | + //回复操作失败 | ||
| 528 | + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); | ||
| 529 | + | ||
| 530 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 531 | + } | ||
| 532 | + | ||
| 533 | + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | ||
| 494 | } | 534 | } |
| 495 | 535 | ||
| 496 | /********* | 536 | /********* |
| 1 | #include <stdio.h> | 1 | #include <stdio.h> |
| 2 | #include <string.h> | 2 | #include <string.h> |
| 3 | +#include <stdlib.h> | ||
| 4 | + | ||
| 3 | #include "JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h" | 5 | #include "JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h" |
| 4 | #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h" | 6 | #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h" |
| 5 | #include "JZsdkLib.h" | 7 | #include "JZsdkLib.h" |
| @@ -454,40 +456,78 @@ static int Uart_DEV2_RecvDeal_audio_NextSong(char *getbuf) | @@ -454,40 +456,78 @@ static int Uart_DEV2_RecvDeal_audio_NextSong(char *getbuf) | ||
| 454 | * | 456 | * |
| 455 | * | 457 | * |
| 456 | **********/ | 458 | **********/ |
| 457 | -static int Uart_DEV2_RecvDeal_audio_GetMusicList(char *getbuf) | 459 | +static T_JZsdkReturnCode Uart_DEV2_RecvDeal_audio_GetMusicList(char *getbuf) |
| 458 | { | 460 | { |
| 459 | JZSDK_LOG_INFO("获取音乐列表\n"); | 461 | JZSDK_LOG_INFO("获取音乐列表\n"); |
| 460 | //获取帧的序列号 | 462 | //获取帧的序列号 |
| 461 | int FrameSequence = JZsdk_Get_FrameSequence(getbuf); | 463 | int FrameSequence = JZsdk_Get_FrameSequence(getbuf); |
| 462 | 464 | ||
| 463 | - //回复操作成功 | ||
| 464 | - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence); | ||
| 465 | - | ||
| 466 | //0、刷新歌曲列表 | 465 | //0、刷新歌曲列表 |
| 467 | JZsdk_Uart_Flush_MusicList(); | 466 | JZsdk_Uart_Flush_MusicList(); |
| 468 | 467 | ||
| 469 | //1、获取歌曲总数 | 468 | //1、获取歌曲总数 |
| 470 | int music_sum = JZsdk_Uart_get_music_list_sum(); | 469 | int music_sum = JZsdk_Uart_get_music_list_sum(); |
| 471 | 470 | ||
| 472 | - //2、获取歌曲名字 与 长度 | ||
| 473 | - char MusicName[128][128]; | ||
| 474 | - int MusicNameLength[128]; | ||
| 475 | - for (int i = 0; i < music_sum; i++) | 471 | + //2、注册一个歌曲数组 |
| 472 | + char **MusicName = (char **)malloc(music_sum * sizeof(char*)); | ||
| 473 | + if (MusicName == NULL) | ||
| 476 | { | 474 | { |
| 477 | - JZsdk_Uart_get_music_list_name(i, MusicName[i], &MusicNameLength[i]); | 475 | + //回复操作失败 |
| 476 | + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence); | ||
| 477 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 478 | } | 478 | } |
| 479 | 479 | ||
| 480 | - //3、发送开始帧 | ||
| 481 | - JZsdk_Uart_SendDeal_Reply_Musiclist_start(UART_DEV_2, music_sum); | ||
| 482 | - | ||
| 483 | - //4、逐一调用发送函数将歌曲名发出 | ||
| 484 | - for (int i = 0; i < music_sum; i++) | 480 | + //3、注册一个歌曲名字长度的数组 |
| 481 | + int *MusicNameLength = (int *)malloc(music_sum * sizeof(int)); | ||
| 482 | + if (MusicNameLength == NULL) | ||
| 485 | { | 483 | { |
| 486 | - JZsdk_Uart_SendDeal_Reply_Musiclist(UART_DEV_2, MusicName[i], MusicNameLength[i]); | 484 | + free(MusicName); |
| 485 | + //回复操作失败 | ||
| 486 | + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence); | ||
| 487 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 487 | } | 488 | } |
| 489 | + | ||
| 490 | + //4、为每一首歌曲分配内存 | ||
| 491 | + for (int i = 0; i < music_sum; i++) | ||
| 492 | + { | ||
| 493 | + MusicName[i] = (char*)malloc(128); | ||
| 494 | + if (MusicName[i] == NULL) | ||
| 495 | + { | ||
| 496 | + // 内存分配失败,需要释放之前分配的内存 | ||
| 497 | + for (int j = 0; j < i; j++) | ||
| 498 | + { | ||
| 499 | + free(MusicName[j]); | ||
| 500 | + } | ||
| 501 | + free(MusicNameLength); | ||
| 502 | + free(MusicName); | ||
| 503 | + | ||
| 504 | + //回复操作失败 | ||
| 505 | + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence); | ||
| 506 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 507 | + } | ||
| 488 | 508 | ||
| 489 | - //5、发送结束帧 | ||
| 490 | - JZsdk_Uart_SendDeal_Reply_Musiclist_end(UART_DEV_2); | 509 | + //如果成功分配内存,则写入名字 |
| 510 | + JZsdk_Uart_get_music_list_name(i, MusicName[i], &MusicNameLength[i]); | ||
| 511 | + } | ||
| 512 | + | ||
| 513 | + //开始发送歌曲列表 | ||
| 514 | + T_JZsdkReturnCode ret = JZsdk_Uart_SentDeal_Reply_Musiclist(UART_DEV_2, FrameSequence, music_sum, MusicName, MusicNameLength); | ||
| 515 | + if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) | ||
| 516 | + { | ||
| 517 | + for (int i = 0; i < music_sum; i++) | ||
| 518 | + { | ||
| 519 | + free(MusicName[i]); | ||
| 520 | + } | ||
| 521 | + free(MusicNameLength); | ||
| 522 | + free(MusicName); | ||
| 523 | + | ||
| 524 | + //回复操作失败 | ||
| 525 | + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence); | ||
| 526 | + | ||
| 527 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 528 | + } | ||
| 529 | + | ||
| 530 | + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | ||
| 491 | } | 531 | } |
| 492 | 532 | ||
| 493 | /********* | 533 | /********* |
| 1 | #include <stdio.h> | 1 | #include <stdio.h> |
| 2 | #include <string.h> | 2 | #include <string.h> |
| 3 | +#include <stdlib.h> | ||
| 3 | 4 | ||
| 4 | #include "JZsdk_Uart_UartDeal.h" | 5 | #include "JZsdk_Uart_UartDeal.h" |
| 5 | #include "Uart_Config.h" | 6 | #include "Uart_Config.h" |
| 6 | - | 7 | +#include "./JZsdk_Uart_Send.h" |
| 8 | +#include "JZsdk_TaskManagement/TaskManagement.h" | ||
| 7 | #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h" | 9 | #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h" |
| 8 | -#include "Jzsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h" | 10 | +#include "JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h" |
| 9 | 11 | ||
| 10 | 12 | ||
| 11 | //发送主动连接帧 | 13 | //发送主动连接帧 |
| @@ -133,63 +135,114 @@ int JZsdk_Uart_SendDeal_SerialNumber(int UartPort, int FrameSequence, char *Seri | @@ -133,63 +135,114 @@ int JZsdk_Uart_SendDeal_SerialNumber(int UartPort, int FrameSequence, char *Seri | ||
| 133 | JZsdk_Uart_UartSend(UartPort ,sendbuf, send_buf_len); | 135 | JZsdk_Uart_UartSend(UartPort ,sendbuf, send_buf_len); |
| 134 | } | 136 | } |
| 135 | 137 | ||
| 136 | - | ||
| 137 | -//发送歌曲名字 | ||
| 138 | -int JZsdk_Uart_SendDeal_Reply_Musiclist(int Uartport ,char *music_name, int music_name_length) | 138 | +struct JZsdk_MusicListSentStruct |
| 139 | { | 139 | { |
| 140 | - unsigned char sendbuf[256]; | ||
| 141 | - int send_buf_len; | ||
| 142 | - | ||
| 143 | - //1、获取帧样板 | ||
| 144 | - JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_MUSICLIST_TRANS , sendbuf, &send_buf_len); | ||
| 145 | - | ||
| 146 | - //2、写入数据 | ||
| 147 | - memcpy(&sendbuf[9],music_name,music_name_length); | ||
| 148 | - sendbuf[9+music_name_length]=0x00; | ||
| 149 | - sendbuf[10+music_name_length]=0x23; | ||
| 150 | - | ||
| 151 | - int len = send_buf_len -1 + music_name_length ; | ||
| 152 | - | ||
| 153 | - sendbuf[3] = len >> 8; | ||
| 154 | - sendbuf[4] = len & 0xff; | ||
| 155 | - | ||
| 156 | - //3、发送帧 | ||
| 157 | - JZsdk_Uart_UartSend(Uartport ,sendbuf, len); | ||
| 158 | -} | ||
| 159 | - | ||
| 160 | -//发送歌曲列表开始帧 | ||
| 161 | -int JZsdk_Uart_SendDeal_Reply_Musiclist_start(int Uartport ,int num) | 140 | + int UartPort; |
| 141 | + int FrameSequence; | ||
| 142 | + int music_sum; | ||
| 143 | + char **MusicName; | ||
| 144 | + int *MusicNameLength; | ||
| 145 | +}; | ||
| 146 | + | ||
| 147 | +/********** | ||
| 148 | + * | ||
| 149 | + * 歌曲列表发送任务函数 | ||
| 150 | + * | ||
| 151 | + * ***********/ | ||
| 152 | +static void JZsdk_Uart_SentDeal_Reply_Musiclist_Task(void *data) | ||
| 162 | { | 153 | { |
| 163 | - printf("发送列表开始帧\n"); | 154 | + struct JZsdk_MusicListSentStruct *taskData = (struct JZsdk_MusicListSentStruct *)data; |
| 164 | unsigned char sendbuf[256]; | 155 | unsigned char sendbuf[256]; |
| 165 | int send_buf_len; | 156 | int send_buf_len; |
| 166 | 157 | ||
| 167 | - //1、获取帧样板 | 158 | + //1、发送操作成功 |
| 159 | + //获取帧样板 | ||
| 160 | + memset(sendbuf,0,sizeof(sendbuf)); | ||
| 161 | + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_SUCESS , sendbuf, &send_buf_len); | ||
| 162 | + //写入数据 | ||
| 163 | + sendbuf[6] = taskData->FrameSequence; //帧序列 | ||
| 164 | + //发送帧 | ||
| 165 | + printf("发送操作成功帧\n"); | ||
| 166 | + JZsdk_Uart_UartSend_NotTask(taskData->UartPort ,sendbuf, send_buf_len); | ||
| 167 | + | ||
| 168 | + //2、发送开始帧 | ||
| 169 | + //获取帧样板 | ||
| 170 | + memset(sendbuf,0,sizeof(sendbuf)); | ||
| 168 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_MUSICLIST_START , sendbuf, &send_buf_len); | 171 | JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_MUSICLIST_START , sendbuf, &send_buf_len); |
| 172 | + //写入数据 | ||
| 173 | + sendbuf[6] = taskData->FrameSequence; //帧序列 | ||
| 174 | + sendbuf[9] = taskData->music_sum; | ||
| 175 | + //发送帧 | ||
| 176 | + printf("发送歌曲开始列表帧\n"); | ||
| 177 | + JZsdk_Uart_UartSend_NotTask(taskData->UartPort ,sendbuf, send_buf_len); | ||
| 178 | + | ||
| 179 | + //3、逐一调用发送函数将歌曲名发出 | ||
| 180 | + for (int i = 0; i < (taskData->music_sum) ; i++) | ||
| 181 | + { | ||
| 182 | + memset(sendbuf,0,sizeof(sendbuf)); | ||
| 183 | + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_MUSICLIST_TRANS , sendbuf, &send_buf_len); | ||
| 184 | + | ||
| 185 | + memcpy(&sendbuf[9],taskData->MusicName[i],taskData->MusicNameLength[i]); | ||
| 186 | + sendbuf[9+taskData->MusicNameLength[i]]=0x00; | ||
| 187 | + sendbuf[10+taskData->MusicNameLength[i]]=0x23; | ||
| 188 | + | ||
| 189 | + send_buf_len = send_buf_len -1 + taskData->MusicNameLength[i] ; | ||
| 190 | + | ||
| 191 | + sendbuf[3] = (send_buf_len >> 8); | ||
| 192 | + sendbuf[4] = (send_buf_len & 0xff); | ||
| 193 | + sendbuf[6] = taskData->FrameSequence; //帧序列 | ||
| 194 | + JZsdk_Uart_UartSend_NotTask(taskData->UartPort ,sendbuf, send_buf_len); | ||
| 195 | + } | ||
| 169 | 196 | ||
| 170 | - //2、写入数据 | ||
| 171 | - sendbuf[9] = num; | 197 | + //4、发送结束帧 |
| 198 | + //获取帧样板 | ||
| 199 | + memset(sendbuf,0,sizeof(sendbuf)); | ||
| 200 | + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_MUSICLIST_STOP , sendbuf, &send_buf_len); | ||
| 201 | + //写入数据 | ||
| 202 | + sendbuf[6] = taskData->FrameSequence; //帧序列 | ||
| 203 | + sendbuf[9] = taskData->music_sum; | ||
| 204 | + //发送帧 | ||
| 205 | + printf("发送歌曲结束列表"); | ||
| 206 | + JZsdk_Uart_UartSend_NotTask(taskData->UartPort ,sendbuf, send_buf_len); | ||
| 207 | + | ||
| 208 | + //5、释放内存 | ||
| 209 | + for (int i = 0; i < taskData->music_sum; i++) | ||
| 210 | + { | ||
| 211 | + free(taskData->MusicName[i]); | ||
| 212 | + taskData->MusicName[i] = NULL; | ||
| 213 | + } | ||
| 172 | 214 | ||
| 173 | - //3、发送帧 | ||
| 174 | - JZsdk_Uart_UartSend(Uartport ,sendbuf, send_buf_len); | 215 | + free(taskData->MusicName); |
| 216 | + taskData->MusicName = NULL; | ||
| 175 | 217 | ||
| 218 | + free(taskData->MusicNameLength); | ||
| 219 | + free(taskData); | ||
| 220 | + taskData = NULL; | ||
| 176 | } | 221 | } |
| 177 | 222 | ||
| 178 | -//发送歌曲列表结束帧 | ||
| 179 | -int JZsdk_Uart_SendDeal_Reply_Musiclist_end(int Uartport) | 223 | +T_JZsdkReturnCode JZsdk_Uart_SentDeal_Reply_Musiclist(int UartPort ,int FrameSequence, int music_sum ,char **MusicName ,int *MusicNameLength) |
| 180 | { | 224 | { |
| 181 | - printf("发送歌曲列表结束帧\n"); | ||
| 182 | - printf("发送歌曲列表结束帧\n"); | ||
| 183 | - unsigned char sendbuf[256]; | ||
| 184 | - int send_buf_len; | ||
| 185 | - | ||
| 186 | - //1、获取帧样板 | ||
| 187 | - JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_MUSICLIST_STOP , sendbuf, &send_buf_len); | 225 | + struct JZsdk_MusicListSentStruct *musicList = (struct JZsdk_MusicListSentStruct *)malloc(sizeof(struct JZsdk_MusicListSentStruct)); |
| 226 | + if (musicList == NULL) | ||
| 227 | + { | ||
| 228 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 229 | + } | ||
| 188 | 230 | ||
| 189 | - //2、写入数据 | ||
| 190 | - | ||
| 191 | - //3、发送帧 | ||
| 192 | - JZsdk_Uart_UartSend(Uartport ,sendbuf, send_buf_len); | 231 | + musicList->UartPort = UartPort; |
| 232 | + musicList->FrameSequence = FrameSequence; | ||
| 233 | + musicList->music_sum = music_sum; | ||
| 234 | + musicList->MusicName = MusicName; | ||
| 235 | + musicList->MusicNameLength = MusicNameLength; | ||
| 236 | + | ||
| 237 | + T_JZsdkReturnCode ret = TaskManagement_SubmitTask(JZsdk_Uart_SentDeal_Reply_Musiclist_Task, (void *)musicList); | ||
| 238 | + if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE) | ||
| 239 | + { | ||
| 240 | + free(musicList); | ||
| 241 | + musicList = NULL; | ||
| 242 | + return ret; | ||
| 243 | + } | ||
| 244 | + | ||
| 245 | + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | ||
| 193 | } | 246 | } |
| 194 | 247 | ||
| 195 | //发送播放状态结束帧 | 248 | //发送播放状态结束帧 |
| @@ -11,6 +11,7 @@ | @@ -11,6 +11,7 @@ | ||
| 11 | #define JZSDK_IART_SENDDEAL_H | 11 | #define JZSDK_IART_SENDDEAL_H |
| 12 | 12 | ||
| 13 | /* Includes ------------------------------------------------------------------*/ | 13 | /* Includes ------------------------------------------------------------------*/ |
| 14 | +#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h" | ||
| 14 | 15 | ||
| 15 | #ifdef __cplusplus | 16 | #ifdef __cplusplus |
| 16 | extern "C" { | 17 | extern "C" { |
| @@ -31,9 +32,7 @@ int JZsdk_Uart_SendDeal_QuerySecondaryDeviceName(int Uartport ,int FrameSequence | @@ -31,9 +32,7 @@ int JZsdk_Uart_SendDeal_QuerySecondaryDeviceName(int Uartport ,int FrameSequence | ||
| 31 | 32 | ||
| 32 | int JZsdk_Uart_SendDeal_Reply_Sucesss(int Uartport ,int FrameSequence); | 33 | int JZsdk_Uart_SendDeal_Reply_Sucesss(int Uartport ,int FrameSequence); |
| 33 | int JZsdk_Uart_SendDeal_Reply_Failure(int Uartport ,int FrameSequence); | 34 | int JZsdk_Uart_SendDeal_Reply_Failure(int Uartport ,int FrameSequence); |
| 34 | -int JZsdk_Uart_SendDeal_Reply_Musiclist(int Uartport ,char *music_name, int music_name_length); | ||
| 35 | -int JZsdk_Uart_SendDeal_Reply_Musiclist_start(int Uartport ,int num); | ||
| 36 | -int JZsdk_Uart_SendDeal_Reply_Musiclist_end(int Uartport); | 35 | +T_JZsdkReturnCode JZsdk_Uart_SentDeal_Reply_Musiclist(int UartPort ,int FrameSequence, int music_sum ,char **MusicName ,int *MusicNameLength); |
| 37 | int JZsdk_Uart_SendDeal_Send_PlayStatus_end(int Uartport); | 36 | int JZsdk_Uart_SendDeal_Send_PlayStatus_end(int Uartport); |
| 38 | int JZsdk_Uart_SendDeal_Send_PlayStatus(int Uartport ,int num); | 37 | int JZsdk_Uart_SendDeal_Send_PlayStatus(int Uartport ,int num); |
| 39 | int JZsdk_Uart_SendDeal_Reply_MusicName(int Uartport ,char *music_name, int music_name_len); | 38 | int JZsdk_Uart_SendDeal_Reply_MusicName(int Uartport ,char *music_name, int music_name_len); |
| @@ -601,6 +601,31 @@ static int UartDeal_Recv_interface(int Uart_fd, unsigned char *getbuf, int getbu | @@ -601,6 +601,31 @@ static int UartDeal_Recv_interface(int Uart_fd, unsigned char *getbuf, int getbu | ||
| 601 | return 0; | 601 | return 0; |
| 602 | } | 602 | } |
| 603 | 603 | ||
| 604 | +/********** | ||
| 605 | + * | ||
| 606 | + * 无任务发送函数 | ||
| 607 | + * | ||
| 608 | + * ***********/ | ||
| 609 | +T_JZsdkReturnCode JZsdk_Uart_UartSend_NotTask(int Uart_Name, unsigned char *str, int str_lenth) | ||
| 610 | +{ | ||
| 611 | + if (Uart_Name == UART_4G) | ||
| 612 | + { | ||
| 613 | + printf("向4G设备发送\n"); | ||
| 614 | + write(Uart_4G_fd, str, str_lenth); | ||
| 615 | + } | ||
| 616 | + else if (Uart_Name == UART_DEV_1) | ||
| 617 | + { | ||
| 618 | + printf("向串口1号设备发送\n"); | ||
| 619 | + write(Uart_DEV1_fd, str, str_lenth); | ||
| 620 | + } | ||
| 621 | + else if (Uart_Name = UART_DEV_2) | ||
| 622 | + { | ||
| 623 | + printf("向串口2号设备发送\n"); | ||
| 624 | + write(Uart_DEV2_fd, str, str_lenth); | ||
| 625 | + } | ||
| 626 | + | ||
| 627 | + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | ||
| 628 | +} | ||
| 604 | 629 | ||
| 605 | typedef struct { | 630 | typedef struct { |
| 606 | char* str; | 631 | char* str; |
| @@ -633,6 +658,9 @@ static void JZsdk_Uart_UartSend_Task(void *data) | @@ -633,6 +658,9 @@ static void JZsdk_Uart_UartSend_Task(void *data) | ||
| 633 | write(Uart_DEV2_fd, taskData->str, taskData->str_lenth); | 658 | write(Uart_DEV2_fd, taskData->str, taskData->str_lenth); |
| 634 | } | 659 | } |
| 635 | 660 | ||
| 661 | + free(taskData->str); | ||
| 662 | + taskData->str = NULL; | ||
| 663 | + | ||
| 636 | free(taskData); | 664 | free(taskData); |
| 637 | taskData = NULL; | 665 | taskData = NULL; |
| 638 | } | 666 | } |
| @@ -656,6 +684,7 @@ T_JZsdkReturnCode JZsdk_Uart_UartSend(int UartPort, unsigned char *send, int num | @@ -656,6 +684,7 @@ T_JZsdkReturnCode JZsdk_Uart_UartSend(int UartPort, unsigned char *send, int num | ||
| 656 | if (senddata->str == NULL) { | 684 | if (senddata->str == NULL) { |
| 657 | // 处理内存分配失败的情况 | 685 | // 处理内存分配失败的情况 |
| 658 | free(senddata); // 释放之前分配的内存 | 686 | free(senddata); // 释放之前分配的内存 |
| 687 | + senddata = NULL; | ||
| 659 | return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | 688 | return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; |
| 660 | } | 689 | } |
| 661 | 690 | ||
| @@ -667,7 +696,9 @@ T_JZsdkReturnCode JZsdk_Uart_UartSend(int UartPort, unsigned char *send, int num | @@ -667,7 +696,9 @@ T_JZsdkReturnCode JZsdk_Uart_UartSend(int UartPort, unsigned char *send, int num | ||
| 667 | if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE) | 696 | if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE) |
| 668 | { | 697 | { |
| 669 | free(senddata->str); | 698 | free(senddata->str); |
| 699 | + senddata->str = NULL; | ||
| 670 | free(senddata); | 700 | free(senddata); |
| 701 | + senddata = NULL; | ||
| 671 | return ret; | 702 | return ret; |
| 672 | } | 703 | } |
| 673 | 704 |
| @@ -27,6 +27,7 @@ T_JZsdkReturnCode JZsdk_Uart_UartSend(int UartPort ,unsigned char *send, int num | @@ -27,6 +27,7 @@ T_JZsdkReturnCode JZsdk_Uart_UartSend(int UartPort ,unsigned char *send, int num | ||
| 27 | int JZsdk_Uart_UartDeal_Receive(int Uart_fd, int Uart_Dev_name); | 27 | int JZsdk_Uart_UartDeal_Receive(int Uart_fd, int Uart_Dev_name); |
| 28 | int JZsdk_Uart_CloseUartFd(int UartPort); | 28 | int JZsdk_Uart_CloseUartFd(int UartPort); |
| 29 | int JZsdk_Uart_CloseUartThead(int UartPort, int BitRate); | 29 | int JZsdk_Uart_CloseUartThead(int UartPort, int BitRate); |
| 30 | +T_JZsdkReturnCode JZsdk_Uart_UartSend_NotTask(int Uart_Name, unsigned char *str, int str_lenth); | ||
| 30 | 31 | ||
| 31 | 32 | ||
| 32 | #ifdef __cplusplus | 33 | #ifdef __cplusplus |
JZsdk_hal/JZsdk_network/JZsdk_network.c
0 → 100644
| 1 | +#include <stdio.h> | ||
| 2 | +#include <string.h> | ||
| 3 | +#include <stdlib.h> | ||
| 4 | +#include <termios.h> | ||
| 5 | +#include <sys/socket.h> | ||
| 6 | +#include <netinet/in.h> | ||
| 7 | +#include <arpa/inet.h> | ||
| 8 | + | ||
| 9 | +#include "BaseConfig.h" | ||
| 10 | +#include "version_choose.h" | ||
| 11 | + | ||
| 12 | +#include "JZsdkLib.h" | ||
| 13 | +#include "./JZsdk_network.h" | ||
| 14 | + | ||
| 15 | +#define LINUX_CMD_STR_MAX_SIZE (128) | ||
| 16 | +#define LINUX_NETWORK_DEV "eth0" | ||
| 17 | +#define UDP_SERVER_PORT (23003) | ||
| 18 | + | ||
| 19 | +static int udp_socket = 0; | ||
| 20 | +static struct sockaddr_in udp_server_addr; | ||
| 21 | +static int NetworkMode = JZ_FLAGCODE_OFF; //网络模式 | ||
| 22 | + | ||
| 23 | +T_JZsdkReturnCode JZsdk_NetWork_Init() | ||
| 24 | +{ | ||
| 25 | + T_JZsdkReturnCode ret; | ||
| 26 | + char cmdStr[LINUX_CMD_STR_MAX_SIZE]; | ||
| 27 | + | ||
| 28 | + if (NET_WORK_IPADDR == NULL || NET_WORK_NETMASK == NULL) | ||
| 29 | + { | ||
| 30 | + JZSDK_LOG_ERROR("无网络参数配置"); | ||
| 31 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 32 | + } | ||
| 33 | + | ||
| 34 | + //1、打开网卡设备 | ||
| 35 | + memset(cmdStr, 0, sizeof(cmdStr)); | ||
| 36 | + snprintf(cmdStr, sizeof(cmdStr), "ifconfig %s up", LINUX_NETWORK_DEV); | ||
| 37 | + ret = system(cmdStr); | ||
| 38 | + if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) { | ||
| 39 | + JZSDK_LOG_ERROR("Can't open the network." | ||
| 40 | + "Probably the program not execute with root permission." | ||
| 41 | + "Please use the root permission to execute the program."); | ||
| 42 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 43 | + } | ||
| 44 | + | ||
| 45 | + //2、打开网络 | ||
| 46 | + memset(cmdStr, 0, sizeof(cmdStr)); | ||
| 47 | + snprintf(cmdStr, sizeof(cmdStr), "ifconfig %s %s netmask %s", LINUX_NETWORK_DEV, NET_WORK_IPADDR, NET_WORK_NETMASK); | ||
| 48 | + ret = system(cmdStr); | ||
| 49 | + if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) { | ||
| 50 | + JZSDK_LOG_ERROR("Can't config the ip address of network." | ||
| 51 | + "Probably the program not execute with root permission." | ||
| 52 | + "Please use the root permission to execute the program."); | ||
| 53 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 54 | + } | ||
| 55 | + | ||
| 56 | + //3、创建UDP socket 套接字 | ||
| 57 | + udp_socket = socket(AF_INET, SOCK_DGRAM, 0); | ||
| 58 | + if (udp_socket == -1) { | ||
| 59 | + JZSDK_LOG_ERROR("网口套接字注册失败"); | ||
| 60 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 61 | + } | ||
| 62 | + | ||
| 63 | + //4、配置udp服务器地址 | ||
| 64 | + memset(&udp_server_addr, 0, sizeof(udp_server_addr)); | ||
| 65 | + udp_server_addr.sin_family = AF_INET; | ||
| 66 | + udp_server_addr.sin_port = htons(UDP_SERVER_PORT); | ||
| 67 | + if(inet_aton(NET_WORK_TARGET_IPADDR, &udp_server_addr.sin_addr) == 0) | ||
| 68 | + { | ||
| 69 | + JZSDK_LOG_ERROR("udp服务器配置失败"); | ||
| 70 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 71 | + } | ||
| 72 | + | ||
| 73 | + NetworkMode = JZ_FLAGCODE_ON; | ||
| 74 | + | ||
| 75 | + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | ||
| 76 | +} | ||
| 77 | + | ||
| 78 | +T_JZsdkReturnCode JZsdk_NetWork_DeInit() | ||
| 79 | +{ | ||
| 80 | + NetworkMode = JZ_FLAGCODE_OFF; | ||
| 81 | + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | ||
| 82 | +} | ||
| 83 | + | ||
| 84 | +T_JZsdkReturnCode JZsdk_NetWork_SentData(const unsigned char *data, const int data_len) | ||
| 85 | +{ | ||
| 86 | + if (NetworkMode != JZ_FLAGCODE_ON) | ||
| 87 | + { | ||
| 88 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 89 | + } | ||
| 90 | + | ||
| 91 | + int bytes_sent = sendto(udp_socket, data, data_len, 0, | ||
| 92 | + (struct sockaddr *) &udp_server_addr, sizeof(udp_server_addr)); | ||
| 93 | + | ||
| 94 | + if (bytes_sent == -1) | ||
| 95 | + { | ||
| 96 | + JZSDK_LOG_ERROR("网口发送失败"); | ||
| 97 | + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | ||
| 98 | + } | ||
| 99 | + | ||
| 100 | + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | ||
| 101 | +} |
JZsdk_hal/JZsdk_network/JZsdk_network.h
0 → 100644
| 1 | +/** | ||
| 2 | + ******************************************************************** | ||
| 3 | + * @file JZsdk_Uart_UartDeal.h | ||
| 4 | + * JZsdk_Uart_UartDeal的头文件 | ||
| 5 | + * | ||
| 6 | + ********************************************************************* | ||
| 7 | + */ | ||
| 8 | + | ||
| 9 | +/* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/ | ||
| 10 | +#ifndef JZSDK_NETWORK_H | ||
| 11 | +#define JZSDK_NETWORK_H | ||
| 12 | + | ||
| 13 | +/* Includes ------------------------------------------------------------------*/ | ||
| 14 | + | ||
| 15 | +#ifdef __cplusplus | ||
| 16 | +extern "C" { | ||
| 17 | +#endif | ||
| 18 | + | ||
| 19 | +/* Exported constants --------------------------------------------------------*/ | ||
| 20 | +/* 常亮定义*/ | ||
| 21 | +#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h" | ||
| 22 | + | ||
| 23 | +/* Exported types ------------------------------------------------------------*/ | ||
| 24 | + | ||
| 25 | +/* Exported functions --------------------------------------------------------*/ | ||
| 26 | +T_JZsdkReturnCode JZsdk_NetWork_Init(); | ||
| 27 | +T_JZsdkReturnCode JZsdk_NetWork_DeInit(); | ||
| 28 | +T_JZsdkReturnCode JZsdk_NetWork_SentData(const unsigned char *data, const int data_len); | ||
| 29 | + | ||
| 30 | +#ifdef __cplusplus | ||
| 31 | +} | ||
| 32 | +#endif | ||
| 33 | + | ||
| 34 | +#endif |
| @@ -8,6 +8,7 @@ | @@ -8,6 +8,7 @@ | ||
| 8 | #include "../V4L2/V4L2_Record.h" | 8 | #include "../V4L2/V4L2_Record.h" |
| 9 | #include "JZsdkLib.h" | 9 | #include "JZsdkLib.h" |
| 10 | #include "./CameraFeatures.h" | 10 | #include "./CameraFeatures.h" |
| 11 | +#include "JZsdk_network/JZsdk_network.h" | ||
| 11 | 12 | ||
| 12 | #include "version_choose.h" | 13 | #include "version_choose.h" |
| 13 | 14 | ||
| @@ -47,6 +48,9 @@ static void CameraFeatures_PsdkPushFrame(char* h264_data, uint32_t data_len, int | @@ -47,6 +48,9 @@ static void CameraFeatures_PsdkPushFrame(char* h264_data, uint32_t data_len, int | ||
| 47 | #if APP_VERSION == APP_PSDK | 48 | #if APP_VERSION == APP_PSDK |
| 48 | //大疆模式,往大疆入口推流 | 49 | //大疆模式,往大疆入口推流 |
| 49 | DJI_VideoDeal_Push_DJIH264Frame(h264_data, FrameBufSize); | 50 | DJI_VideoDeal_Push_DJIH264Frame(h264_data, FrameBufSize); |
| 51 | + | ||
| 52 | +#elif APP_VERSION == APP_UART | ||
| 53 | + JZsdk_NetWork_SentData(h264_data, FrameBufSize); | ||
| 50 | #endif | 54 | #endif |
| 51 | 55 | ||
| 52 | } | 56 | } |
| @@ -26,13 +26,30 @@ typedef enum { | @@ -26,13 +26,30 @@ typedef enum { | ||
| 26 | VIDEO_TPYE_DJIH264 = 0x0001 | 26 | VIDEO_TPYE_DJIH264 = 0x0001 |
| 27 | } JZ_Video_Type_Code; | 27 | } JZ_Video_Type_Code; |
| 28 | 28 | ||
| 29 | - | ||
| 30 | -#if DEVICE_VERSION == JZ_H150S || DEVICE_VERSION == JZ_H150T | 29 | +#if (DEVICE_VERSION == JZ_H150S || DEVICE_VERSION == JZ_H150T) |
| 31 | #define CAMERA_DEVICE_NAME "/dev/video0" | 30 | #define CAMERA_DEVICE_NAME "/dev/video0" |
| 32 | 31 | ||
| 33 | #define CAMERA_RECORD_FRAME (25) //每秒帧数 25帧 | 32 | #define CAMERA_RECORD_FRAME (25) //每秒帧数 25帧 |
| 34 | #define CAMERA_RECORD_HEIGHT (1080)//摄像头录制 帧画面高度720 1080 | 33 | #define CAMERA_RECORD_HEIGHT (1080)//摄像头录制 帧画面高度720 1080 |
| 35 | #define CAMERA_RECORD_WIDTH (1980)//摄像头录制 帧画面宽度1280 1980 | 34 | #define CAMERA_RECORD_WIDTH (1980)//摄像头录制 帧画面宽度1280 1980 |
| 35 | + #define BRIGHTNESS (80) //亮度,该摄像头亮度范围为 1-255 默认128 | ||
| 36 | + #define CONTRAST (155) //对比度,摄像头对比度范围为 1-255 默认128 | ||
| 37 | + #define SATURATION (128) //饱和度 摄像头饱和度范围为 1-255 默认128 | ||
| 38 | + #define EXPSURE (100) //曝光值 摄像头曝光值范围: 5-2500 默认auto设置 | ||
| 39 | + | ||
| 40 | +#if APP_VERSION == APP_PSDK | ||
| 41 | + #define PUSHFRAME_VIDEO_TPYE VIDEO_TPYE_DJIH264 //推送帧的视频格式 | ||
| 42 | + | ||
| 43 | +#else | ||
| 44 | + #define PUSHFRAME_VIDEO_TPYE VIDEO_TPYE_H264 | ||
| 45 | +#endif | ||
| 46 | + | ||
| 47 | +#elif (DEVICE_VERSION == JZ_IRC) | ||
| 48 | + #define CAMERA_DEVICE_NAME "/dev/video21" | ||
| 49 | + | ||
| 50 | + #define CAMERA_RECORD_FRAME (25) //每秒帧数 25帧 | ||
| 51 | + #define CAMERA_RECORD_HEIGHT (1080)//摄像头录制 帧画面高度720 1080 | ||
| 52 | + #define CAMERA_RECORD_WIDTH (1980)//摄像头录制 帧画面宽度1280 1980 | ||
| 36 | 53 | ||
| 37 | 54 | ||
| 38 | #define BRIGHTNESS (80) //亮度,该摄像头亮度范围为 1-255 默认128 | 55 | #define BRIGHTNESS (80) //亮度,该摄像头亮度范围为 1-255 默认128 |
| @@ -55,9 +72,11 @@ typedef enum { | @@ -55,9 +72,11 @@ typedef enum { | ||
| 55 | #define EXPSURE (0) | 72 | #define EXPSURE (0) |
| 56 | 73 | ||
| 57 | #define PUSHFRAME_VIDEO_TPYE VIDEO_TPYE_H264 //推送帧的视频格式 | 74 | #define PUSHFRAME_VIDEO_TPYE VIDEO_TPYE_H264 //推送帧的视频格式 |
| 58 | - | 75 | + |
| 59 | #endif | 76 | #endif |
| 60 | 77 | ||
| 78 | + | ||
| 79 | + | ||
| 61 | /* Exported types ------------------------------------------------------------*/ | 80 | /* Exported types ------------------------------------------------------------*/ |
| 62 | 81 | ||
| 63 | /* Exported functions --------------------------------------------------------*/ | 82 | /* Exported functions --------------------------------------------------------*/ |
| @@ -60,7 +60,7 @@ static T_JZsdkReturnCode Camera_CheckForThePresenceOfCameras() | @@ -60,7 +60,7 @@ static T_JZsdkReturnCode Camera_CheckForThePresenceOfCameras() | ||
| 60 | 60 | ||
| 61 | if(access(CAMERA_DEVICE_NAME, F_OK ) == 0) | 61 | if(access(CAMERA_DEVICE_NAME, F_OK ) == 0) |
| 62 | { | 62 | { |
| 63 | - JZSDK_LOG_ERROR("摄像头存在"); | 63 | + JZSDK_LOG_INFO("摄像头存在"); |
| 64 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | 64 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; |
| 65 | } | 65 | } |
| 66 | else | 66 | else |
| @@ -135,6 +135,21 @@ static T_JZsdkReturnCode JZsdk_CameraInit() | @@ -135,6 +135,21 @@ static T_JZsdkReturnCode JZsdk_CameraInit() | ||
| 135 | JZSDK_LOG_ERROR("摄像头参数调整失败"); | 135 | JZSDK_LOG_ERROR("摄像头参数调整失败"); |
| 136 | return ret; | 136 | return ret; |
| 137 | } | 137 | } |
| 138 | +#elif DEVICE_VERSION == JZ_IRC | ||
| 139 | + ret = V4l2_Camarainit(&dev_fd); | ||
| 140 | + if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) | ||
| 141 | + { | ||
| 142 | + JZSDK_LOG_ERROR("摄像头录制初始化失败"); | ||
| 143 | + return ret; | ||
| 144 | + } | ||
| 145 | + | ||
| 146 | + //2、摄像头参数调整 | ||
| 147 | + ret = V4L2_Parameter_Setting(dev_fd); | ||
| 148 | + if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) | ||
| 149 | + { | ||
| 150 | + JZSDK_LOG_ERROR("摄像头参数调整失败"); | ||
| 151 | + return ret; | ||
| 152 | + } | ||
| 138 | #else | 153 | #else |
| 139 | return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; | 154 | return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; |
| 140 | #endif | 155 | #endif |
| @@ -152,14 +167,14 @@ T_JZsdkReturnCode JZsdk_Camera_FrameDealThread_UnlockFun() | @@ -152,14 +167,14 @@ T_JZsdkReturnCode JZsdk_Camera_FrameDealThread_UnlockFun() | ||
| 152 | 167 | ||
| 153 | /*********** | 168 | /*********** |
| 154 | * | 169 | * |
| 155 | - * 推流计时线程 | 170 | + * 非psdk推流计时线程 |
| 156 | * | 171 | * |
| 157 | * ************/ | 172 | * ************/ |
| 158 | static void *JZsdk_Camera_PushFrame_TimerThread(void *args) | 173 | static void *JZsdk_Camera_PushFrame_TimerThread(void *args) |
| 159 | { | 174 | { |
| 160 | while (1) | 175 | while (1) |
| 161 | { | 176 | { |
| 162 | - delayMs(1000); | 177 | + delayMs(1000/CAMERA_RECORD_FRAME); |
| 163 | 178 | ||
| 164 | //解锁一次帧处理函数。以用于处理一帧视频流画面 | 179 | //解锁一次帧处理函数。以用于处理一帧视频流画面 |
| 165 | CameraFeatures_FrameDealThread_UnlockFun(); | 180 | CameraFeatures_FrameDealThread_UnlockFun(); |
| @@ -225,9 +240,8 @@ T_JZsdkReturnCode JZsdk_CameraMuduleInit() | @@ -225,9 +240,8 @@ T_JZsdkReturnCode JZsdk_CameraMuduleInit() | ||
| 225 | //5、如果是串口模式,则进行推流,推流计时线程初始化 | 240 | //5、如果是串口模式,则进行推流,推流计时线程初始化 |
| 226 | if (APP_VERSION == APP_UART) | 241 | if (APP_VERSION == APP_UART) |
| 227 | { | 242 | { |
| 228 | - JZsdk_Camera_PushFrame_TimerThread_Init(); | 243 | + //JZsdk_Camera_PushFrame_TimerThread_Init(); |
| 229 | } | 244 | } |
| 230 | - | ||
| 231 | 245 | ||
| 232 | //6、转码功能线程初始化 | 246 | //6、转码功能线程初始化 |
| 233 | Video_TransCode_Moudele_Init(); | 247 | Video_TransCode_Moudele_Init(); |
| @@ -27,8 +27,7 @@ T_JZsdkReturnCode V4L2_Parameter_Setting(int cam_fd) | @@ -27,8 +27,7 @@ T_JZsdkReturnCode V4L2_Parameter_Setting(int cam_fd) | ||
| 27 | ctrl.value = BRIGHTNESS; | 27 | ctrl.value = BRIGHTNESS; |
| 28 | if(ioctl(cam_fd,VIDIOC_S_CTRL,&ctrl)==-1) | 28 | if(ioctl(cam_fd,VIDIOC_S_CTRL,&ctrl)==-1) |
| 29 | { | 29 | { |
| 30 | - perror("ioctl"); | ||
| 31 | - exit(EXIT_FAILURE); | 30 | + JZSDK_LOG_INFO("相机亮度设置失败"); |
| 32 | } | 31 | } |
| 33 | 32 | ||
| 34 | //设置对比度 | 33 | //设置对比度 |
| @@ -36,8 +35,7 @@ T_JZsdkReturnCode V4L2_Parameter_Setting(int cam_fd) | @@ -36,8 +35,7 @@ T_JZsdkReturnCode V4L2_Parameter_Setting(int cam_fd) | ||
| 36 | ctrl.value= CONTRAST; | 35 | ctrl.value= CONTRAST; |
| 37 | if(ioctl(cam_fd,VIDIOC_S_CTRL,&ctrl)==-1) | 36 | if(ioctl(cam_fd,VIDIOC_S_CTRL,&ctrl)==-1) |
| 38 | { | 37 | { |
| 39 | - perror("ioctl"); | ||
| 40 | - exit(EXIT_FAILURE); | 38 | + JZSDK_LOG_INFO("相机对比度设置失败"); |
| 41 | } | 39 | } |
| 42 | 40 | ||
| 43 | //设置饱和度 | 41 | //设置饱和度 |
| @@ -45,8 +43,7 @@ T_JZsdkReturnCode V4L2_Parameter_Setting(int cam_fd) | @@ -45,8 +43,7 @@ T_JZsdkReturnCode V4L2_Parameter_Setting(int cam_fd) | ||
| 45 | ctrl.value= SATURATION; | 43 | ctrl.value= SATURATION; |
| 46 | if(ioctl(cam_fd,VIDIOC_S_CTRL,&ctrl)==-1) | 44 | if(ioctl(cam_fd,VIDIOC_S_CTRL,&ctrl)==-1) |
| 47 | { | 45 | { |
| 48 | - perror("ioctl"); | ||
| 49 | - exit(EXIT_FAILURE); | 46 | + perror("相机饱和度设置失败"); |
| 50 | } | 47 | } |
| 51 | /* | 48 | /* |
| 52 | //设置色度 | 49 | //设置色度 |
| @@ -106,5 +103,7 @@ T_JZsdkReturnCode V4L2_Parameter_Setting(int cam_fd) | @@ -106,5 +103,7 @@ T_JZsdkReturnCode V4L2_Parameter_Setting(int cam_fd) | ||
| 106 | exit(EXIT_FAILURE); | 103 | exit(EXIT_FAILURE); |
| 107 | } | 104 | } |
| 108 | */ | 105 | */ |
| 106 | + | ||
| 107 | + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | ||
| 109 | } | 108 | } |
| 110 | 109 |
| @@ -54,11 +54,14 @@ static struct v4l2_buffer buf; | @@ -54,11 +54,14 @@ static struct v4l2_buffer buf; | ||
| 54 | /* Private functions declaration ---------------------------------------------*/ | 54 | /* Private functions declaration ---------------------------------------------*/ |
| 55 | static int xioctl(int fh, int request, void *arg) | 55 | static int xioctl(int fh, int request, void *arg) |
| 56 | { | 56 | { |
| 57 | + int num; | ||
| 57 | int r; | 58 | int r; |
| 58 | do | 59 | do |
| 59 | { | 60 | { |
| 60 | r = ioctl(fh, request, arg); | 61 | r = ioctl(fh, request, arg); |
| 61 | - } while (-1 == r ); | 62 | + num++; |
| 63 | + //delayMs(10); | ||
| 64 | + } while ( (-1 == r)); | ||
| 62 | return r; | 65 | return r; |
| 63 | } | 66 | } |
| 64 | 67 |
| 1 | /* Includes ------------------------------------------------------------------*/ | 1 | /* Includes ------------------------------------------------------------------*/ |
| 2 | #include <stdio.h> | 2 | #include <stdio.h> |
| 3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
| 4 | +#include <string.h> | ||
| 4 | 5 | ||
| 5 | #include <pthread.h> | 6 | #include <pthread.h> |
| 6 | 7 | ||
| @@ -9,6 +10,7 @@ | @@ -9,6 +10,7 @@ | ||
| 9 | #include "BaseConfig.h" | 10 | #include "BaseConfig.h" |
| 10 | 11 | ||
| 11 | #include "UartConnection/UartConnection.h" | 12 | #include "UartConnection/UartConnection.h" |
| 13 | +#include "JZsdk_TaskManagement/TaskManagement.h" | ||
| 12 | 14 | ||
| 13 | 15 | ||
| 14 | /* Private constants ---------------------------------------------------------*/ | 16 | /* Private constants ---------------------------------------------------------*/ |
| @@ -41,6 +43,38 @@ T_JZsdkReturnCode Gimbal_H3_H150ST_init_motor() | @@ -41,6 +43,38 @@ T_JZsdkReturnCode Gimbal_H3_H150ST_init_motor() | ||
| 41 | H3_H150ST_motor_precise_adjustment_pitch = H3_H150ST_Read_MotorAdjustmentPitch(); | 43 | H3_H150ST_motor_precise_adjustment_pitch = H3_H150ST_Read_MotorAdjustmentPitch(); |
| 42 | } | 44 | } |
| 43 | 45 | ||
| 46 | +/********** | ||
| 47 | + * | ||
| 48 | + * 发送任务函数 | ||
| 49 | + * | ||
| 50 | + * ***********/ | ||
| 51 | +static void JZsdk_Uart_UartSend_Task(void *data) | ||
| 52 | +{ | ||
| 53 | + Gimbal_H3_H150ST_UartDeal_UartSend(data, 4); | ||
| 54 | +} | ||
| 55 | + | ||
| 56 | +/**************** | ||
| 57 | + * | ||
| 58 | + * | ||
| 59 | + * 发送函数 | ||
| 60 | + * | ||
| 61 | + * ****************/ | ||
| 62 | +T_JZsdkReturnCode H150ST_UartSend(unsigned char *data, int num) | ||
| 63 | +{ | ||
| 64 | + unsigned char *str = (unsigned char*)malloc(sizeof(data)); | ||
| 65 | + memcpy(str, data, sizeof(data)); | ||
| 66 | + | ||
| 67 | + T_JZsdkReturnCode ret = TaskManagement_SubmitTask(JZsdk_Uart_UartSend_Task, (void *)str); | ||
| 68 | + if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) | ||
| 69 | + { | ||
| 70 | + free(str); | ||
| 71 | + return ret; | ||
| 72 | + } | ||
| 73 | + | ||
| 74 | + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | ||
| 75 | +} | ||
| 76 | + | ||
| 77 | + | ||
| 44 | //设置角度 | 78 | //设置角度 |
| 45 | int H3_H150ST_Gimbal_SetAngle(int angle) | 79 | int H3_H150ST_Gimbal_SetAngle(int angle) |
| 46 | { | 80 | { |
| @@ -61,7 +95,8 @@ int H3_H150ST_Gimbal_SetAngle(int angle) | @@ -61,7 +95,8 @@ int H3_H150ST_Gimbal_SetAngle(int angle) | ||
| 61 | char send_angle[]={0x5a,0x00,0x00,0xa5}; | 95 | char send_angle[]={0x5a,0x00,0x00,0xa5}; |
| 62 | send_angle[1]=(char )(angle_PWM); | 96 | send_angle[1]=(char )(angle_PWM); |
| 63 | send_angle[2]=(char )(angle_PWM>>8); | 97 | send_angle[2]=(char )(angle_PWM>>8); |
| 64 | - Gimbal_H3_H150ST_UartDeal_UartSend(send_angle, 4); | 98 | + |
| 99 | + H150ST_UartSend(send_angle, 4); | ||
| 65 | } | 100 | } |
| 66 | 101 | ||
| 67 | 102 |
| 1 | -#include <stdio.h> | ||
| 2 | -#include <string.h> | ||
| 3 | -#include <pthread.h> | ||
| 4 | -#include <stdlib.h> | ||
| 5 | - | ||
| 6 | -#include <fcntl.h> | ||
| 7 | -#include <unistd.h> | ||
| 8 | -#include <termios.h> | ||
| 9 | -#include <sys/time.h> | ||
| 10 | - | ||
| 11 | -static void *UartDeal_rece(void *arg); | ||
| 12 | -static void *UartDeal_send(void *arg); | ||
| 13 | -static int Gimbal_Uart_fd = 0; | ||
| 14 | - | ||
| 15 | -/****************************************************************** | ||
| 16 | - | ||
| 17 | - 创建一个接收Gimbal的接收线程 | ||
| 18 | - | ||
| 19 | -******************************************************************/ | ||
| 20 | -int Gimbal_H3_H150ST_UartDeal_Receive(int Uart_fd) | ||
| 21 | -{ | ||
| 22 | - int ret = 0; | ||
| 23 | - pthread_t Uart_rece_task; | ||
| 24 | - Gimbal_Uart_fd = Uart_fd; | ||
| 25 | - | ||
| 26 | - pthread_attr_t task_attribute; //线程属性 | ||
| 27 | - pthread_attr_init(&task_attribute); //初始化线程属性 | ||
| 28 | - pthread_attr_setdetachstate(&task_attribute, PTHREAD_CREATE_DETACHED); //设置线程属性 | ||
| 29 | - | ||
| 30 | - ret = pthread_create(&Uart_rece_task,&task_attribute,UartDeal_rece,NULL); //串口接收线程 | ||
| 31 | - if(ret != 0) | ||
| 32 | - { | ||
| 33 | - printf("创建展架串口接收线程失败!\n"); | ||
| 34 | - } | ||
| 35 | - else{ | ||
| 36 | - printf("创建展架串口接收线程成功!\n"); | ||
| 37 | - } | ||
| 38 | -} | ||
| 39 | - | ||
| 40 | -static void *UartDeal_rece(void *arg) | ||
| 41 | -{ | ||
| 42 | - char getbuf[1024]; | ||
| 43 | - | ||
| 44 | - int ret = 0; | ||
| 45 | - fd_set fs_read; | ||
| 46 | - struct timeval tv_timeout; | ||
| 47 | - | ||
| 48 | - //FD_ZERO 将指定的文件描述符集清空,在对文件描述符集合进行设置前,必须对其进行初始化 | ||
| 49 | - //如果不清空,由于在系统分配内存空间后,通常并不作清空处理,所以结果是不可知的。 | ||
| 50 | - FD_ZERO(&fs_read); | ||
| 51 | - | ||
| 52 | - //FD_SET 用于在文件描述符集合中增加一个新的文件描述符。 | ||
| 53 | - FD_SET(Gimbal_Uart_fd, &fs_read); | ||
| 54 | - | ||
| 55 | - //115200 / char 8 位 = 14400 个char数据 | ||
| 56 | - // tv_timeout.tv_sec = 6000;//(10*20/115200+2); | ||
| 57 | - // tv_timeout.tv_usec = 0; | ||
| 58 | - | ||
| 59 | - //2、正常接收 | ||
| 60 | - while(1) | ||
| 61 | - { | ||
| 62 | - //检查fs_read套节字是否有数据 | ||
| 63 | - select(Gimbal_Uart_fd+1, &fs_read, NULL, NULL, NULL); | ||
| 64 | - usleep(10000); | ||
| 65 | - | ||
| 66 | - //FD_ISSET 用于测试指定的文件描述符是否在该集合中。 | ||
| 67 | - //Gimbal_Uart_fd 是否在fsread中 | ||
| 68 | - if (FD_ISSET(Gimbal_Uart_fd, &fs_read)) | ||
| 69 | - { | ||
| 70 | - //1、读取串口内容 ret 接收长度 getbuf 获取的字符 | ||
| 71 | - memset(getbuf,0,sizeof(getbuf)); //清空接收数组 | ||
| 72 | - ret = read(Gimbal_Uart_fd,getbuf,sizeof(getbuf)); | ||
| 73 | - } | ||
| 74 | - } | ||
| 75 | - | ||
| 76 | -} | ||
| 77 | - | ||
| 78 | - | ||
| 79 | -/**************** | ||
| 80 | - * | ||
| 81 | - * | ||
| 82 | - * 发送函数 | ||
| 83 | - * | ||
| 84 | - * ****************/ | ||
| 85 | -int Gimbal_H3_H150ST_UartDeal_UartSend(unsigned char *send, int num) | ||
| 86 | -{ | ||
| 87 | - | ||
| 88 | - write(Gimbal_Uart_fd,send, num); | ||
| 89 | - return 0; | ||
| 90 | -} |
| @@ -83,6 +83,10 @@ int Gimbal_Init() | @@ -83,6 +83,10 @@ int Gimbal_Init() | ||
| 83 | { | 83 | { |
| 84 | Gimbal_V3S_TFA1_init_motor(); | 84 | Gimbal_V3S_TFA1_init_motor(); |
| 85 | } | 85 | } |
| 86 | + else if (DEVICE_VERSION == JZ_IRC) | ||
| 87 | + { | ||
| 88 | + JZSDK_LOG_INFO("irc云台初始化"); | ||
| 89 | + } | ||
| 86 | else | 90 | else |
| 87 | { | 91 | { |
| 88 | return -1; | 92 | return -1; |
| @@ -101,7 +105,7 @@ int Gimbal_Init() | @@ -101,7 +105,7 @@ int Gimbal_Init() | ||
| 101 | //设置云台俯仰角度 | 105 | //设置云台俯仰角度 |
| 102 | T_JZsdkReturnCode Gimbal_Set_PitchAngle(int angle) | 106 | T_JZsdkReturnCode Gimbal_Set_PitchAngle(int angle) |
| 103 | { | 107 | { |
| 104 | - printf("设置云台俯仰角度\n"); | 108 | + //printf("设置云台俯仰角度\n"); |
| 105 | if (DEVICE_VERSION == JZ_H150S || DEVICE_VERSION == JZ_H150T) | 109 | if (DEVICE_VERSION == JZ_H150S || DEVICE_VERSION == JZ_H150T) |
| 106 | { | 110 | { |
| 107 | //1、判断输入范围是否正确 | 111 | //1、判断输入范围是否正确 |
| @@ -565,7 +569,6 @@ T_JZsdkReturnCode Gimbal_PitchRotationMode(int value) | @@ -565,7 +569,6 @@ T_JZsdkReturnCode Gimbal_PitchRotationMode(int value) | ||
| 565 | int angle; | 569 | int angle; |
| 566 | 570 | ||
| 567 | //JZSDK_LOG_DEBUG("拨轮控制"); | 571 | //JZSDK_LOG_DEBUG("拨轮控制"); |
| 568 | - printf("拨轮控制\n"); | ||
| 569 | 572 | ||
| 570 | if (DEVICE_VERSION == TF_A1 || DEVICE_VERSION == JZ_H150S || DEVICE_VERSION == JZ_H150T ) | 573 | if (DEVICE_VERSION == TF_A1 || DEVICE_VERSION == JZ_H150S || DEVICE_VERSION == JZ_H150T ) |
| 571 | { | 574 | { |
| @@ -801,6 +804,11 @@ static T_JZsdkReturnCode Gimbal_Set_RealPitchAngle(int angle) | @@ -801,6 +804,11 @@ static T_JZsdkReturnCode Gimbal_Set_RealPitchAngle(int angle) | ||
| 801 | 804 | ||
| 802 | Gimbal_V3S_H1T_set_PitchAngle(temp_angle); | 805 | Gimbal_V3S_H1T_set_PitchAngle(temp_angle); |
| 803 | } | 806 | } |
| 807 | + else if (DEVICE_VERSION == JZ_IRC) | ||
| 808 | + { | ||
| 809 | + JZSDK_LOG_INFO("irc相机云台变化"); | ||
| 810 | + } | ||
| 811 | + | ||
| 804 | 812 | ||
| 805 | } | 813 | } |
| 806 | 814 |
| @@ -40,8 +40,8 @@ | @@ -40,8 +40,8 @@ | ||
| 40 | #elif DEVICE_VERSION == JZ_H1T | 40 | #elif DEVICE_VERSION == JZ_H1T |
| 41 | // #define MAX_VOLUME 75 | 41 | // #define MAX_VOLUME 75 |
| 42 | // #define MAX_TTS_VOLUME 84 | 42 | // #define MAX_TTS_VOLUME 84 |
| 43 | - #define MAX_VOLUME 77 | ||
| 44 | - #define MAX_TTS_VOLUME 87 | 43 | + #define MAX_VOLUME 82 |
| 44 | + #define MAX_TTS_VOLUME 92 | ||
| 45 | #elif DEVICE_VERSION == JZ_H10 | 45 | #elif DEVICE_VERSION == JZ_H10 |
| 46 | #define MAX_VOLUME (65) | 46 | #define MAX_VOLUME (65) |
| 47 | #define MAX_TTS_VOLUME (70) //115 | 47 | #define MAX_TTS_VOLUME (70) //115 |
| @@ -87,7 +87,6 @@ int set_volume_flag=0;//默认是0 | @@ -87,7 +87,6 @@ int set_volume_flag=0;//默认是0 | ||
| 87 | 87 | ||
| 88 | static int g_ReturnFrame_PlayStatusFlag = 0; //returnframe的播放状态标志位 | 88 | static int g_ReturnFrame_PlayStatusFlag = 0; //returnframe的播放状态标志位 |
| 89 | 89 | ||
| 90 | -struct EQValues eq_values; | ||
| 91 | 90 | ||
| 92 | static void *SET_volume(void *arg); | 91 | static void *SET_volume(void *arg); |
| 93 | 92 | ||
| @@ -139,10 +138,11 @@ int Music_Save_VolumeToFile() | @@ -139,10 +138,11 @@ int Music_Save_VolumeToFile() | ||
| 139 | 138 | ||
| 140 | void music_init(void)//初始化音乐 | 139 | void music_init(void)//初始化音乐 |
| 141 | { | 140 | { |
| 142 | - printf("音乐初始化\n"); | ||
| 143 | - | 141 | +#if MEGAPHONE_MODE == VERSION_SWITCH_ON |
| 142 | + printf("音乐初始化\n"); | ||
| 144 | #if FILTERING_TYPE == HIGH_PASS_FILTERING | 143 | #if FILTERING_TYPE == HIGH_PASS_FILTERING |
| 145 | - //滤波器初始化 | 144 | + //滤波器初始化 |
| 145 | + struct EQValues eq_values; | ||
| 146 | eq_values.GAIN_31Hz=-48; | 146 | eq_values.GAIN_31Hz=-48; |
| 147 | eq_values.GAIN_62Hz=-48; | 147 | eq_values.GAIN_62Hz=-48; |
| 148 | eq_values.GAIN_125Hz=-48; | 148 | eq_values.GAIN_125Hz=-48; |
| @@ -154,7 +154,9 @@ void music_init(void)//初始化音乐 | @@ -154,7 +154,9 @@ void music_init(void)//初始化音乐 | ||
| 154 | eq_values.GAIN_8KHz=0; | 154 | eq_values.GAIN_8KHz=0; |
| 155 | eq_values.GAIN_16KHz=0; | 155 | eq_values.GAIN_16KHz=0; |
| 156 | printf("滤波初始化,当前类型为高通滤波\n"); | 156 | printf("滤波初始化,当前类型为高通滤波\n"); |
| 157 | + | ||
| 157 | #elif FILTERING_TYPE == DIRECTED_STOPBAND_FILTERING | 158 | #elif FILTERING_TYPE == DIRECTED_STOPBAND_FILTERING |
| 159 | + struct EQValues eq_values; | ||
| 158 | eq_values.BASS_GAIN=0;//-50db 低频减小音量 | 160 | eq_values.BASS_GAIN=0;//-50db 低频减小音量 |
| 159 | eq_values.BASS_F=200;//HZ低频滤波点 | 161 | eq_values.BASS_F=200;//HZ低频滤波点 |
| 160 | eq_values.BASS_Q_W=0;//低频曲线斜率 | 162 | eq_values.BASS_Q_W=0;//低频曲线斜率 |
| @@ -163,14 +165,11 @@ void music_init(void)//初始化音乐 | @@ -163,14 +165,11 @@ void music_init(void)//初始化音乐 | ||
| 163 | eq_values.EQ_Q_W=10;//40高频曲线斜率 | 165 | eq_values.EQ_Q_W=10;//40高频曲线斜率 |
| 164 | printf("滤波初始化,当前类型为带阻滤波\n"); | 166 | printf("滤波初始化,当前类型为带阻滤波\n"); |
| 165 | #endif | 167 | #endif |
| 166 | - | ||
| 167 | - //音频库回归帧初始化 | 168 | + //音频库回归帧初始化 |
| 168 | init(MP2,eq_values,returnframe); | 169 | init(MP2,eq_values,returnframe); |
| 169 | - | ||
| 170 | set_eq_rawplay(EQ_RAWPLAY); | 170 | set_eq_rawplay(EQ_RAWPLAY); |
| 171 | set_eq_streamplay(EQ_STREAMPLAY); | 171 | set_eq_streamplay(EQ_STREAMPLAY); |
| 172 | set_eq_fileplay(EQ_FILEPLAY); | 172 | set_eq_fileplay(EQ_FILEPLAY); |
| 173 | - | ||
| 174 | delayMs(50); | 173 | delayMs(50); |
| 175 | 174 | ||
| 176 | //向音频库发送刷新音频列表帧 | 175 | //向音频库发送刷新音频列表帧 |
| @@ -194,7 +193,14 @@ void music_init(void)//初始化音乐 | @@ -194,7 +193,14 @@ void music_init(void)//初始化音乐 | ||
| 194 | } | 193 | } |
| 195 | #endif | 194 | #endif |
| 196 | 195 | ||
| 197 | - | 196 | +#endif |
| 197 | +} | ||
| 198 | + | ||
| 199 | +int Music_sendFrame(unsigned char *str, int str_len) | ||
| 200 | +{ | ||
| 201 | +#if MEGAPHONE_MODE == VERSION_SWITCH_ON | ||
| 202 | + sendFrame(str, str_len); | ||
| 203 | +#endif | ||
| 198 | } | 204 | } |
| 199 | 205 | ||
| 200 | //刷新音频列表 | 206 | //刷新音频列表 |
| @@ -209,7 +215,7 @@ int Music_SendFrame_FlushMusicList() | @@ -209,7 +215,7 @@ int Music_SendFrame_FlushMusicList() | ||
| 209 | music_sum=0;//歌曲总数 | 215 | music_sum=0;//歌曲总数 |
| 210 | 216 | ||
| 211 | char readlist[11]={0x5a,0x5a,0x77,0x00,0x0c,0x01,0x00,0x53,0x02,0x1b,0x13}; | 217 | char readlist[11]={0x5a,0x5a,0x77,0x00,0x0c,0x01,0x00,0x53,0x02,0x1b,0x13}; |
| 212 | - sendFrame(readlist,11);//调用查询 | 218 | + Music_sendFrame(readlist,11);//调用查询 |
| 213 | } | 219 | } |
| 214 | 220 | ||
| 215 | //获取录音列表 (暂时用不上) | 221 | //获取录音列表 (暂时用不上) |
| @@ -222,7 +228,7 @@ int Music_SendFrame_GetRecordList() | @@ -222,7 +228,7 @@ int Music_SendFrame_GetRecordList() | ||
| 222 | } | 228 | } |
| 223 | record_sum=0;//歌曲总数 | 229 | record_sum=0;//歌曲总数 |
| 224 | char readlist[11]={0x5a,0x5a,0x77,0x00,0x0c,0x01,0x00,0x53,0x03,0x1b,0x13}; | 230 | char readlist[11]={0x5a,0x5a,0x77,0x00,0x0c,0x01,0x00,0x53,0x03,0x1b,0x13}; |
| 225 | - sendFrame(readlist,11);//调用查询 | 231 | + Music_sendFrame(readlist,11);//调用查询 |
| 226 | 232 | ||
| 227 | } | 233 | } |
| 228 | 234 | ||
| @@ -231,7 +237,7 @@ int Music_SendFrame_PauseMusic() | @@ -231,7 +237,7 @@ int Music_SendFrame_PauseMusic() | ||
| 231 | { | 237 | { |
| 232 | printf("向音频库发送:暂停播放音乐\n"); | 238 | printf("向音频库发送:暂停播放音乐\n"); |
| 233 | uint8_t Senddata[]={0x5a,0x5a,0x77,0x00,0x0b,0x01,0x00,0x52,0x05,0x49,0x53}; | 239 | uint8_t Senddata[]={0x5a,0x5a,0x77,0x00,0x0b,0x01,0x00,0x52,0x05,0x49,0x53}; |
| 234 | - sendFrame(Senddata,11);//停止播放 | 240 | + Music_sendFrame(Senddata,11);//停止播放 |
| 235 | } | 241 | } |
| 236 | 242 | ||
| 237 | //向音频库发送:继续播放音乐 | 243 | //向音频库发送:继续播放音乐 |
| @@ -239,7 +245,7 @@ int Music_SendFrame_ContinueMusic() | @@ -239,7 +245,7 @@ int Music_SendFrame_ContinueMusic() | ||
| 239 | { | 245 | { |
| 240 | printf("向音频库发送:继续播放音乐\n"); | 246 | printf("向音频库发送:继续播放音乐\n"); |
| 241 | char Senddata[]={0x5a,0x5a,0x77,0x00,0x0b,0x01,0x00,0x52,0x04,0x89,0x92}; | 247 | char Senddata[]={0x5a,0x5a,0x77,0x00,0x0b,0x01,0x00,0x52,0x04,0x89,0x92}; |
| 242 | - sendFrame(Senddata,11);//播放功能 | 248 | + Music_sendFrame(Senddata,11);//播放功能 |
| 243 | } | 249 | } |
| 244 | 250 | ||
| 245 | //向音频库发送:查询音频播放状态 | 251 | //向音频库发送:查询音频播放状态 |
| @@ -247,7 +253,7 @@ int Music_SendFrame_CheckMusicPlayStatus() | @@ -247,7 +253,7 @@ int Music_SendFrame_CheckMusicPlayStatus() | ||
| 247 | { | 253 | { |
| 248 | printf("向音频库发送:查询音频播放状态\n"); | 254 | printf("向音频库发送:查询音频播放状态\n"); |
| 249 | char Senddata[]={0x5A ,0x5A ,0x77 ,0x00 ,0x0c ,0x00 ,0x00 ,0x53 ,0xff ,0x00 ,0x00 ,0x23}; | 255 | char Senddata[]={0x5A ,0x5A ,0x77 ,0x00 ,0x0c ,0x00 ,0x00 ,0x53 ,0xff ,0x00 ,0x00 ,0x23}; |
| 250 | - sendFrame(Senddata,12); | 256 | + Music_sendFrame(Senddata,12); |
| 251 | } | 257 | } |
| 252 | 258 | ||
| 253 | //向音频库发送播放音乐 | 259 | //向音频库发送播放音乐 |
| @@ -262,7 +268,7 @@ int Music_SendFrame_PlayMusic(char *music_name,int datasize)//播放指定音乐 | @@ -262,7 +268,7 @@ int Music_SendFrame_PlayMusic(char *music_name,int datasize)//播放指定音乐 | ||
| 262 | if(strcmp(music_name, musiclist[i]) == 0){ | 268 | if(strcmp(music_name, musiclist[i]) == 0){ |
| 263 | printf("歌曲%d相同,歌曲名:%s\n",i,musiclist[i]); | 269 | printf("歌曲%d相同,歌曲名:%s\n",i,musiclist[i]); |
| 264 | music_num=i; | 270 | music_num=i; |
| 265 | - sendFrame(playdata,9+datasize);//播放指定歌曲 | 271 | + Music_sendFrame(playdata,9+datasize);//播放指定歌曲 |
| 266 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | 272 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; |
| 267 | } | 273 | } |
| 268 | } | 274 | } |
| @@ -274,7 +280,7 @@ int Music_SendFrame_PlayMusic(char *music_name,int datasize)//播放指定音乐 | @@ -274,7 +280,7 @@ int Music_SendFrame_PlayMusic(char *music_name,int datasize)//播放指定音乐 | ||
| 274 | if (result == 0) | 280 | if (result == 0) |
| 275 | { | 281 | { |
| 276 | printf("播放海外tts\n"); | 282 | printf("播放海外tts\n"); |
| 277 | - sendFrame(playdata,9+datasize); | 283 | + Music_sendFrame(playdata,9+datasize); |
| 278 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; | 284 | return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; |
| 279 | } | 285 | } |
| 280 | 286 | ||
| @@ -701,21 +707,11 @@ int Music_Get_LoopPlayMode() | @@ -701,21 +707,11 @@ int Music_Get_LoopPlayMode() | ||
| 701 | * *************/ | 707 | * *************/ |
| 702 | int Music_RawPlay(int sample_rate, unsigned char *data, int dataSize) | 708 | int Music_RawPlay(int sample_rate, unsigned char *data, int dataSize) |
| 703 | { | 709 | { |
| 710 | +#if MEGAPHONE_MODE == VERSION_SWITCH_ON | ||
| 704 | rawPlay(sample_rate, (uint8_t* )data, dataSize); | 711 | rawPlay(sample_rate, (uint8_t* )data, dataSize); |
| 712 | +#endif | ||
| 705 | } | 713 | } |
| 706 | 714 | ||
| 707 | - | ||
| 708 | -/************** | ||
| 709 | - * | ||
| 710 | - * 帧播放接口 | ||
| 711 | - * | ||
| 712 | - * *************/ | ||
| 713 | -int Music_SendFrame_FramePlay(unsigned char* data, int DataSize) | ||
| 714 | -{ | ||
| 715 | - sendFrame(data, DataSize); | ||
| 716 | -} | ||
| 717 | - | ||
| 718 | - | ||
| 719 | /************** | 715 | /************** |
| 720 | * | 716 | * |
| 721 | * 获取音频列表信息 | 717 | * 获取音频列表信息 |
| @@ -35,7 +35,7 @@ int Music_SendFrame_ContinueMusic(); | @@ -35,7 +35,7 @@ int Music_SendFrame_ContinueMusic(); | ||
| 35 | int Music_SendFrame_FlushMusicList(); | 35 | int Music_SendFrame_FlushMusicList(); |
| 36 | int Music_SendFrame_CheckMusicPlayStatus(); | 36 | int Music_SendFrame_CheckMusicPlayStatus(); |
| 37 | int Music_SendFrame_PlayMusic(char *music_name,int datasize);//播放指定音乐,music_name文件名 | 37 | int Music_SendFrame_PlayMusic(char *music_name,int datasize);//播放指定音乐,music_name文件名 |
| 38 | -int Music_SendFrame_FramePlay(unsigned char* data, int DataSize); | 38 | +int Music_sendFrame(unsigned char* data, int DataSize); |
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | void Music_LoopPlay(int mode); | 41 | void Music_LoopPlay(int mode); |
| @@ -144,7 +144,7 @@ static int Music_RealTimeMP2_PlayData(unsigned char *data,int len) | @@ -144,7 +144,7 @@ static int Music_RealTimeMP2_PlayData(unsigned char *data,int len) | ||
| 144 | playFile[len - 1] = 0x00; | 144 | playFile[len - 1] = 0x00; |
| 145 | playFile[len] = 0x00; | 145 | playFile[len] = 0x00; |
| 146 | 146 | ||
| 147 | - Music_SendFrame_FramePlay(playFile,len); | 147 | + Music_sendFrame(playFile,len); |
| 148 | 148 | ||
| 149 | printf("播放结束\n"); | 149 | printf("播放结束\n"); |
| 150 | 150 |
| @@ -80,10 +80,12 @@ int espeak_tts(int languages, int speed ,char *tts_words ,int len ) | @@ -80,10 +80,12 @@ int espeak_tts(int languages, int speed ,char *tts_words ,int len ) | ||
| 80 | break; | 80 | break; |
| 81 | } | 81 | } |
| 82 | tts_setVoice(ttsvoice);//设置音色语言 | 82 | tts_setVoice(ttsvoice);//设置音色语言 |
| 83 | - ttsparam.speed = speed/2; //设置语速 | 83 | + ttsparam.speed = speed; //设置语速 |
| 84 | ttsparam.pitch=80;//设置语调 | 84 | ttsparam.pitch=80;//设置语调 |
| 85 | ttsparam.wordGap=0;//设置单词间隙 | 85 | ttsparam.wordGap=0;//设置单词间隙 |
| 86 | 86 | ||
| 87 | + printf("语速%d\n",ttsparam.speed); | ||
| 88 | + | ||
| 87 | tts_setParam(ttsparam); | 89 | tts_setParam(ttsparam); |
| 88 | char tts_filename[]="IntlTTS.wav"; | 90 | char tts_filename[]="IntlTTS.wav"; |
| 89 | 91 |
Module/Megaphone/TTS/Intl_tts/Intl_tts.c.bak
0 → 100644
| 1 | +#include "Intl_tts.h" | ||
| 2 | +#include "Intl_interface.h" | ||
| 3 | +#include "Megaphone_InputAndOutput.h" | ||
| 4 | +#include "version_choose.h" | ||
| 5 | +#include "JZsdkLib.h" | ||
| 6 | + | ||
| 7 | +extern int Intl_TTS_PlayFlag; | ||
| 8 | + | ||
| 9 | +#if FIRMWARE_ORIGIN == OVERSEAS_VERSION | ||
| 10 | + | ||
| 11 | +int espeak_init() | ||
| 12 | +{ | ||
| 13 | + char dict_path[]="/root";//设置资源库路径 | ||
| 14 | + char wav_save_path[]="/root/sdcard/record/";//设置生成音频路径 | ||
| 15 | + tts_init(dict_path,wav_save_path);//初始化 | ||
| 16 | + printf("espeak_init\n"); | ||
| 17 | + | ||
| 18 | +} | ||
| 19 | + | ||
| 20 | +int espeak_tts(int languages, int speed ,char *tts_words ,int len ) | ||
| 21 | +{ | ||
| 22 | + | ||
| 23 | + struct JZTTSParam ttsparam; | ||
| 24 | + struct JZTTSVoice ttsvoice;//音色语言选择 | ||
| 25 | + char systemCmdStr[]="rm /root/sdcard/record/IntlTTS.wav"; | ||
| 26 | + JZsdk_RunSystemCmd(systemCmdStr); | ||
| 27 | + switch(languages){ | ||
| 28 | + case 0x41://俄 russian ru | ||
| 29 | + ttsvoice.name="russian";//音色名称 | ||
| 30 | + ttsvoice.languages="ru";//使用语言字典 | ||
| 31 | + printf("russian\n"); | ||
| 32 | + break; | ||
| 33 | + | ||
| 34 | + case 0x42://法 french fr-fr | ||
| 35 | + ttsvoice.name="french";//音色名称 | ||
| 36 | + ttsvoice.languages="fr-fr";//使用语言字典 | ||
| 37 | + printf("french\n"); | ||
| 38 | + break; | ||
| 39 | + | ||
| 40 | + case 0x43://德 german de | ||
| 41 | + ttsvoice.name="german";//音色名称 | ||
| 42 | + ttsvoice.languages="de";//使用语言字典 | ||
| 43 | + printf("german\n"); | ||
| 44 | + break; | ||
| 45 | + | ||
| 46 | + case 0x44://韩 ko | ||
| 47 | + ttsvoice.name="russian";//音色名称 | ||
| 48 | + ttsvoice.languages="ru";//使用语言字典 | ||
| 49 | + printf("ko\n"); | ||
| 50 | + break; | ||
| 51 | + | ||
| 52 | + case 0x45://意大利 italian it | ||
| 53 | + ttsvoice.name="italian";//音色名称 | ||
| 54 | + ttsvoice.languages="it";//使用语言字典 | ||
| 55 | + printf("italian\n"); | ||
| 56 | + break; | ||
| 57 | + | ||
| 58 | + case 0x46://波兰 polish pl | ||
| 59 | + ttsvoice.name="polish";//音色名称 | ||
| 60 | + ttsvoice.languages="pl";//使用语言字典 | ||
| 61 | + printf("polish\n"); | ||
| 62 | + break; | ||
| 63 | + | ||
| 64 | + case 0x47://西班牙 spanish es | ||
| 65 | + ttsvoice.name="spanish";//音色名称 | ||
| 66 | + ttsvoice.languages="es";//使用语言字典 | ||
| 67 | + printf("spanish\n"); | ||
| 68 | + break; | ||
| 69 | + | ||
| 70 | + case 0x48://葡萄牙 portugal pt-pt | ||
| 71 | + ttsvoice.name="portugal";//音色名称 | ||
| 72 | + ttsvoice.languages="pt-pt";//使用语言字典 | ||
| 73 | + printf("portugal\n"); | ||
| 74 | + break; | ||
| 75 | + | ||
| 76 | + default: | ||
| 77 | + ttsvoice.name="russian";//音色名称 | ||
| 78 | + ttsvoice.languages="ru";//使用语言字典 | ||
| 79 | + printf("russian\n"); | ||
| 80 | + break; | ||
| 81 | + } | ||
| 82 | + tts_setVoice(ttsvoice);//设置音色语言 | ||
| 83 | + ttsparam.speed = speed/2; //设置语速 | ||
| 84 | + ttsparam.pitch=80;//设置语调 | ||
| 85 | + ttsparam.wordGap=0;//设置单词间隙 | ||
| 86 | + | ||
| 87 | + tts_setParam(ttsparam); | ||
| 88 | + char tts_filename[]="IntlTTS.wav"; | ||
| 89 | + | ||
| 90 | + //生成播放的文件 | ||
| 91 | + tts_speak(tts_words,tts_filename); | ||
| 92 | + | ||
| 93 | + //打开海外播放TTS标志位 | ||
| 94 | + Intl_TTS_PlayFlag = 1; | ||
| 95 | + | ||
| 96 | + Megaphone_PlayMusic(tts_filename,sizeof(tts_filename)); | ||
| 97 | + | ||
| 98 | + return 0; | ||
| 99 | +} | ||
| 100 | + | ||
| 101 | +#endif |
| @@ -192,7 +192,7 @@ static int TTS(int name,int volume,int speed,int len,char *data, int ReplyFlag)/ | @@ -192,7 +192,7 @@ static int TTS(int name,int volume,int speed,int len,char *data, int ReplyFlag)/ | ||
| 192 | #if FIRMWARE_ORIGIN == OVERSEAS_VERSION | 192 | #if FIRMWARE_ORIGIN == OVERSEAS_VERSION |
| 193 | int espeak_speed; // 最大取值80~450 | 193 | int espeak_speed; // 最大取值80~450 |
| 194 | //输入参数是0~100 调整为0 ~ 80 其中 40是一倍速 | 194 | //输入参数是0~100 调整为0 ~ 80 其中 40是一倍速 |
| 195 | - espeak_speed = 0 + (espeak_speed*80/100); | 195 | + espeak_speed = 0 + (speed*80/100); |
| 196 | //输入参数是0~100 调整为80 ~ 100 其中 90是一倍速 | 196 | //输入参数是0~100 调整为80 ~ 100 其中 90是一倍速 |
| 197 | //espeak_speed = 450*speed/100; | 197 | //espeak_speed = 450*speed/100; |
| 198 | espeak_tts(name,espeak_speed,data,len); | 198 | espeak_tts(name,espeak_speed,data,len); |
| @@ -21,6 +21,7 @@ | @@ -21,6 +21,7 @@ | ||
| 21 | #include "Megaphone_InputAndOutput.h" | 21 | #include "Megaphone_InputAndOutput.h" |
| 22 | #include "../../Music/Megaphone_Music.h" | 22 | #include "../../Music/Megaphone_Music.h" |
| 23 | #include "cn_tts.h" | 23 | #include "cn_tts.h" |
| 24 | +#include "version_choose.h" | ||
| 24 | 25 | ||
| 25 | struct t_Megaphone_tts_param | 26 | struct t_Megaphone_tts_param |
| 26 | { | 27 | { |
| @@ -109,7 +110,7 @@ int text_to_speech(const char* src_text, const char* des_path, const char* param | @@ -109,7 +110,7 @@ int text_to_speech(const char* src_text, const char* des_path, const char* param | ||
| 109 | const char* sessionID2 = NULL; | 110 | const char* sessionID2 = NULL; |
| 110 | unsigned int audio_len = 0; | 111 | unsigned int audio_len = 0; |
| 111 | int synth_status = MSP_TTS_FLAG_STILL_HAVE_DATA; | 112 | int synth_status = MSP_TTS_FLAG_STILL_HAVE_DATA; |
| 112 | - | 113 | +#if MEGAPHONE_MODE == VERSION_SWITCH_ON |
| 113 | ret= -1; | 114 | ret= -1; |
| 114 | if (NULL == src_text || NULL == des_path) | 115 | if (NULL == src_text || NULL == des_path) |
| 115 | { | 116 | { |
| @@ -161,10 +162,13 @@ int text_to_speech(const char* src_text, const char* des_path, const char* param | @@ -161,10 +162,13 @@ int text_to_speech(const char* src_text, const char* des_path, const char* param | ||
| 161 | { | 162 | { |
| 162 | printf("QTTSSessionEnd failed, error code: %d.\n",ret); | 163 | printf("QTTSSessionEnd failed, error code: %d.\n",ret); |
| 163 | } | 164 | } |
| 165 | +#endif | ||
| 164 | return ret; | 166 | return ret; |
| 165 | } | 167 | } |
| 166 | 168 | ||
| 167 | -void login_tts(void){ | 169 | +void login_tts(void) |
| 170 | +{ | ||
| 171 | +#if MEGAPHONE_MODE == VERSION_SWITCH_ON | ||
| 168 | int ret = MSP_SUCCESS; | 172 | int ret = MSP_SUCCESS; |
| 169 | int error_num=0; | 173 | int error_num=0; |
| 170 | const char* login_params = "appid = 03857dfd, work_dir = .";//登录参数,appid与msc库绑定,请勿随意改动 | 174 | const char* login_params = "appid = 03857dfd, work_dir = .";//登录参数,appid与msc库绑定,请勿随意改动 |
| @@ -181,6 +185,7 @@ relogin: | @@ -181,6 +185,7 @@ relogin: | ||
| 181 | printf("TTS login\n"); | 185 | printf("TTS login\n"); |
| 182 | } | 186 | } |
| 183 | return; | 187 | return; |
| 188 | +#endif | ||
| 184 | } | 189 | } |
| 185 | 190 | ||
| 186 | 191 | ||
| @@ -355,7 +360,7 @@ Start_TTS: | @@ -355,7 +360,7 @@ Start_TTS: | ||
| 355 | //回复播放状态结束 | 360 | //回复播放状态结束 |
| 356 | Megaphone_Reply_PlayStatus_end(); | 361 | Megaphone_Reply_PlayStatus_end(); |
| 357 | } | 362 | } |
| 358 | - | 363 | + |
| 359 | return 0; | 364 | return 0; |
| 360 | } | 365 | } |
| 361 | 366 |
| @@ -16,23 +16,23 @@ enum | @@ -16,23 +16,23 @@ enum | ||
| 16 | MSP_ERROR_NOT_SUPPORT = 10103, /* 0x2777 */ | 16 | MSP_ERROR_NOT_SUPPORT = 10103, /* 0x2777 */ |
| 17 | MSP_ERROR_NOT_IMPLEMENT = 10104, /* 0x2778 */ | 17 | MSP_ERROR_NOT_IMPLEMENT = 10104, /* 0x2778 */ |
| 18 | MSP_ERROR_ACCESS = 10105, /* 0x2779 */ | 18 | MSP_ERROR_ACCESS = 10105, /* 0x2779 */ |
| 19 | - MSP_ERROR_INVALID_PARA = 10106, /* 0x277A */ /* 缺少参数 */ | ||
| 20 | - MSP_ERROR_INVALID_PARA_VALUE = 10107, /* 0x277B */ /* 无效参数值 */ | 19 | + MSP_ERROR_INVALID_PARA = 10106, /* 0x277A */ /* 缺少参数 */ |
| 20 | + MSP_ERROR_INVALID_PARA_VALUE = 10107, /* 0x277B */ /* 无效参数值 */ | ||
| 21 | MSP_ERROR_INVALID_HANDLE = 10108, /* 0x277C */ | 21 | MSP_ERROR_INVALID_HANDLE = 10108, /* 0x277C */ |
| 22 | MSP_ERROR_INVALID_DATA = 10109, /* 0x277D */ | 22 | MSP_ERROR_INVALID_DATA = 10109, /* 0x277D */ |
| 23 | - MSP_ERROR_NO_LICENSE = 10110, /* 0x277E */ /* 引擎授权不足 */ | ||
| 24 | - MSP_ERROR_NOT_INIT = 10111, /* 0x277F */ /* 引擎未初始化,可能是引擎崩溃 */ | 23 | + MSP_ERROR_NO_LICENSE = 10110, /* 0x277E */ /* 引擎授权不足 */ |
| 24 | + MSP_ERROR_NOT_INIT = 10111, /* 0x277F */ /* 引擎未初始化,可能是引擎崩溃 */ | ||
| 25 | MSP_ERROR_NULL_HANDLE = 10112, /* 0x2780 */ | 25 | MSP_ERROR_NULL_HANDLE = 10112, /* 0x2780 */ |
| 26 | - MSP_ERROR_OVERFLOW = 10113, /* 0x2781 */ /* 单用户下模型数超上限(10个), */ | ||
| 27 | - /* 只出现在测试时对一个用户进行并发注册 */ | ||
| 28 | - MSP_ERROR_TIME_OUT = 10114, /* 0x2782 */ /* 超时 */ | 26 | + MSP_ERROR_OVERFLOW = 10113, /* 0x2781 */ /* 单用户下模型数超上限(10个), */ |
| 27 | + /* 只出现在测试时对一个用户进行并发注册 */ | ||
| 28 | + MSP_ERROR_TIME_OUT = 10114, /* 0x2782 */ /* 超时 */ | ||
| 29 | MSP_ERROR_OPEN_FILE = 10115, /* 0x2783 */ | 29 | MSP_ERROR_OPEN_FILE = 10115, /* 0x2783 */ |
| 30 | - MSP_ERROR_NOT_FOUND = 10116, /* 0x2784 */ /* 数据库中模型不存在 */ | 30 | + MSP_ERROR_NOT_FOUND = 10116, /* 0x2784 */ /* 数据库中模型不存在 */ |
| 31 | MSP_ERROR_NO_ENOUGH_BUFFER = 10117, /* 0x2785 */ | 31 | MSP_ERROR_NO_ENOUGH_BUFFER = 10117, /* 0x2785 */ |
| 32 | - MSP_ERROR_NO_DATA = 10118, /* 0x2786 */ /* 从客户端读音频或从引擎段获取结果时无数据 */ | 32 | + MSP_ERROR_NO_DATA = 10118, /* 0x2786 */ /* 从客户端读音频或从引擎段获取结果时无数据 */ |
| 33 | MSP_ERROR_NO_MORE_DATA = 10119, /* 0x2787 */ | 33 | MSP_ERROR_NO_MORE_DATA = 10119, /* 0x2787 */ |
| 34 | MSP_ERROR_NO_RESPONSE_DATA = 10120, /* 0x2788 */ | 34 | MSP_ERROR_NO_RESPONSE_DATA = 10120, /* 0x2788 */ |
| 35 | - MSP_ERROR_ALREADY_EXIST = 10121, /* 0x2789 */ /* 数据库中模型已存在 */ | 35 | + MSP_ERROR_ALREADY_EXIST = 10121, /* 0x2789 */ /* 数据库中模型已存在 */ |
| 36 | MSP_ERROR_LOAD_MODULE = 10122, /* 0x278A */ | 36 | MSP_ERROR_LOAD_MODULE = 10122, /* 0x278A */ |
| 37 | MSP_ERROR_BUSY = 10123, /* 0x278B */ | 37 | MSP_ERROR_BUSY = 10123, /* 0x278B */ |
| 38 | MSP_ERROR_INVALID_CONFIG = 10124, /* 0x278C */ | 38 | MSP_ERROR_INVALID_CONFIG = 10124, /* 0x278C */ |
| @@ -50,10 +50,10 @@ enum | @@ -50,10 +50,10 @@ enum | ||
| 50 | MSP_ERROR_USER_ACTIVE_ABORT = 10136, /* 0x2798 */ /* user abort */ | 50 | MSP_ERROR_USER_ACTIVE_ABORT = 10136, /* 0x2798 */ /* user abort */ |
| 51 | MSP_ERROR_BUSY_GRMBUILDING = 10137, /* 0x2799 */ | 51 | MSP_ERROR_BUSY_GRMBUILDING = 10137, /* 0x2799 */ |
| 52 | MSP_ERROR_BUSY_LEXUPDATING = 10138, /* 0x279A */ | 52 | MSP_ERROR_BUSY_LEXUPDATING = 10138, /* 0x279A */ |
| 53 | - MSP_ERROR_SESSION_RESET = 10139, /* 0x279B */ /* msc主动终止会话,准备重传 */ | ||
| 54 | - MSP_ERROR_BOS_TIMEOUT = 10140, /* 0x279C */ /* VAD前端点超时 */ | ||
| 55 | - MSP_ERROR_STREAM_FILTER = 10141, /* 0X279D */ /* AIUI当前Stream被过滤 */ | ||
| 56 | - MSP_ERROR_STREAM_CLEAR = 10142, /* 0X279E */ /* AIUI当前Stream被清理 */ | 53 | + MSP_ERROR_SESSION_RESET = 10139, /* 0x279B */ /* msc主动终止会话,准备重传 */ |
| 54 | + MSP_ERROR_BOS_TIMEOUT = 10140, /* 0x279C */ /* VAD前端点超时 */ | ||
| 55 | + MSP_ERROR_STREAM_FILTER = 10141, /* 0X279D */ /* AIUI当前Stream被过滤 */ | ||
| 56 | + MSP_ERROR_STREAM_CLEAR = 10142, /* 0X279E */ /* AIUI当前Stream被清理 */ | ||
| 57 | 57 | ||
| 58 | /* Error codes of network 10200(0x27D8)*/ | 58 | /* Error codes of network 10200(0x27D8)*/ |
| 59 | MSP_ERROR_NET_GENERAL = 10200, /* 0x27D8 */ | 59 | MSP_ERROR_NET_GENERAL = 10200, /* 0x27D8 */ |
| @@ -100,8 +100,8 @@ enum | @@ -100,8 +100,8 @@ enum | ||
| 100 | MSP_ERROR_MSG_INVALID_CONTENT_ENCODE = 10307, /* 0x2843 */ | 100 | MSP_ERROR_MSG_INVALID_CONTENT_ENCODE = 10307, /* 0x2843 */ |
| 101 | MSP_ERROR_MSG_INVALID_KEY = 10308, /* 0x2844 */ | 101 | MSP_ERROR_MSG_INVALID_KEY = 10308, /* 0x2844 */ |
| 102 | MSP_ERROR_MSG_KEY_EMPTY = 10309, /* 0x2845 */ | 102 | MSP_ERROR_MSG_KEY_EMPTY = 10309, /* 0x2845 */ |
| 103 | - MSP_ERROR_MSG_SESSION_ID_EMPTY = 10310, /* 0x2846 */ /* 会话ID为空 */ | ||
| 104 | - MSP_ERROR_MSG_LOGIN_ID_EMPTY = 10311, /* 0x2847 */ /* 音频序列ID为空 */ | 103 | + MSP_ERROR_MSG_SESSION_ID_EMPTY = 10310, /* 0x2846 */ /* 会话ID为空 */ |
| 104 | + MSP_ERROR_MSG_LOGIN_ID_EMPTY = 10311, /* 0x2847 */ /* 音频序列ID为空 */ | ||
| 105 | MSP_ERROR_MSG_SYNC_ID_EMPTY = 10312, /* 0x2848 */ | 105 | MSP_ERROR_MSG_SYNC_ID_EMPTY = 10312, /* 0x2848 */ |
| 106 | MSP_ERROR_MSG_APP_ID_EMPTY = 10313, /* 0x2849 */ | 106 | MSP_ERROR_MSG_APP_ID_EMPTY = 10313, /* 0x2849 */ |
| 107 | MSP_ERROR_MSG_EXTERN_ID_EMPTY = 10314, /* 0x284A */ | 107 | MSP_ERROR_MSG_EXTERN_ID_EMPTY = 10314, /* 0x284A */ |
| @@ -114,13 +114,13 @@ enum | @@ -114,13 +114,13 @@ enum | ||
| 114 | MSP_ERROR_MSG_MSSP_EMPTY = 10321, /* 0x2851 */ | 114 | MSP_ERROR_MSG_MSSP_EMPTY = 10321, /* 0x2851 */ |
| 115 | MSP_ERROR_MSG_NEW_RESPONSE = 10322, /* 0x2852 */ | 115 | MSP_ERROR_MSG_NEW_RESPONSE = 10322, /* 0x2852 */ |
| 116 | MSP_ERROR_MSG_NEW_CONTENT = 10323, /* 0x2853 */ | 116 | MSP_ERROR_MSG_NEW_CONTENT = 10323, /* 0x2853 */ |
| 117 | - MSP_ERROR_MSG_INVALID_SESSION_ID = 10324, /* 0x2854 */ /* 无效的会话ID(sid) */ | 117 | + MSP_ERROR_MSG_INVALID_SESSION_ID = 10324, /* 0x2854 */ /* 无效的会话ID(sid) */ |
| 118 | MSP_ERROR_MSG_INVALID_CONTENT = 10325, /* 0x2855 */ | 118 | MSP_ERROR_MSG_INVALID_CONTENT = 10325, /* 0x2855 */ |
| 119 | 119 | ||
| 120 | /* Error codes of DataBase 10400(0x28A0)*/ | 120 | /* Error codes of DataBase 10400(0x28A0)*/ |
| 121 | - MSP_ERROR_DB_GENERAL = 10400, /* 0x28A0 */ /* 数据库异常 */ | 121 | + MSP_ERROR_DB_GENERAL = 10400, /* 0x28A0 */ /* 数据库异常 */ |
| 122 | MSP_ERROR_DB_EXCEPTION = 10401, /* 0x28A1 */ | 122 | MSP_ERROR_DB_EXCEPTION = 10401, /* 0x28A1 */ |
| 123 | - MSP_ERROR_DB_NO_RESULT = 10402, /* 0x28A2 */ /* redis中没有找到会话ID(sid) */ | 123 | + MSP_ERROR_DB_NO_RESULT = 10402, /* 0x28A2 */ /* redis中没有找到会话ID(sid) */ |
| 124 | MSP_ERROR_DB_INVALID_USER = 10403, /* 0x28A3 */ | 124 | MSP_ERROR_DB_INVALID_USER = 10403, /* 0x28A3 */ |
| 125 | MSP_ERROR_DB_INVALID_PWD = 10404, /* 0x28A4 */ | 125 | MSP_ERROR_DB_INVALID_PWD = 10404, /* 0x28A4 */ |
| 126 | MSP_ERROR_DB_CONNECT = 10405, /* 0x28A5 */ | 126 | MSP_ERROR_DB_CONNECT = 10405, /* 0x28A5 */ |
| @@ -149,7 +149,7 @@ enum | @@ -149,7 +149,7 @@ enum | ||
| 149 | MSP_ERROR_TTS_LTTS_ERROR = 10603, /* 0x296B */ | 149 | MSP_ERROR_TTS_LTTS_ERROR = 10603, /* 0x296B */ |
| 150 | 150 | ||
| 151 | /* Error codes of Recognizer 10700(0x29CC) */ | 151 | /* Error codes of Recognizer 10700(0x29CC) */ |
| 152 | - MSP_ERROR_REC_GENERAL = 10700, /* 0x29CC */ /* 引擎异常 */ | 152 | + MSP_ERROR_REC_GENERAL = 10700, /* 0x29CC */ /* 引擎异常 */ |
| 153 | MSP_ERROR_REC_INACTIVE = 10701, /* 0x29CD */ | 153 | MSP_ERROR_REC_INACTIVE = 10701, /* 0x29CD */ |
| 154 | MSP_ERROR_REC_GRAMMAR_ERROR = 10702, /* 0x29CE */ | 154 | MSP_ERROR_REC_GRAMMAR_ERROR = 10702, /* 0x29CE */ |
| 155 | MSP_ERROR_REC_NO_ACTIVE_GRAMMARS = 10703, /* 0x29CF */ | 155 | MSP_ERROR_REC_NO_ACTIVE_GRAMMARS = 10703, /* 0x29CF */ |
| @@ -177,14 +177,14 @@ enum | @@ -177,14 +177,14 @@ enum | ||
| 177 | MSP_ERROR_TUV_VERFAIL = 10905, /* 0x2A99 */ /* Verify failure */ | 177 | MSP_ERROR_TUV_VERFAIL = 10905, /* 0x2A99 */ /* Verify failure */ |
| 178 | 178 | ||
| 179 | /* Error codes of IMTV */ | 179 | /* Error codes of IMTV */ |
| 180 | - MSP_ERROR_LOGIN_SUCCESS = 11000, /* 0x2AF8 */ /* 成功 */ | ||
| 181 | - MSP_ERROR_LOGIN_NO_LICENSE = 11001, /* 0x2AF9 */ /* 试用次数结束,用户需要付费 */ | ||
| 182 | - MSP_ERROR_LOGIN_SESSIONID_INVALID = 11002, /* 0x2AFA */ /* SessionId失效,需要重新登录通行证 */ | ||
| 183 | - MSP_ERROR_LOGIN_SESSIONID_ERROR = 11003, /* 0x2AFB */ /* SessionId为空,或者非法 */ | ||
| 184 | - MSP_ERROR_LOGIN_UNLOGIN = 11004, /* 0x2AFC */ /* 未登录通行证 */ | ||
| 185 | - MSP_ERROR_LOGIN_INVALID_USER = 11005, /* 0x2AFD */ /* 用户ID无效 */ | ||
| 186 | - MSP_ERROR_LOGIN_INVALID_PWD = 11006, /* 0x2AFE */ /* 用户密码无效 */ | ||
| 187 | - MSP_ERROR_LOGIN_SYSTEM_ERROR = 11099, /* 0x2B5B */ /* 系统错误 */ | 180 | + MSP_ERROR_LOGIN_SUCCESS = 11000, /* 0x2AF8 */ /* 成功 */ |
| 181 | + MSP_ERROR_LOGIN_NO_LICENSE = 11001, /* 0x2AF9 */ /* 试用次数结束,用户需要付费 */ | ||
| 182 | + MSP_ERROR_LOGIN_SESSIONID_INVALID = 11002, /* 0x2AFA */ /* SessionId失效,需要重新登录通行证 */ | ||
| 183 | + MSP_ERROR_LOGIN_SESSIONID_ERROR = 11003, /* 0x2AFB */ /* SessionId为空,或者非法 */ | ||
| 184 | + MSP_ERROR_LOGIN_UNLOGIN = 11004, /* 0x2AFC */ /* 未登录通行证 */ | ||
| 185 | + MSP_ERROR_LOGIN_INVALID_USER = 11005, /* 0x2AFD */ /* 用户ID无效 */ | ||
| 186 | + MSP_ERROR_LOGIN_INVALID_PWD = 11006, /* 0x2AFE */ /* 用户密码无效 */ | ||
| 187 | + MSP_ERROR_LOGIN_SYSTEM_ERROR = 11099, /* 0x2B5B */ /* 系统错误 */ | ||
| 188 | 188 | ||
| 189 | /* Error codes of HCR */ | 189 | /* Error codes of HCR */ |
| 190 | MSP_ERROR_HCR_GENERAL = 11100, | 190 | MSP_ERROR_HCR_GENERAL = 11100, |
| @@ -200,22 +200,22 @@ enum | @@ -200,22 +200,22 @@ enum | ||
| 200 | MSP_ERROR_HCR_RESOURCE = 11110, | 200 | MSP_ERROR_HCR_RESOURCE = 11110, |
| 201 | 201 | ||
| 202 | /* Error Codes using in local engine */ | 202 | /* Error Codes using in local engine */ |
| 203 | - MSP_ERROR_AUTH_NO_LICENSE = 11200, /* 0x2BC0 */ /* 无授权 */ | ||
| 204 | - MSP_ERROR_AUTH_NO_ENOUGH_LICENSE = 11201, /* 0x2BC1 */ /* 授权不足 */ | ||
| 205 | - MSP_ERROR_AUTH_INVALID_LICENSE = 11202, /* 0x2BC2 */ /* 无效的授权 */ | ||
| 206 | - MSP_ERROR_AUTH_LICENSE_EXPIRED = 11203, /* 0x2BC3 */ /* 授权过期 */ | ||
| 207 | - MSP_ERROR_AUTH_NEED_MORE_DATA = 11204, /* 0x2BC4 */ /* 无设备信息 */ | ||
| 208 | - MSP_ERROR_AUTH_LICENSE_TO_BE_EXPIRED = 11205, /* 0x2BC5 */ /* 授权即将过期,警告性错误码 */ | ||
| 209 | - MSP_ERROR_AUTH_INVALID_MACHINE_ID = 11206, /* 0x2BC6 */ /* 无效的机器码 */ | ||
| 210 | - MSP_ERROR_AUTH_LOCAL_ASR_FORBIDDEN = 11207, /* 0x2BC7 */ /* 禁止使用本地识别引擎 */ | ||
| 211 | - MSP_ERROR_AUTH_LOCAL_TTS_FORBIDDEN = 11208, /* 0x2BC8 */ /* 禁止使用本地合成引擎 */ | ||
| 212 | - MSP_ERROR_AUTH_LOCAL_IVW_FORBIDDEN = 11209, /* 0x2BC9 */ /* 禁止使用本地唤醒引擎 */ | ||
| 213 | - MSP_ERROR_AUTH_APPID_NOT_MATCH = 11210, /* 0x2BCA */ /* 资源appid和应用appid不匹配 */ | ||
| 214 | - MSP_ERROR_AUTH_UID_NOT_MATCH = 11211, /* 0x2BCB */ /* 资源uid和登录用户uid不匹配 */ | ||
| 215 | - MSP_ERROR_AUTH_TRIAL_EXPIRED = 11212, /* 0x2BCC */ /* 试用资源过期 */ | ||
| 216 | - MSP_ERROR_AUTH_LOCAL_IFD_FORBIDDEN = 11213, /* 0x2BC9 */ /* 禁止使用本地人脸引擎 */ | ||
| 217 | - | ||
| 218 | - MSP_ERROR_AIUI_NO_ENOUGH_LICENSE = 11216, /* 0x2BD0 */ /* AIUI授权不足 */ | 203 | + MSP_ERROR_AUTH_NO_LICENSE = 11200, /* 0x2BC0 */ /* 无授权 */ |
| 204 | + MSP_ERROR_AUTH_NO_ENOUGH_LICENSE = 11201, /* 0x2BC1 */ /* 授权不足 */ | ||
| 205 | + MSP_ERROR_AUTH_INVALID_LICENSE = 11202, /* 0x2BC2 */ /* 无效的授权 */ | ||
| 206 | + MSP_ERROR_AUTH_LICENSE_EXPIRED = 11203, /* 0x2BC3 */ /* 授权过期 */ | ||
| 207 | + MSP_ERROR_AUTH_NEED_MORE_DATA = 11204, /* 0x2BC4 */ /* 无设备信息 */ | ||
| 208 | + MSP_ERROR_AUTH_LICENSE_TO_BE_EXPIRED = 11205, /* 0x2BC5 */ /* 授权即将过期,警告性错误码 */ | ||
| 209 | + MSP_ERROR_AUTH_INVALID_MACHINE_ID = 11206, /* 0x2BC6 */ /* 无效的机器码 */ | ||
| 210 | + MSP_ERROR_AUTH_LOCAL_ASR_FORBIDDEN = 11207, /* 0x2BC7 */ /* 禁止使用本地识别引擎 */ | ||
| 211 | + MSP_ERROR_AUTH_LOCAL_TTS_FORBIDDEN = 11208, /* 0x2BC8 */ /* 禁止使用本地合成引擎 */ | ||
| 212 | + MSP_ERROR_AUTH_LOCAL_IVW_FORBIDDEN = 11209, /* 0x2BC9 */ /* 禁止使用本地唤醒引擎 */ | ||
| 213 | + MSP_ERROR_AUTH_APPID_NOT_MATCH = 11210, /* 0x2BCA */ /* 资源appid和应用appid不匹配 */ | ||
| 214 | + MSP_ERROR_AUTH_UID_NOT_MATCH = 11211, /* 0x2BCB */ /* 资源uid和登录用户uid不匹配 */ | ||
| 215 | + MSP_ERROR_AUTH_TRIAL_EXPIRED = 11212, /* 0x2BCC */ /* 试用资源过期 */ | ||
| 216 | + MSP_ERROR_AUTH_LOCAL_IFD_FORBIDDEN = 11213, /* 0x2BC9 */ /* 禁止使用本地人脸引擎 */ | ||
| 217 | + | ||
| 218 | + MSP_ERROR_AIUI_NO_ENOUGH_LICENSE = 11216, /* 0x2BD0 */ /* AIUI授权不足 */ | ||
| 219 | /*Error Codes of Authorization*/ | 219 | /*Error Codes of Authorization*/ |
| 220 | MSP_ERROR_AUTH_DVC_NO_LICENSE = 11300, | 220 | MSP_ERROR_AUTH_DVC_NO_LICENSE = 11300, |
| 221 | MSP_ERROR_AUTH_DVC_NO_ENOUGH_LICENSE = 11301, | 221 | MSP_ERROR_AUTH_DVC_NO_ENOUGH_LICENSE = 11301, |
| @@ -246,32 +246,32 @@ enum | @@ -246,32 +246,32 @@ enum | ||
| 246 | MSP_ERROR_IOT_DID_NOT_FOUND = 11506, // not found device id in semantic | 246 | MSP_ERROR_IOT_DID_NOT_FOUND = 11506, // not found device id in semantic |
| 247 | 247 | ||
| 248 | /* Error codes of IVP */ | 248 | /* Error codes of IVP */ |
| 249 | - MSP_ERROR_IVP_GENERAL = 11600, // 内核异常 | ||
| 250 | - MSP_ERROR_IVP_EXTRA_RGN_SOPPORT = 11601, // 注册时向引擎所写音频条数超过上限(9次) | ||
| 251 | - MSP_ERROR_IVP_TRUNCATED = 11602, // 音频截幅(因信号波形的幅度太大,而超出系统的线性范围),如记录尖叫声的音频 | ||
| 252 | - MSP_ERROR_IVP_MUCH_NOISE = 11603, // 音频信噪比过低 | ||
| 253 | - MSP_ERROR_IVP_TOO_LOW = 11604, // 音频能量过低 | ||
| 254 | - MSP_ERROR_IVP_ZERO_AUDIO = 11605, // 无音频 | ||
| 255 | - MSP_ERROR_IVP_UTTER_TOO_SHORT = 11606, // 音频太短 | ||
| 256 | - MSP_ERROR_IVP_TEXT_NOT_MATCH = 11607, // 1.音频和文本不匹配,常见原因1.抢读(在按下录音键之前读) | ||
| 257 | - // 2.录音机的启动电流被录入表现在音频上是在音频首有冲击电流 3.确实不匹配" | ||
| 258 | - MSP_ERROR_IVP_NO_ENOUGH_AUDIO = 11608, // 音频不够,注册自由说,而写入的音频又不够长时会报,告诉调用者继续传音频 | ||
| 259 | - MSP_ERROR_IVP_MODEL_NOT_FOUND_IN_HBASE = 11610, // 模型在hbase中没找到 | 249 | + MSP_ERROR_IVP_GENERAL = 11600, // 内核异常 |
| 250 | + MSP_ERROR_IVP_EXTRA_RGN_SOPPORT = 11601, // 注册时向引擎所写音频条数超过上限(9次) | ||
| 251 | + MSP_ERROR_IVP_TRUNCATED = 11602, // 音频截幅(因信号波形的幅度太大,而超出系统的线性范围),如记录尖叫声的音频 | ||
| 252 | + MSP_ERROR_IVP_MUCH_NOISE = 11603, // 音频信噪比过低 | ||
| 253 | + MSP_ERROR_IVP_TOO_LOW = 11604, // 音频能量过低 | ||
| 254 | + MSP_ERROR_IVP_ZERO_AUDIO = 11605, // 无音频 | ||
| 255 | + MSP_ERROR_IVP_UTTER_TOO_SHORT = 11606, // 音频太短 | ||
| 256 | + MSP_ERROR_IVP_TEXT_NOT_MATCH = 11607, // 1.音频和文本不匹配,常见原因1.抢读(在按下录音键之前读) | ||
| 257 | + // 2.录音机的启动电流被录入表现在音频上是在音频首有冲击电流 3.确实不匹配" | ||
| 258 | + MSP_ERROR_IVP_NO_ENOUGH_AUDIO = 11608, // 音频不够,注册自由说,而写入的音频又不够长时会报,告诉调用者继续传音频 | ||
| 259 | + MSP_ERROR_IVP_MODEL_NOT_FOUND_IN_HBASE = 11610, // 模型在hbase中没找到 | ||
| 260 | 260 | ||
| 261 | /* Error codes of Face */ | 261 | /* Error codes of Face */ |
| 262 | 262 | ||
| 263 | - MSP_ERROR_IFR_NOT_FACE_IMAGE = 11700, // 【无人脸,对应的引擎错误码是20200 】 | ||
| 264 | - MSP_ERROR_FACE_IMAGE_FULL_LEFT = 11701, // 【人脸向左,对应的引擎错误码是20201】 | ||
| 265 | - MSP_ERROR_FACE_IMAGE_FULL_RIGHT = 11702, // 【人脸向右,对应的引擎错误码是20202】 | ||
| 266 | - MSP_ERROR_IMAGE_CLOCKWISE_WHIRL = 11703, // 【顺时针旋转,对应的引擎错误码是20203】 | ||
| 267 | - MSP_ERROR_IMAGE_COUNTET_CLOCKWISE_WHIRL = 11704, // 【逆时针旋转,对应的引擎错误码是20204】 | ||
| 268 | - MSP_ERROR_VALID_IMAGE_SIZE = 11705, // 【图片大小异常 ,对应的引擎错误码是20205】 | ||
| 269 | - MSP_ERROR_ILLUMINATION = 11706, // 【光照异常,对应的引擎错误码是20206】 | ||
| 270 | - MSP_ERROR_FACE_OCCULTATION = 11707, // 【人脸被遮挡,对应的引擎错误码是20207】 | ||
| 271 | - MSP_ERROR_FACE_INVALID_MODEL = 11708, // 【非法模型数据,对应的引擎错误码是20208】 | ||
| 272 | - MSP_ERROR_FUSION_INVALID_INPUT_TYPE = 11709, // 【输入数据类型非法,对应的引擎错误码是20300】 | ||
| 273 | - MSP_ERROR_FUSION_NO_ENOUGH_DATA = 11710, // 【输入的数据不完整,对应的引擎错误码是20301】 | ||
| 274 | - MSP_ERROR_FUSION_ENOUGH_DATA = 11711, // 【输入的数据过多,对应的引擎错误码是20302】 | 263 | + MSP_ERROR_IFR_NOT_FACE_IMAGE = 11700, // 【无人脸,对应的引擎错误码是20200 】 |
| 264 | + MSP_ERROR_FACE_IMAGE_FULL_LEFT = 11701, // 【人脸向左,对应的引擎错误码是20201】 | ||
| 265 | + MSP_ERROR_FACE_IMAGE_FULL_RIGHT = 11702, // 【人脸向右,对应的引擎错误码是20202】 | ||
| 266 | + MSP_ERROR_IMAGE_CLOCKWISE_WHIRL = 11703, // 【顺时针旋转,对应的引擎错误码是20203】 | ||
| 267 | + MSP_ERROR_IMAGE_COUNTET_CLOCKWISE_WHIRL = 11704, // 【逆时针旋转,对应的引擎错误码是20204】 | ||
| 268 | + MSP_ERROR_VALID_IMAGE_SIZE = 11705, // 【图片大小异常 ,对应的引擎错误码是20205】 | ||
| 269 | + MSP_ERROR_ILLUMINATION = 11706, // 【光照异常,对应的引擎错误码是20206】 | ||
| 270 | + MSP_ERROR_FACE_OCCULTATION = 11707, // 【人脸被遮挡,对应的引擎错误码是20207】 | ||
| 271 | + MSP_ERROR_FACE_INVALID_MODEL = 11708, // 【非法模型数据,对应的引擎错误码是20208】 | ||
| 272 | + MSP_ERROR_FUSION_INVALID_INPUT_TYPE = 11709, // 【输入数据类型非法,对应的引擎错误码是20300】 | ||
| 273 | + MSP_ERROR_FUSION_NO_ENOUGH_DATA = 11710, // 【输入的数据不完整,对应的引擎错误码是20301】 | ||
| 274 | + MSP_ERROR_FUSION_ENOUGH_DATA = 11711, // 【输入的数据过多,对应的引擎错误码是20302】 | ||
| 275 | 275 | ||
| 276 | /*Error Codes of AIUI*/ | 276 | /*Error Codes of AIUI*/ |
| 277 | MSP_ERROR_AIUI_CID_EXPIRED = 11800, | 277 | MSP_ERROR_AIUI_CID_EXPIRED = 11800, |
| @@ -323,91 +323,91 @@ enum | @@ -323,91 +323,91 @@ enum | ||
| 323 | MSP_ERROR_MMP_REDIS_INITFAIL = 15002, /* 0x3A9A */ | 323 | MSP_ERROR_MMP_REDIS_INITFAIL = 15002, /* 0x3A9A */ |
| 324 | MSP_ERROR_MMP_NETDSS_INITFAIL = 15003, /* 0x3A9B */ | 324 | MSP_ERROR_MMP_NETDSS_INITFAIL = 15003, /* 0x3A9B */ |
| 325 | MSP_ERROR_MMP_TAIR_INITFAIL = 15004, /* 0x3A9C */ | 325 | MSP_ERROR_MMP_TAIR_INITFAIL = 15004, /* 0x3A9C */ |
| 326 | - MSP_ERROR_MMP_MAIL_SESSION_FAIL = 15006, /* 0x3A9E */ /* 邮件登陆服务器时,会话错误。*/ | ||
| 327 | - MSP_ERROR_MMP_MAIL_LOGON_FAIL = 15007, /* 0x3A9F */ /* 邮件登陆服务器时,拒绝登陆。*/ | ||
| 328 | - MSP_ERROR_MMP_MAIL_USER_ILLEGAL = 15008, /* 0x3AA0 */ /* 邮件登陆服务器时,用户名非法。*/ | ||
| 329 | - MSP_ERROR_MMP_MAIL_PWD_ERR = 15009, /* 0x3AA1 */ /* 邮件登陆服务器时,密码错误。*/ | ||
| 330 | - MSP_ERROR_MMP_MAIL_SOCKET_ERR = 15010, /* 0x3AA2 */ /* 邮件发送过程中套接字错误*/ | ||
| 331 | - MSP_ERROR_MMP_MAIL_INIT_FAIL = 15011, /* 0x3AA3 */ /* 邮件初始化错误*/ | ||
| 332 | - MSP_ERROR_MMP_STORE_MNR_NO_INIT = 15012, /* 0x3AA4 */ /* store_manager未初始化,或初始化失败*/ | ||
| 333 | - MSP_ERROR_MMP_STORE_MNR_POOL_FULL = 15013, /* 0x3AA5 */ /* store_manager的连接池满了*/ | ||
| 334 | - MSP_ERROR_MMP_STRATGY_PARAM_ILLEGAL = 15014, /* 0x3AA6 */ /* 报警策略表达式非法*/ | ||
| 335 | - MSP_ERROR_MMP_STRATGY_PARAM_TOOLOOG = 15015, /* 0x3AA7 */ /* 报警策略表达式太长*/ | ||
| 336 | - MSP_ERROR_MMP_PARAM_NULL = 15016, /* 0x3AA8 */ /* 函数参数为空*/ | ||
| 337 | - MSP_ERROR_MMP_ERR_MORE_TOTAL = 15017, /* 0x3AA9 */ /* pms插入数据库中错误汇总表的数据,错误次数 > 总次数。*/ | ||
| 338 | - MSP_ERROR_MMP_PROC_THRESHOLD = 15018, /* 0x3AAA */ /* 进程监控阀值设置错误*/ | ||
| 339 | - MSP_ERROR_MMP_SERVER_THRESHOLD = 15019, /* 0x3AAB */ /* 服务器监控阀值设置错误*/ | ||
| 340 | - MSP_ERROR_MMP_PYTHON_NO_EXIST = 15020, /* 0x3AAC */ /* python脚本文件不存在 */ | ||
| 341 | - MSP_ERROR_MMP_PYTHON_IMPORT_FAILED = 15021, /* 0x3AAD */ /* python脚本导入出错 */ | ||
| 342 | - MSP_ERROR_MMP_PYTHON_BAD_FUNC = 15022, /* 0x3AAE */ /* python脚本函数格式错误 */ | ||
| 343 | - MSP_ERROR_MMP_DB_DATA_ILLEGAL = 15023, /* 0x3AAF */ /* 插入数据库中的数据格式有误 */ | ||
| 344 | - MSP_ERROR_MMP_REDIS_NOT_CONN = 15024, /* 0x3AB0 */ /* redis没有连接到服务端 */ | ||
| 345 | - MSP_ERROR_MMP_PMA_NOT_FOUND_STRATEGY = 15025, /* 0x3AB1 */ /* 没有找到报警策略 */ | ||
| 346 | - MSP_ERROR_MMP_TAIR_CONNECT = 15026, /* 0x3AB2 */ /* 连接tair集群失败 */ | ||
| 347 | - MSP_ERROR_MMP_PMC_SERVINFO_INVALID = 15027, /* Ox3AB3 */ /* 此pmc的服务器信息已经无效 */ | ||
| 348 | - MSP_ERROR_MMP_ALARM_GROUP_NULL = 15028, /* Ox3AB4 */ /* 服务器报警的短信报警组与邮件报警组均为空 */ | ||
| 349 | - MSP_ERROR_MMP_ALARM_CONTXT_NULL = 15029, /* Ox3AB5 */ /* 服务器报警的报警内容为空 */ | 326 | + MSP_ERROR_MMP_MAIL_SESSION_FAIL = 15006, /* 0x3A9E */ /* 邮件登陆服务器时,会话错误。*/ |
| 327 | + MSP_ERROR_MMP_MAIL_LOGON_FAIL = 15007, /* 0x3A9F */ /* 邮件登陆服务器时,拒绝登陆。*/ | ||
| 328 | + MSP_ERROR_MMP_MAIL_USER_ILLEGAL = 15008, /* 0x3AA0 */ /* 邮件登陆服务器时,用户名非法。*/ | ||
| 329 | + MSP_ERROR_MMP_MAIL_PWD_ERR = 15009, /* 0x3AA1 */ /* 邮件登陆服务器时,密码错误。*/ | ||
| 330 | + MSP_ERROR_MMP_MAIL_SOCKET_ERR = 15010, /* 0x3AA2 */ /* 邮件发送过程中套接字错误*/ | ||
| 331 | + MSP_ERROR_MMP_MAIL_INIT_FAIL = 15011, /* 0x3AA3 */ /* 邮件初始化错误*/ | ||
| 332 | + MSP_ERROR_MMP_STORE_MNR_NO_INIT = 15012, /* 0x3AA4 */ /* store_manager未初始化,或初始化失败*/ | ||
| 333 | + MSP_ERROR_MMP_STORE_MNR_POOL_FULL = 15013, /* 0x3AA5 */ /* store_manager的连接池满了*/ | ||
| 334 | + MSP_ERROR_MMP_STRATGY_PARAM_ILLEGAL = 15014, /* 0x3AA6 */ /* 报警策略表达式非法*/ | ||
| 335 | + MSP_ERROR_MMP_STRATGY_PARAM_TOOLOOG = 15015, /* 0x3AA7 */ /* 报警策略表达式太长*/ | ||
| 336 | + MSP_ERROR_MMP_PARAM_NULL = 15016, /* 0x3AA8 */ /* 函数参数为空*/ | ||
| 337 | + MSP_ERROR_MMP_ERR_MORE_TOTAL = 15017, /* 0x3AA9 */ /* pms插入数据库中错误汇总表的数据,错误次数 > 总次数。*/ | ||
| 338 | + MSP_ERROR_MMP_PROC_THRESHOLD = 15018, /* 0x3AAA */ /* 进程监控阀值设置错误*/ | ||
| 339 | + MSP_ERROR_MMP_SERVER_THRESHOLD = 15019, /* 0x3AAB */ /* 服务器监控阀值设置错误*/ | ||
| 340 | + MSP_ERROR_MMP_PYTHON_NO_EXIST = 15020, /* 0x3AAC */ /* python脚本文件不存在 */ | ||
| 341 | + MSP_ERROR_MMP_PYTHON_IMPORT_FAILED = 15021, /* 0x3AAD */ /* python脚本导入出错 */ | ||
| 342 | + MSP_ERROR_MMP_PYTHON_BAD_FUNC = 15022, /* 0x3AAE */ /* python脚本函数格式错误 */ | ||
| 343 | + MSP_ERROR_MMP_DB_DATA_ILLEGAL = 15023, /* 0x3AAF */ /* 插入数据库中的数据格式有误 */ | ||
| 344 | + MSP_ERROR_MMP_REDIS_NOT_CONN = 15024, /* 0x3AB0 */ /* redis没有连接到服务端 */ | ||
| 345 | + MSP_ERROR_MMP_PMA_NOT_FOUND_STRATEGY = 15025, /* 0x3AB1 */ /* 没有找到报警策略 */ | ||
| 346 | + MSP_ERROR_MMP_TAIR_CONNECT = 15026, /* 0x3AB2 */ /* 连接tair集群失败 */ | ||
| 347 | + MSP_ERROR_MMP_PMC_SERVINFO_INVALID = 15027, /* Ox3AB3 */ /* 此pmc的服务器信息已经无效 */ | ||
| 348 | + MSP_ERROR_MMP_ALARM_GROUP_NULL = 15028, /* Ox3AB4 */ /* 服务器报警的短信报警组与邮件报警组均为空 */ | ||
| 349 | + MSP_ERROR_MMP_ALARM_CONTXT_NULL = 15029, /* Ox3AB5 */ /* 服务器报警的报警内容为空 */ | ||
| 350 | 350 | ||
| 351 | /* Error codes of MSC(lmod loader) */ | 351 | /* Error codes of MSC(lmod loader) */ |
| 352 | MSP_ERROR_LMOD_BASE = 16000, /* 0x3E80 */ | 352 | MSP_ERROR_LMOD_BASE = 16000, /* 0x3E80 */ |
| 353 | - MSP_ERROR_LMOD_NOT_FOUND = 16001, /* 0x3E81 */ /* 没找到lmod文件 */ | ||
| 354 | - MSP_ERROR_LMOD_UNEXPECTED_BIN = 16002, /* 0x3E82 */ /* 无效的lmod */ | ||
| 355 | - MSP_ERROR_LMOD_LOADCODE = 16003, /* 0x3E83 */ /* 加载lmod指令失败 */ | ||
| 356 | - MSP_ERROR_LMOD_PRECALL = 16004, /* 0x3E84 */ /* 初始化lmod失败 */ | ||
| 357 | - MSP_ERROR_LMOD_RUNTIME_EXCEPTION = 16005, /* 0x3E85 */ /* lmod运行时异常 */ | ||
| 358 | - MSP_ERROR_LMOD_ALREADY_LOADED = 16006, /* 0x3E86 */ /* lmod重复加载 */ | 353 | + MSP_ERROR_LMOD_NOT_FOUND = 16001, /* 0x3E81 */ /* 没找到lmod文件 */ |
| 354 | + MSP_ERROR_LMOD_UNEXPECTED_BIN = 16002, /* 0x3E82 */ /* 无效的lmod */ | ||
| 355 | + MSP_ERROR_LMOD_LOADCODE = 16003, /* 0x3E83 */ /* 加载lmod指令失败 */ | ||
| 356 | + MSP_ERROR_LMOD_PRECALL = 16004, /* 0x3E84 */ /* 初始化lmod失败 */ | ||
| 357 | + MSP_ERROR_LMOD_RUNTIME_EXCEPTION = 16005, /* 0x3E85 */ /* lmod运行时异常 */ | ||
| 358 | + MSP_ERROR_LMOD_ALREADY_LOADED = 16006, /* 0x3E86 */ /* lmod重复加载 */ | ||
| 359 | 359 | ||
| 360 | // Error code of Third Business | 360 | // Error code of Third Business |
| 361 | - MSP_ERROR_BIZ_BASE = 17000, /* 0x4268 */ /* 三方业务错误码 */ | 361 | + MSP_ERROR_BIZ_BASE = 17000, /* 0x4268 */ /* 三方业务错误码 */ |
| 362 | 362 | ||
| 363 | //Error of Nginx errlog file increase exception | 363 | //Error of Nginx errlog file increase exception |
| 364 | - MSP_ERROR_NGX_LOG_MORE_TOTEL_SIZE = 18000, /*nginx错误日志大小异常*/ | 364 | + MSP_ERROR_NGX_LOG_MORE_TOTEL_SIZE = 18000, /*nginx错误日志大小异常*/ |
| 365 | 365 | ||
| 366 | //Error of Flash client when network checking | 366 | //Error of Flash client when network checking |
| 367 | - MSP_ERROR_FLASH_NETWORK_CONNECT_FIALED = 19000, /*flash服务端网络连接失败*/ | ||
| 368 | - MSP_ERROR_FLASH_NETWORK_CHECK_FIALED = 19001, /*flash服务端响应了异常消息*/ | ||
| 369 | - MSP_ERROR_FLASH_NETWORK_CHECK_TIMEOUT = 19002, /*flash服务端网络超时*/ | ||
| 370 | - MSP_ERROR_FLASH_NETWORK_CLOSED_EXCEPTION = 19003, /*flash服务端网络异常关闭*/ | 367 | + MSP_ERROR_FLASH_NETWORK_CONNECT_FIALED = 19000, /*flash服务端网络连接失败*/ |
| 368 | + MSP_ERROR_FLASH_NETWORK_CHECK_FIALED = 19001, /*flash服务端响应了异常消息*/ | ||
| 369 | + MSP_ERROR_FLASH_NETWORK_CHECK_TIMEOUT = 19002, /*flash服务端网络超时*/ | ||
| 370 | + MSP_ERROR_FLASH_NETWORK_CLOSED_EXCEPTION = 19003, /*flash服务端网络异常关闭*/ | ||
| 371 | 371 | ||
| 372 | /*Error Code Of Speech plus*/ | 372 | /*Error Code Of Speech plus*/ |
| 373 | 373 | ||
| 374 | - SPEECH_ERROR_NO_NETWORK = 20001, /* 无有效的网络连接*/ | ||
| 375 | - SPEECH_ERROR_NETWORK_TIMEOUT = 20002, /* 网络连接超时*/ | ||
| 376 | - SPEECH_ERROR_NET_EXPECTION = 20003, /* 网络异常*/ | ||
| 377 | - SPEECH_ERROR_INVALID_RESULT = 20004, /* 无有效的结果*/ | ||
| 378 | - SPEECH_ERROR_NO_MATCH = 20005, /* 无匹配结果 */ | ||
| 379 | - SPEECH_ERROR_AUDIO_RECORD = 20006, /* 录音失败 */ | ||
| 380 | - SPEECH_ERROR_NO_SPPECH = 20007, /* 未检测到语音*/ | 374 | + SPEECH_ERROR_NO_NETWORK = 20001, /* 无有效的网络连接*/ |
| 375 | + SPEECH_ERROR_NETWORK_TIMEOUT = 20002, /* 网络连接超时*/ | ||
| 376 | + SPEECH_ERROR_NET_EXPECTION = 20003, /* 网络异常*/ | ||
| 377 | + SPEECH_ERROR_INVALID_RESULT = 20004, /* 无有效的结果*/ | ||
| 378 | + SPEECH_ERROR_NO_MATCH = 20005, /* 无匹配结果 */ | ||
| 379 | + SPEECH_ERROR_AUDIO_RECORD = 20006, /* 录音失败 */ | ||
| 380 | + SPEECH_ERROR_NO_SPPECH = 20007, /* 未检测到语音*/ | ||
| 381 | 381 | ||
| 382 | - SPEECH_ERROR_SPEECH_TIMEOUT = 20008, /* 音频输入超时*/ | ||
| 383 | - SPEECH_ERROR_EMPTY_UTTERANCE = 20009, /* 无效的文本输入 */ | ||
| 384 | - SPEECH_ERROR_FILE_ACCESS = 20010, /* 文件读写失败 */ | ||
| 385 | - SPEECH_ERROR_PLAY_MEDIA = 20011, /* 音频播放失败 */ | 382 | + SPEECH_ERROR_SPEECH_TIMEOUT = 20008, /* 音频输入超时*/ |
| 383 | + SPEECH_ERROR_EMPTY_UTTERANCE = 20009, /* 无效的文本输入 */ | ||
| 384 | + SPEECH_ERROR_FILE_ACCESS = 20010, /* 文件读写失败 */ | ||
| 385 | + SPEECH_ERROR_PLAY_MEDIA = 20011, /* 音频播放失败 */ | ||
| 386 | 386 | ||
| 387 | - SPEECH_ERROR_INVALID_PARAM = 20012, /* 无效的参数*/ | ||
| 388 | - SPEECH_ERROR_TEXT_OVERFLOW = 20013, /* 文本溢出 */ | ||
| 389 | - SPEECH_ERROR_INVALID_DATA = 20014, /* 无效数据 */ | ||
| 390 | - SPEECH_ERROR_LOGIN = 20015, /* 用户未登陆*/ | ||
| 391 | - SPEECH_ERROR_PERMISSION_DENIED = 20016, /* 无效授权 */ | ||
| 392 | - SPEECH_ERROR_INTERRUPT = 20017, /* 被异常打断 */ | 387 | + SPEECH_ERROR_INVALID_PARAM = 20012, /* 无效的参数*/ |
| 388 | + SPEECH_ERROR_TEXT_OVERFLOW = 20013, /* 文本溢出 */ | ||
| 389 | + SPEECH_ERROR_INVALID_DATA = 20014, /* 无效数据 */ | ||
| 390 | + SPEECH_ERROR_LOGIN = 20015, /* 用户未登陆*/ | ||
| 391 | + SPEECH_ERROR_PERMISSION_DENIED = 20016, /* 无效授权 */ | ||
| 392 | + SPEECH_ERROR_INTERRUPT = 20017, /* 被异常打断 */ | ||
| 393 | 393 | ||
| 394 | - SPEECH_ERROR_VERSION_LOWER = 20018, /* 版本过低 */ | ||
| 395 | - SPEECH_CLIENT_ERROR_ISUSING = 20019, /* 录音机被占用(iOS平台) */ | ||
| 396 | - SPEECH_ERROR_SYSTEM_PREINSTALL = 20020, /* 系统预置版本 */ | ||
| 397 | - SPEECH_ERROR_UNSATISFIED_LINK = 20021, /* 未实现的Native函数引用 */ | ||
| 398 | - SPEECH_ERROR_UNKNOWN = 20999, /* 未知错误 */ | 394 | + SPEECH_ERROR_VERSION_LOWER = 20018, /* 版本过低 */ |
| 395 | + SPEECH_CLIENT_ERROR_ISUSING = 20019, /* 录音机被占用(iOS平台) */ | ||
| 396 | + SPEECH_ERROR_SYSTEM_PREINSTALL = 20020, /* 系统预置版本 */ | ||
| 397 | + SPEECH_ERROR_UNSATISFIED_LINK = 20021, /* 未实现的Native函数引用 */ | ||
| 398 | + SPEECH_ERROR_UNKNOWN = 20999, /* 未知错误 */ | ||
| 399 | 399 | ||
| 400 | 400 | ||
| 401 | - SPEECH_ERROR_COMPONENT_NOT_INSTALLED = 21001, /* 没有安装语音组件 */ | ||
| 402 | - SPEECH_ERROR_ENGINE_NOT_SUPPORTED = 21002, /* 引擎不支持 */ | ||
| 403 | - SPEECH_ERROR_ENGINE_INIT_FAIL = 21003, /* 初始化失败 */ | ||
| 404 | - SPEECH_ERROR_ENGINE_CALL_FAIL = 21004, /* 调用失败 */ | ||
| 405 | - SPEECH_ERROR_ENGINE_BUSY = 21005, /* 引擎繁忙 */ | 401 | + SPEECH_ERROR_COMPONENT_NOT_INSTALLED = 21001, /* 没有安装语音组件 */ |
| 402 | + SPEECH_ERROR_ENGINE_NOT_SUPPORTED = 21002, /* 引擎不支持 */ | ||
| 403 | + SPEECH_ERROR_ENGINE_INIT_FAIL = 21003, /* 初始化失败 */ | ||
| 404 | + SPEECH_ERROR_ENGINE_CALL_FAIL = 21004, /* 调用失败 */ | ||
| 405 | + SPEECH_ERROR_ENGINE_BUSY = 21005, /* 引擎繁忙 */ | ||
| 406 | 406 | ||
| 407 | - SPEECH_ERROR_LOCAL_NO_INIT = 22001, /* 本地引擎未初始化 */ | ||
| 408 | - SPEECH_ERROR_LOCAL_RESOURCE = 22002, /* 本地引擎无资源 */ | ||
| 409 | - SPEECH_ERROR_LOCAL_ENGINE = 22003, /* 本地引擎内部错误 */ | ||
| 410 | - SPEECH_ERROR_IVW_INTERRUPT = 22004, /* 本地唤醒引擎被异常打断 */ | 407 | + SPEECH_ERROR_LOCAL_NO_INIT = 22001, /* 本地引擎未初始化 */ |
| 408 | + SPEECH_ERROR_LOCAL_RESOURCE = 22002, /* 本地引擎无资源 */ | ||
| 409 | + SPEECH_ERROR_LOCAL_ENGINE = 22003, /* 本地引擎内部错误 */ | ||
| 410 | + SPEECH_ERROR_IVW_INTERRUPT = 22004, /* 本地唤醒引擎被异常打断 */ | ||
| 411 | 411 | ||
| 412 | 412 | ||
| 413 | /*Error Code Of Local iflytek Engines*/ | 413 | /*Error Code Of Local iflytek Engines*/ |
| @@ -415,20 +415,20 @@ enum | @@ -415,20 +415,20 @@ enum | ||
| 415 | /*Error Code Of AiTalk*/ | 415 | /*Error Code Of AiTalk*/ |
| 416 | 416 | ||
| 417 | /*Error Code Of AiTalk Operation*/ | 417 | /*Error Code Of AiTalk Operation*/ |
| 418 | - SPEECH_SUCCESS = 0 , // ivErr_OK = 0 /*成功状态*/ | ||
| 419 | - | ||
| 420 | - SPEECH_ERROR_ASR_CLIENT = 23000, /*客户端应用程序错误*///????????? | ||
| 421 | - SPEECH_ERROR_ASR_INVALID_PARA = 23001, /*无效的参数*/ | ||
| 422 | - SPEECH_ERROR_ASR_INVALID_PARA_VALUE = 23002, /*无效的参数值*/ | ||
| 423 | - SPEECH_ERROR_ASR_OUT_OF_MEMORY = 23003, /*内存耗尽*/ | ||
| 424 | - SPEECH_ERROR_ASR_CREATE_HANDLE_FAILED = 23004, /*创建句柄失败*/ | ||
| 425 | - SPEECH_ERROR_ASR_ENGINE_INIT_FAILED = 23005, /*引擎初始化失败*/ | ||
| 426 | - SPEECH_ERROR_ASR_ENGINE_STARTED = 23006, /*引擎已经启动*/ | ||
| 427 | - SPEECH_ERROR_ASR_ENGINE_UNINIT = 23007, /*引擎未初始化*/ | ||
| 428 | - SPEECH_ERROR_ASR_SPEECH_TIMEOUT = 23008, /*识别超时(VAD没开启或没有检测到后端点)*/ | ||
| 429 | - SPEECH_ERROR_ASR_NO_RECOGNIZED_RESULT = 23009, /*无识别结果*/ | ||
| 430 | - SPEECH_ERROR_ASR_INVALID_HANDLE = 23010, /*无效的句柄*/ | ||
| 431 | - SPEECH_ERROR_ASR_FILE_ACCESS = 23011, /*打开文件失败*/ | 418 | + SPEECH_SUCCESS = 0 , // ivErr_OK = 0 /*成功状态*/ |
| 419 | + | ||
| 420 | + SPEECH_ERROR_ASR_CLIENT = 23000, /*客户端应用程序错误*///????????? | ||
| 421 | + SPEECH_ERROR_ASR_INVALID_PARA = 23001, /*无效的参数*/ | ||
| 422 | + SPEECH_ERROR_ASR_INVALID_PARA_VALUE = 23002, /*无效的参数值*/ | ||
| 423 | + SPEECH_ERROR_ASR_OUT_OF_MEMORY = 23003, /*内存耗尽*/ | ||
| 424 | + SPEECH_ERROR_ASR_CREATE_HANDLE_FAILED = 23004, /*创建句柄失败*/ | ||
| 425 | + SPEECH_ERROR_ASR_ENGINE_INIT_FAILED = 23005, /*引擎初始化失败*/ | ||
| 426 | + SPEECH_ERROR_ASR_ENGINE_STARTED = 23006, /*引擎已经启动*/ | ||
| 427 | + SPEECH_ERROR_ASR_ENGINE_UNINIT = 23007, /*引擎未初始化*/ | ||
| 428 | + SPEECH_ERROR_ASR_SPEECH_TIMEOUT = 23008, /*识别超时(VAD没开启或没有检测到后端点)*/ | ||
| 429 | + SPEECH_ERROR_ASR_NO_RECOGNIZED_RESULT = 23009, /*无识别结果*/ | ||
| 430 | + SPEECH_ERROR_ASR_INVALID_HANDLE = 23010, /*无效的句柄*/ | ||
| 431 | + SPEECH_ERROR_ASR_FILE_ACCESS = 23011, /*打开文件失败*/ | ||
| 432 | 432 | ||
| 433 | /*Error Code Of AiTalk Engine*/ | 433 | /*Error Code Of AiTalk Engine*/ |
| 434 | SPEECH_ERROR_AITALK_FALSE = 23100, // ivErr_FALSE = 1 | 434 | SPEECH_ERROR_AITALK_FALSE = 23100, // ivErr_FALSE = 1 |
| @@ -438,16 +438,16 @@ enum | @@ -438,16 +438,16 @@ enum | ||
| 438 | 438 | ||
| 439 | /* General */ | 439 | /* General */ |
| 440 | SPEECH_ERROR_AITALK_INVALID_PARA = 23102, // ivErr_InvArg = 3 | 440 | SPEECH_ERROR_AITALK_INVALID_PARA = 23102, // ivErr_InvArg = 3 |
| 441 | - SPEECH_ERROR_AITALK_BUFFER_OVERFLOW = 23103, // ivErr_BufferFull = 4 /*音频数据缓冲区已满*/ | 441 | + SPEECH_ERROR_AITALK_BUFFER_OVERFLOW = 23103, // ivErr_BufferFull = 4 /*音频数据缓冲区已满*/ |
| 442 | SPEECH_ERROR_AITALK_FAILED = 23104, // ivErr_Failed = 5 | 442 | SPEECH_ERROR_AITALK_FAILED = 23104, // ivErr_Failed = 5 |
| 443 | - SPEECH_ERROR_AITALK_NOT_SUPPORTED = 23105, // ivErr_NotSupport = 6 /*引擎不支持*/ | 443 | + SPEECH_ERROR_AITALK_NOT_SUPPORTED = 23105, // ivErr_NotSupport = 6 /*引擎不支持*/ |
| 444 | SPEECH_ERROR_AITALK_OUT_OF_MEMORY = 23106, // ivErr_OutOfMemory = 7 | 444 | SPEECH_ERROR_AITALK_OUT_OF_MEMORY = 23106, // ivErr_OutOfMemory = 7 |
| 445 | - SPEECH_ERROR_AITALK_INVALID_RESOURCE = 23107, // ivErr_InvResource = 8 /*资源无效*/ | ||
| 446 | - SPEECH_ERROR_AITALK_NOT_FOUND = 23108, // ivErr_NotFound = 9 /*打开文件失败*/ | ||
| 447 | - SPEECH_ERROR_AITALK_INVALID_GRAMMAR = 23109, // ivErr_InvGrmr = 10 /*识别语法错误*/ | 445 | + SPEECH_ERROR_AITALK_INVALID_RESOURCE = 23107, // ivErr_InvResource = 8 /*资源无效*/ |
| 446 | + SPEECH_ERROR_AITALK_NOT_FOUND = 23108, // ivErr_NotFound = 9 /*打开文件失败*/ | ||
| 447 | + SPEECH_ERROR_AITALK_INVALID_GRAMMAR = 23109, // ivErr_InvGrmr = 10 /*识别语法错误*/ | ||
| 448 | 448 | ||
| 449 | /* For object status */ | 449 | /* For object status */ |
| 450 | - SPEECH_ERROR_AITALK_INVALID_CALL = 23110, // ivErr_InvCall = 11 /*无效调用*/ | 450 | + SPEECH_ERROR_AITALK_INVALID_CALL = 23110, // ivErr_InvCall = 11 /*无效调用*/ |
| 451 | 451 | ||
| 452 | /* For ASR Input */ | 452 | /* For ASR Input */ |
| 453 | SPEECH_ERROR_AITALK_SYNTAX_ERROR = 23111, // ivErr_InvCall = 12 | 453 | SPEECH_ERROR_AITALK_SYNTAX_ERROR = 23111, // ivErr_InvCall = 12 |
| @@ -459,49 +459,49 @@ enum | @@ -459,49 +459,49 @@ enum | ||
| 459 | SPEECH_ERROR_AITALK_CANNOT_SAVE_FILE = 23115, // ivErr_CanNotSaveFile = 16 | 459 | SPEECH_ERROR_AITALK_CANNOT_SAVE_FILE = 23115, // ivErr_CanNotSaveFile = 16 |
| 460 | 460 | ||
| 461 | /* For Lexicon name */ | 461 | /* For Lexicon name */ |
| 462 | - SPEECH_ERROR_AITALK_INVALID_GRAMMAR_NAME = 23116, // ivErr_InvName = 17 /*文法或词典名称非法*/ | 462 | + SPEECH_ERROR_AITALK_INVALID_GRAMMAR_NAME = 23116, // ivErr_InvName = 17 /*文法或词典名称非法*/ |
| 463 | 463 | ||
| 464 | SPEECH_ERROR_AITALK_BUFFER_EMPTY = 23117, // ivErr_BufferEmpty = 18 | 464 | SPEECH_ERROR_AITALK_BUFFER_EMPTY = 23117, // ivErr_BufferEmpty = 18 |
| 465 | 465 | ||
| 466 | SPEECH_ERROR_AITALK_GET_RESULT = 23118, // ivErr_GetResult = 19 | 466 | SPEECH_ERROR_AITALK_GET_RESULT = 23118, // ivErr_GetResult = 19 |
| 467 | 467 | ||
| 468 | - SPEECH_ERROR_AITALK_REACT_OUT_TIME = 23119, // ivErr_ReactOutTime = 20 /*反应超时*/ | ||
| 469 | - SPEECH_ERROR_AITALK_SPEECH_OUT_TIME = 23120, // ivErr_SpeechOutTime = 21 /*语音超时*/ | 468 | + SPEECH_ERROR_AITALK_REACT_OUT_TIME = 23119, // ivErr_ReactOutTime = 20 /*反应超时*/ |
| 469 | + SPEECH_ERROR_AITALK_SPEECH_OUT_TIME = 23120, // ivErr_SpeechOutTime = 21 /*语音超时*/ | ||
| 470 | 470 | ||
| 471 | - SPEECH_ERROR_AITALK_AUDIO_CUT = 23121, // ivErr_CUT = 22 /*录音质量过高*/ | ||
| 472 | - SPEECH_ERROR_AITALK_AUDIO_LOWER = 23122, // ivErr_LOWER = 23 /*录音质量过低*/ | 471 | + SPEECH_ERROR_AITALK_AUDIO_CUT = 23121, // ivErr_CUT = 22 /*录音质量过高*/ |
| 472 | + SPEECH_ERROR_AITALK_AUDIO_LOWER = 23122, // ivErr_LOWER = 23 /*录音质量过低*/ | ||
| 473 | 473 | ||
| 474 | - SPEECH_ERROR_AITALK_INSUFFICIENT_PERMISSIONS = 23123, // ivErr_Limitted = 24 /*授权不够*/ | ||
| 475 | - SPEECH_ERROR_AITALK_RESULT_ERROR = 23124, // ivErr_ResultError = 25 /*解码器Wfst输出后,依然有cmd输出*/ | 474 | + SPEECH_ERROR_AITALK_INSUFFICIENT_PERMISSIONS = 23123, // ivErr_Limitted = 24 /*授权不够*/ |
| 475 | + SPEECH_ERROR_AITALK_RESULT_ERROR = 23124, // ivErr_ResultError = 25 /*解码器Wfst输出后,依然有cmd输出*/ | ||
| 476 | SPEECH_ERROR_AITALK_SHORT_PAUSE = 23125, // ivErr_ShortPause = 26 | 476 | SPEECH_ERROR_AITALK_SHORT_PAUSE = 23125, // ivErr_ShortPause = 26 |
| 477 | SPEECH_ERROR_AITALK_BUSY = 23126, // ivErr_Busy = 27 | 477 | SPEECH_ERROR_AITALK_BUSY = 23126, // ivErr_Busy = 27 |
| 478 | - SPEECH_ERROR_AITALK_GRM_NOT_UPDATE = 23127, // ivErr_GrmNotUpdate = 28 /*语法未更新*/ | 478 | + SPEECH_ERROR_AITALK_GRM_NOT_UPDATE = 23127, // ivErr_GrmNotUpdate = 28 /*语法未更新*/ |
| 479 | SPEECH_ERROR_AITALK_STARTED = 23128, // ivErr_Started = 29 | 479 | SPEECH_ERROR_AITALK_STARTED = 23128, // ivErr_Started = 29 |
| 480 | SPEECH_ERROR_AITALK_STOPPED = 23129, // ivErr_Stopped = 30 | 480 | SPEECH_ERROR_AITALK_STOPPED = 23129, // ivErr_Stopped = 30 |
| 481 | SPEECH_ERROR_AITALK_ALREADY_STARTED = 23130, // ivErr_AlreadyStarted = 31 | 481 | SPEECH_ERROR_AITALK_ALREADY_STARTED = 23130, // ivErr_AlreadyStarted = 31 |
| 482 | SPEECH_ERROR_AITALK_ALREADY_STOPPED = 23131, // ivErr_AlreadyStopped = 32 | 482 | SPEECH_ERROR_AITALK_ALREADY_STOPPED = 23131, // ivErr_AlreadyStopped = 32 |
| 483 | SPEECH_ERROR_AITALK_TOO_MANY_COMMAND = 23132, // ivErr_TooManyCmd = 33 | 483 | SPEECH_ERROR_AITALK_TOO_MANY_COMMAND = 23132, // ivErr_TooManyCmd = 33 |
| 484 | - SPEECH_ERROR_AITALK_WAIT = 23133, // ivErr_Wait = 34 /*程序可能在做一些操作,主线程需要等待*/ | 484 | + SPEECH_ERROR_AITALK_WAIT = 23133, // ivErr_Wait = 34 /*程序可能在做一些操作,主线程需要等待*/ |
| 485 | SPEECH_ERROR_AITALK_MAE_RIGHT = 23134, // ivErr_MAERight = 35 | 485 | SPEECH_ERROR_AITALK_MAE_RIGHT = 23134, // ivErr_MAERight = 35 |
| 486 | SPEECH_ERROR_AITALK_MAE_WRONG = 23135, // ivErr_MAEWrong = 36 | 486 | SPEECH_ERROR_AITALK_MAE_WRONG = 23135, // ivErr_MAEWrong = 36 |
| 487 | 487 | ||
| 488 | - SPEECH_ERROR_AITALK_GRM_ERR = 23300, // 语法错误 | 488 | + SPEECH_ERROR_AITALK_GRM_ERR = 23300, // 语法错误 |
| 489 | 489 | ||
| 490 | 490 | ||
| 491 | 491 | ||
| 492 | /*Error Code Of AiSound*/ | 492 | /*Error Code Of AiSound*/ |
| 493 | 493 | ||
| 494 | /*Error Code Of AiSound Operation*/ | 494 | /*Error Code Of AiSound Operation*/ |
| 495 | - SPEECH_ERROR_TTS_INVALID_PARA = 24000, /* 错误参数 */ | ||
| 496 | - SPEECH_ERROR_TTS_INVALID_PARA_VALUE = 24001, /* 无效的参数值*/ | ||
| 497 | - SPEECH_ERROR_TTS_OUT_OF_MEMORY = 24002, /* 内存不足*/ | ||
| 498 | - SPEECH_ERROR_TTS_INVALID_HANDLE = 24003, /* 无效的句柄*/ | ||
| 499 | - SPEECH_ERROR_TTS_CREATE_HANDLE_FAILED = 24004, /* 创建句柄失败*/ | ||
| 500 | - SPEECH_ERROR_TTS_INVALID_RESOURCE = 24005, /* 无效资源 */ | ||
| 501 | - SPEECH_ERROR_TTS_INVALID_VOICE_NAME = 24006, /* 无效发言人*/ | ||
| 502 | - SPEECH_ERROR_TTS_ENGINE_UNINIT = 24007, /* 引擎未初始化 */ | ||
| 503 | - SPEECH_ERROR_TTS_ENGINE_INIT_FAILED = 24008, /* 引擎初始化失败 */ | ||
| 504 | - SPEECH_ERROR_TTS_ENGINE_BUSY = 24009, /* 引擎忙 */ | 495 | + SPEECH_ERROR_TTS_INVALID_PARA = 24000, /* 错误参数 */ |
| 496 | + SPEECH_ERROR_TTS_INVALID_PARA_VALUE = 24001, /* 无效的参数值*/ | ||
| 497 | + SPEECH_ERROR_TTS_OUT_OF_MEMORY = 24002, /* 内存不足*/ | ||
| 498 | + SPEECH_ERROR_TTS_INVALID_HANDLE = 24003, /* 无效的句柄*/ | ||
| 499 | + SPEECH_ERROR_TTS_CREATE_HANDLE_FAILED = 24004, /* 创建句柄失败*/ | ||
| 500 | + SPEECH_ERROR_TTS_INVALID_RESOURCE = 24005, /* 无效资源 */ | ||
| 501 | + SPEECH_ERROR_TTS_INVALID_VOICE_NAME = 24006, /* 无效发言人*/ | ||
| 502 | + SPEECH_ERROR_TTS_ENGINE_UNINIT = 24007, /* 引擎未初始化 */ | ||
| 503 | + SPEECH_ERROR_TTS_ENGINE_INIT_FAILED = 24008, /* 引擎初始化失败 */ | ||
| 504 | + SPEECH_ERROR_TTS_ENGINE_BUSY = 24009, /* 引擎忙 */ | ||
| 505 | 505 | ||
| 506 | 506 | ||
| 507 | /*Error Code Of AiSound Engine*/ | 507 | /*Error Code Of AiSound Engine*/ |
| @@ -526,11 +526,11 @@ enum | @@ -526,11 +526,11 @@ enum | ||
| 526 | /*Error Code Of ivw*/ | 526 | /*Error Code Of ivw*/ |
| 527 | 527 | ||
| 528 | /*Error Code Of ivw Operation*/ | 528 | /*Error Code Of ivw Operation*/ |
| 529 | - SPEECH_ERROR_IVW_ENGINE_UNINI = 25000, /* 引擎未初始化 */ | ||
| 530 | - SPEECH_ERROR_IVW_RESVER_NOMATCH = 25001, /* 资源版本不匹配 */ | ||
| 531 | - SPEECH_ERROR_IVW_BUFFERED_AUDIOD_LITTLE = 25002, /* 唤醒加识别缓存音频过少 */ | ||
| 532 | - SPEECH_ERROR_IVW_INVALID_RESTYPE = 25003, /* 不合法的资源类型 */ | ||
| 533 | - SPEECH_ERROR_IVW_INVALID_RESHEADVER = 25004, /* 不合法的资源头部版本号 */ | 529 | + SPEECH_ERROR_IVW_ENGINE_UNINI = 25000, /* 引擎未初始化 */ |
| 530 | + SPEECH_ERROR_IVW_RESVER_NOMATCH = 25001, /* 资源版本不匹配 */ | ||
| 531 | + SPEECH_ERROR_IVW_BUFFERED_AUDIOD_LITTLE = 25002, /* 唤醒加识别缓存音频过少 */ | ||
| 532 | + SPEECH_ERROR_IVW_INVALID_RESTYPE = 25003, /* 不合法的资源类型 */ | ||
| 533 | + SPEECH_ERROR_IVW_INVALID_RESHEADVER = 25004, /* 不合法的资源头部版本号 */ | ||
| 534 | 534 | ||
| 535 | /*Error Code Of ivw Engine*/ | 535 | /*Error Code Of ivw Engine*/ |
| 536 | SPEECH_ERROR_IVW_INVALID_CALL = 25101, // IvwErr_InvCal = 1 | 536 | SPEECH_ERROR_IVW_INVALID_CALL = 25101, // IvwErr_InvCal = 1 |
| @@ -556,8 +556,8 @@ enum | @@ -556,8 +556,8 @@ enum | ||
| 556 | SPEECH_ERROR_IVW_SPEECH_TOO_SHORT = 25120, // IvwErr_SpeechTooShort = 20 | 556 | SPEECH_ERROR_IVW_SPEECH_TOO_SHORT = 25120, // IvwErr_SpeechTooShort = 20 |
| 557 | SPEECH_ERROR_IVW_SPEECH_STOP = 25121, // IvwErr_SpeechStop = 21 | 557 | SPEECH_ERROR_IVW_SPEECH_STOP = 25121, // IvwErr_SpeechStop = 21 |
| 558 | 558 | ||
| 559 | - /* 非实时转写错误码:26000~26999 */ | ||
| 560 | - SPEECH_ERROR_LFASR_BASE = 26000, /* 非实时转写错误码基码 */ | 559 | + /* 非实时转写错误码:26000~26999 */ |
| 560 | + SPEECH_ERROR_LFASR_BASE = 26000, /* 非实时转写错误码基码 */ | ||
| 561 | }; | 561 | }; |
| 562 | 562 | ||
| 563 | #endif /* __MSP_ERRORS_H__ */ | 563 | #endif /* __MSP_ERRORS_H__ */ |
| @@ -8,6 +8,7 @@ | @@ -8,6 +8,7 @@ | ||
| 8 | #include "JZsdkLib.h" | 8 | #include "JZsdkLib.h" |
| 9 | #include "Megaphone_InputAndOutput.h" | 9 | #include "Megaphone_InputAndOutput.h" |
| 10 | #include "../opus.h" | 10 | #include "../opus.h" |
| 11 | +#include "version_choose.h" | ||
| 11 | 12 | ||
| 12 | 13 | ||
| 13 | #define WIDGET_SPEAKER_AUDIO_OPUS_MAX_FRAME_SIZE (6 * 960) | 14 | #define WIDGET_SPEAKER_AUDIO_OPUS_MAX_FRAME_SIZE (6 * 960) |
| @@ -17,11 +18,6 @@ static int RealTimeDecodeRate = 0; | @@ -17,11 +18,6 @@ static int RealTimeDecodeRate = 0; | ||
| 17 | OpusDecoder *Opus_RealTimeVoice_decoder; | 18 | OpusDecoder *Opus_RealTimeVoice_decoder; |
| 18 | static int ReadTimeVoice_StatusFlag = JZ_FLAGCODE_OFF; //实时喊话是否有打开 | 19 | static int ReadTimeVoice_StatusFlag = JZ_FLAGCODE_OFF; //实时喊话是否有打开 |
| 19 | 20 | ||
| 20 | - | ||
| 21 | - | ||
| 22 | - | ||
| 23 | - | ||
| 24 | - | ||
| 25 | //解码与播放 | 21 | //解码与播放 |
| 26 | static unsigned char Opus_RealTimeVoice_Loop_Data[ (256 + 1) ][80];//解码缓存池 | 22 | static unsigned char Opus_RealTimeVoice_Loop_Data[ (256 + 1) ][80];//解码缓存池 |
| 27 | static int Opus_RealTimeVoice_Loop_Head = 0; //池数头 | 23 | static int Opus_RealTimeVoice_Loop_Head = 0; //池数头 |
| @@ -88,7 +84,7 @@ int Opus_RealTimeVoice_Start(int decode_rate) | @@ -88,7 +84,7 @@ int Opus_RealTimeVoice_Start(int decode_rate) | ||
| 88 | static int Opus_RealTimeVoice_DecodeAndPlay_init() | 84 | static int Opus_RealTimeVoice_DecodeAndPlay_init() |
| 89 | { | 85 | { |
| 90 | int err; | 86 | int err; |
| 91 | - | 87 | +#if MEGAPHONE_MODE == VERSION_SWITCH_ON |
| 92 | //创建opus解码器 | 88 | //创建opus解码器 |
| 93 | Opus_RealTimeVoice_decoder = opus_decoder_create(RealTimeDecodeRate, WIDGET_SPEAKER_AUDIO_OPUS_CHANNELS, &err); | 89 | Opus_RealTimeVoice_decoder = opus_decoder_create(RealTimeDecodeRate, WIDGET_SPEAKER_AUDIO_OPUS_CHANNELS, &err); |
| 94 | if (err < 0) { | 90 | if (err < 0) { |
| @@ -112,11 +108,15 @@ static int Opus_RealTimeVoice_DecodeAndPlay_init() | @@ -112,11 +108,15 @@ static int Opus_RealTimeVoice_DecodeAndPlay_init() | ||
| 112 | ReadTimeVoice_StatusFlag = JZ_FLAGCODE_OFF; | 108 | ReadTimeVoice_StatusFlag = JZ_FLAGCODE_OFF; |
| 113 | return -2; | 109 | return -2; |
| 114 | } | 110 | } |
| 111 | +#else | ||
| 112 | + return -1; | ||
| 113 | +#endif | ||
| 115 | } | 114 | } |
| 116 | 115 | ||
| 117 | //解码opus并播放 | 116 | //解码opus并播放 |
| 118 | static int Opus_RealTimeVoice_PlayData(unsigned char *data,int len) | 117 | static int Opus_RealTimeVoice_PlayData(unsigned char *data,int len) |
| 119 | { | 118 | { |
| 119 | +#if MEGAPHONE_MODE == VERSION_SWITCH_ON | ||
| 120 | int i; | 120 | int i; |
| 121 | char pcm_bytes[WIDGET_SPEAKER_AUDIO_OPUS_MAX_FRAME_SIZE * WIDGET_SPEAKER_AUDIO_OPUS_CHANNELS * 2 ]; | 121 | char pcm_bytes[WIDGET_SPEAKER_AUDIO_OPUS_MAX_FRAME_SIZE * WIDGET_SPEAKER_AUDIO_OPUS_CHANNELS * 2 ]; |
| 122 | int frame_size; | 122 | int frame_size; |
| @@ -136,7 +136,7 @@ static int Opus_RealTimeVoice_PlayData(unsigned char *data,int len) | @@ -136,7 +136,7 @@ static int Opus_RealTimeVoice_PlayData(unsigned char *data,int len) | ||
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | Megaphone_RawPlay(RealTimeDecodeRate,pcm_bytes,frame_size*2);//播放音频 | 138 | Megaphone_RawPlay(RealTimeDecodeRate,pcm_bytes,frame_size*2);//播放音频 |
| 139 | - | 139 | +#endif |
| 140 | return 0; | 140 | return 0; |
| 141 | } | 141 | } |
| 142 | 142 | ||
| @@ -440,6 +440,7 @@ int Opus_RealTimeVoice_WriteDataToLoop(unsigned char *buf,int length) | @@ -440,6 +440,7 @@ int Opus_RealTimeVoice_WriteDataToLoop(unsigned char *buf,int length) | ||
| 440 | //释放解码器 | 440 | //释放解码器 |
| 441 | static int Opus_RealTimeVoice_DeinitDecoder() | 441 | static int Opus_RealTimeVoice_DeinitDecoder() |
| 442 | { | 442 | { |
| 443 | +#if MEGAPHONE_MODE == VERSION_SWITCH_ON | ||
| 443 | //1、关闭线程 | 444 | //1、关闭线程 |
| 444 | Opus_RealTimeVoice_LoopReadFlag=JZ_FLAGCODE_OFF;//关闭解码数据池自读 | 445 | Opus_RealTimeVoice_LoopReadFlag=JZ_FLAGCODE_OFF;//关闭解码数据池自读 |
| 445 | while (Opus_RealTimeVoice_LoopReadStopFlag == JZ_FLAGCODE_ON) | 446 | while (Opus_RealTimeVoice_LoopReadStopFlag == JZ_FLAGCODE_ON) |
| @@ -471,6 +472,7 @@ static int Opus_RealTimeVoice_DeinitDecoder() | @@ -471,6 +472,7 @@ static int Opus_RealTimeVoice_DeinitDecoder() | ||
| 471 | { | 472 | { |
| 472 | JZSDK_LOG_INFO("解码器为空"); | 473 | JZSDK_LOG_INFO("解码器为空"); |
| 473 | } | 474 | } |
| 475 | +#endif | ||
| 474 | } | 476 | } |
| 475 | 477 | ||
| 476 | 478 |
| @@ -9,6 +9,7 @@ | @@ -9,6 +9,7 @@ | ||
| 9 | #include "JZsdkLib.h" | 9 | #include "JZsdkLib.h" |
| 10 | #include "Megaphone_InputAndOutput.h" | 10 | #include "Megaphone_InputAndOutput.h" |
| 11 | #include "../Megaphone_Opus.h" | 11 | #include "../Megaphone_Opus.h" |
| 12 | +#include "version_choose.h" | ||
| 12 | 13 | ||
| 13 | #define OPUS_MAX_FRAME_SIZE (6 * 960) | 14 | #define OPUS_MAX_FRAME_SIZE (6 * 960) |
| 14 | #define OPUS_CHANNELS (1) | 15 | #define OPUS_CHANNELS (1) |
| @@ -22,8 +23,6 @@ static int s_decodeBitrate = 16000; //这个值由输入定 | @@ -22,8 +23,6 @@ static int s_decodeBitrate = 16000; //这个值由输入定 | ||
| 22 | static void *DecodeAudioData_task(void *arg); | 23 | static void *DecodeAudioData_task(void *arg); |
| 23 | static T_JZsdkReturnCode Opus_RecordVoice_DecodeFixedFile(); | 24 | static T_JZsdkReturnCode Opus_RecordVoice_DecodeFixedFile(); |
| 24 | 25 | ||
| 25 | - | ||
| 26 | - | ||
| 27 | FILE *SaveFixedOpus_fp; //固定opus的存储指针 | 26 | FILE *SaveFixedOpus_fp; //固定opus的存储指针 |
| 28 | static int SaveFixedOpus_len = 0; //固定opus的存储长度 | 27 | static int SaveFixedOpus_len = 0; //固定opus的存储长度 |
| 29 | static int OpusDecode_Flag = JZ_FLAGCODE_OFF ; //用于防止播放时解码未完成 | 28 | static int OpusDecode_Flag = JZ_FLAGCODE_OFF ; //用于防止播放时解码未完成 |
| @@ -287,6 +286,7 @@ int Opus_RecordVoice_PlayFixedFile() | @@ -287,6 +286,7 @@ int Opus_RecordVoice_PlayFixedFile() | ||
| 287 | */ | 286 | */ |
| 288 | static void *DecodeAudioData_task(void *arg) | 287 | static void *DecodeAudioData_task(void *arg) |
| 289 | { | 288 | { |
| 289 | +#if MEGAPHONE_MODE == VERSION_SWITCH_ON | ||
| 290 | FILE *fin = NULL; | 290 | FILE *fin = NULL; |
| 291 | FILE *fout = NULL; | 291 | FILE *fout = NULL; |
| 292 | OpusDecoder *decoder; | 292 | OpusDecoder *decoder; |
| @@ -418,7 +418,7 @@ DecodeFinsh: | @@ -418,7 +418,7 @@ DecodeFinsh: | ||
| 418 | 418 | ||
| 419 | //解码完成 | 419 | //解码完成 |
| 420 | printf("Decode Finished...\n"); | 420 | printf("Decode Finished...\n"); |
| 421 | - | 421 | +#endif |
| 422 | } | 422 | } |
| 423 | 423 | ||
| 424 | //获取opus的播放标志位 | 424 | //获取opus的播放标志位 |
| @@ -44,6 +44,8 @@ unsigned int old_command_timeMS = 0; | @@ -44,6 +44,8 @@ unsigned int old_command_timeMS = 0; | ||
| 44 | //大疆推流函数,将输入的视频帧,输入到DjiPayloadCamera_SendVideoStream | 44 | //大疆推流函数,将输入的视频帧,输入到DjiPayloadCamera_SendVideoStream |
| 45 | int DJI_VideoDeal_Push_DJIH264Frame(char* h264_data, uint32_t data_len) | 45 | int DJI_VideoDeal_Push_DJIH264Frame(char* h264_data, uint32_t data_len) |
| 46 | { | 46 | { |
| 47 | + //USER_LOG_INFO("推流%d",data_len); | ||
| 48 | + | ||
| 47 | static T_DjiReturnCode returnCode; | 49 | static T_DjiReturnCode returnCode; |
| 48 | static T_DjiDataChannelState videoStreamState = {0}; | 50 | static T_DjiDataChannelState videoStreamState = {0}; |
| 49 | 51 | ||
| @@ -103,6 +105,7 @@ static int DJI_VideoDeal_H264_TO_PUSH_DJIH264Frame(char* h264_data, uint32_t dat | @@ -103,6 +105,7 @@ static int DJI_VideoDeal_H264_TO_PUSH_DJIH264Frame(char* h264_data, uint32_t dat | ||
| 103 | //视频处理流程线程解锁函数,解锁后进行拍照、推流、录像等功能 | 105 | //视频处理流程线程解锁函数,解锁后进行拍照、推流、录像等功能 |
| 104 | int DJI_VideoDeal_UnlockSendPush() | 106 | int DJI_VideoDeal_UnlockSendPush() |
| 105 | { | 107 | { |
| 108 | + //USER_LOG_INFO("实时推流"); | ||
| 106 | JZsdk_Camera_FrameDealThread_UnlockFun(); | 109 | JZsdk_Camera_FrameDealThread_UnlockFun(); |
| 107 | } | 110 | } |
| 108 | 111 |
| @@ -837,17 +837,10 @@ static int CutPitchNum = 0; | @@ -837,17 +837,10 @@ static int CutPitchNum = 0; | ||
| 837 | //为避免程序崩溃,拨轮调节不会设置任何ui变化 | 837 | //为避免程序崩溃,拨轮调节不会设置任何ui变化 |
| 838 | T_JZsdkReturnCode JZsdk_Psdk_Ui_io_Gimbal_PitchRotationMode(int Pitch) | 838 | T_JZsdkReturnCode JZsdk_Psdk_Ui_io_Gimbal_PitchRotationMode(int Pitch) |
| 839 | { | 839 | { |
| 840 | - | ||
| 841 | //1、将得到的拨轮pitch值裁切,避免变化角度过大 | 840 | //1、将得到的拨轮pitch值裁切,避免变化角度过大 |
| 842 | int CutPitch = Pitch/50; | 841 | int CutPitch = Pitch/50; |
| 843 | 842 | ||
| 844 | - CutPitchNum+=1; | ||
| 845 | - | ||
| 846 | - if (CutPitchNum == 1) | ||
| 847 | - { | ||
| 848 | - CutPitchNum = 0; | ||
| 849 | - Gimbal_PitchRotationMode(CutPitch); | ||
| 850 | - } | 843 | + Gimbal_PitchRotationMode(CutPitch); |
| 851 | } | 844 | } |
| 852 | 845 | ||
| 853 | //云台控制 pitch直接角度控制 / 云台联动控制 | 846 | //云台控制 pitch直接角度控制 / 云台联动控制 |
Upgrade_Package/JZ_H150S_V00.00.01.09.bin
0 → 100644
不能预览此文件类型
Upgrade_Package/JZ_U3_V00.00.01.08.bin
已删除
100644 → 0
不能预览此文件类型
不能预览此文件类型
| 1 | #1、输入设备名字,程序模式,硬件号,版本号 | 1 | #1、输入设备名字,程序模式,硬件号,版本号 |
| 2 | -payload_name="JZ_U3" | 2 | +payload_name="JZ_H150S" #psdk名字 |
| 3 | payload_mode="APP_UART" # APP_PSDK 或者 APP_UART APP_TEST | 3 | payload_mode="APP_UART" # APP_PSDK 或者 APP_UART APP_TEST |
| 4 | -payload_platform="PLATFORM_V3S" | ||
| 5 | -payload_version="V00.00.01.08" | ||
| 6 | -payload_origin="OVERSEAS_VERSION" # 国内版 DOMESTIC_VERSION 海外版 OVERSEAS_VERSION | 4 | +payload_platform="PLATFORM_H3" #硬件平台 |
| 5 | +payload_version="V00.00.01.09" #版本号 | ||
| 6 | +payload_origin="DOMESTIC_VERSION" # 国内版 DOMESTIC_VERSION 海外版 OVERSEAS_VERSION | ||
| 7 | payload_special="SPECIAL_NORMAL" # 特殊固件注释 | 7 | payload_special="SPECIAL_NORMAL" # 特殊固件注释 |
| 8 | # 目前已有的特殊版本类型 | 8 | # 目前已有的特殊版本类型 |
| 9 | # SPECIAL_NORMAL 普通版本 | 9 | # SPECIAL_NORMAL 普通版本 |
| 10 | # SPECIAL_DAOTONG 道通版本 | 10 | # SPECIAL_DAOTONG 道通版本 |
| 11 | 11 | ||
| 12 | -#2、根据负载选择滤波方式,目前仅h10使用带阻滤波 | ||
| 13 | -#high_pass_filtering | ||
| 14 | -#directed_stopband_filtering | ||
| 15 | -#if [ "${payload_name}" == "JZ_H10" ] || [ "${payload_name}" == "JZ_U3" ]; then | ||
| 16 | -if [ "${payload_name}" == "JZ_H10" ] ; then | ||
| 17 | - filtering_way="directed_stopband_filtering" | ||
| 18 | - filter_type="DIRECTED_STOPBAND_FILTERING" | 12 | +#2、识别设备类型,并设置编译链 |
| 13 | +if [ "${payload_name}" == "JZ_H150S" ] || | ||
| 14 | + [ "${payload_name}" == "JZ_H150T" ] || | ||
| 15 | + [ "${payload_name}" == "JZ_H10" ] || | ||
| 16 | + [ "${payload_name}" == "JZ_H10T" ] || | ||
| 17 | + [ "${payload_name}" == "JZ_H1T" ] || | ||
| 18 | + [ "${payload_name}" == "JZ_H1E" ] || | ||
| 19 | + [ "${payload_name}" == "JZ_U3" ] || | ||
| 20 | + [ "${payload_name}" == "TF_A1" ]; then | ||
| 21 | + payload_type="MEGAPHONE" | ||
| 22 | + Compiler_CMake="set(MAKE_COMPILER ARM_CORTEXA9_LINUX) " | ||
| 23 | +elif [ "${payload_name}" == "JZ_IRC" ]; then | ||
| 24 | + payload_type="CAMERA" | ||
| 25 | + Compiler_CMake="set(MAKE_COMPILER ARM_X86_64_ARRCH64) " | ||
| 19 | else | 26 | else |
| 20 | - filtering_way="high_pass_filtering" | ||
| 21 | - filter_type="HIGH_PASS_FILTERING" | 27 | + payload_type="OTHER_TYPE" |
| 22 | fi | 28 | fi |
| 23 | 29 | ||
| 30 | +sed -i "33s/.*/$Compiler_CMake/" ../CMakeLists.txt | ||
| 31 | + | ||
| 24 | #3、特殊库的引入 | 32 | #3、特殊库的引入 |
| 25 | # 开 VERSION_SWITCH_ON 关 VERSION_SWITCH_OFF | 33 | # 开 VERSION_SWITCH_ON 关 VERSION_SWITCH_OFF |
| 26 | CedarxLib="VERSION_SWITCH_OFF" | 34 | CedarxLib="VERSION_SWITCH_OFF" |
| @@ -36,7 +44,28 @@ fi | @@ -36,7 +44,28 @@ fi | ||
| 36 | sed -i "30s/.*/$CedarXLib_CMake/" ../CMakeLists.txt | 44 | sed -i "30s/.*/$CedarXLib_CMake/" ../CMakeLists.txt |
| 37 | sed -i "34s/.*/$CedarXLib_Version/" ../application/version_choose.h | 45 | sed -i "34s/.*/$CedarXLib_Version/" ../application/version_choose.h |
| 38 | 46 | ||
| 39 | - #0x02库 | 47 | + #0x02库 音频库 |
| 48 | + #根据负载选择滤波方式,目前仅h10使用带阻滤波 | ||
| 49 | + #high_pass_filtering | ||
| 50 | + #directed_stopband_filtering | ||
| 51 | + if [ "${payload_name}" == "JZ_H10" ] ; then | ||
| 52 | + filtering_way="directed_stopband_filtering" | ||
| 53 | + filter_type="DIRECTED_STOPBAND_FILTERING" | ||
| 54 | + elif [ "${payload_name}" == "JZ_IRC" ] ; then #无音频库 | ||
| 55 | + filtering_way="OFF" | ||
| 56 | + filter_type="OFF" | ||
| 57 | + else | ||
| 58 | + filtering_way="high_pass_filtering" | ||
| 59 | + filter_type="HIGH_PASS_FILTERING" | ||
| 60 | + fi | ||
| 61 | + | ||
| 62 | + #将滤波方式写进cmake文件 | ||
| 63 | + cmake_filtering="set(filtering_type ${filtering_way}) " | ||
| 64 | + sed -i "24s/.*/$cmake_filtering/" ../CMakeLists.txt | ||
| 65 | + | ||
| 66 | + #将滤波方式写进version_choose.h | ||
| 67 | + filter_type_text="#define FILTERING_TYPE ${filter_type}" | ||
| 68 | + sed -i "25s/.*/$filter_type_text/" ../application/version_choose.h | ||
| 40 | 69 | ||
| 41 | # #将工程名进cmake文件 | 70 | # #将工程名进cmake文件 |
| 42 | # # 国内版 | 71 | # # 国内版 |
Upgrade_Package_h1t.zip
0 → 100644
不能预览此文件类型
Upgrade_Package_h1t/JZ_H1T_V00.00.01.09.bin
0 → 100644
不能预览此文件类型
不能预览此文件类型
Upgrade_Package_h1t/Package/psdk/JZ_H1T
0 → 100644
不能预览此文件类型
不能预览此文件类型
Upgrade_Package_h1t/ShellPack/shellpack.sh
0 → 100644
| 1 | +#!/bin/bash | ||
| 2 | + | ||
| 3 | +TarPackage_second=UpgradePackage.tar.gz #二次解压包的名字 | ||
| 4 | + | ||
| 5 | +#获取更新脚本所在的文件夹名字 | ||
| 6 | +cd .. | ||
| 7 | +dir_name=$(basename "$(dirname "$(readlink -f "$0")")" ) | ||
| 8 | + | ||
| 9 | +echo "_____清除build文件夹内容_____" | ||
| 10 | +cd ../build | ||
| 11 | +rm -rf * | ||
| 12 | + | ||
| 13 | +# echo "_____cmake编译make目录_____" | ||
| 14 | +# cmake .. | ||
| 15 | + | ||
| 16 | +# echo "_____8核编译PSDK_____" | ||
| 17 | +# make -j8 | ||
| 18 | + | ||
| 19 | +echo "_____回到打包目录_____" | ||
| 20 | +cd ../$dir_name | ||
| 21 | + | ||
| 22 | +echo "_____删除上一个更新包内容_____" | ||
| 23 | + | ||
| 24 | +# 如果存在串口程序,删除 | ||
| 25 | +if [ -f ./Package/app/* ]; then | ||
| 26 | + rm ./Package/app/* | ||
| 27 | +fi | ||
| 28 | + | ||
| 29 | +# 如果存在bin包,删除 | ||
| 30 | +if [ -f ./*.bin ]; then | ||
| 31 | + rm *.bin | ||
| 32 | +fi | ||
| 33 | + | ||
| 34 | +# 如果存在二次压缩包,删除 | ||
| 35 | +if [ -f ./$TarPackage_second ]; then | ||
| 36 | + rm $TarPackage_second | ||
| 37 | +fi | ||
| 38 | + | ||
| 39 | +echo "_____复制应用程序到psdk目录下_____" | ||
| 40 | + | ||
| 41 | +# #复制psdk程序,没有就退出脚本 | ||
| 42 | +# if [ -f ../build/JZ_* ]; then | ||
| 43 | +# cp ../build/JZ_* ./Package/app/ | ||
| 44 | +# else | ||
| 45 | +# echo "___没有串口程序,脚本退出____" | ||
| 46 | +# exit | ||
| 47 | +# fi | ||
| 48 | + | ||
| 49 | +echo "_____使用gzip打包 应用程序 和 更新包内容_____" | ||
| 50 | +#二次压缩包的打包 | ||
| 51 | +tar -zcf $TarPackage_second Package | ||
| 52 | + | ||
| 53 | +echo "_____输出当前目录_____" | ||
| 54 | +ls -la | ||
| 55 | + | ||
| 56 | +echo "_____输出二次压缩包目录_____" | ||
| 57 | +#参数说明 t 查看内容 f 压缩包名字指定 | ||
| 58 | +tar -tf $TarPackage_second | ||
| 59 | + | ||
| 60 | +echo "___shellpack.sh执行完毕____"; |
Upgrade_Package_h1t/make_package.sh
0 → 100644
| 1 | +#1、输入设备名字,程序模式,硬件号,版本号 | ||
| 2 | +payload_name="JZ_H1E" #psdk名字 | ||
| 3 | +payload_mode="APP_UART" # APP_PSDK 或者 APP_UART APP_TEST | ||
| 4 | +payload_platform="PLATFORM_H3" #硬件平台 | ||
| 5 | +payload_version="V00.00.01.09" #版本号 | ||
| 6 | +payload_origin="DOMESTIC_VERSION" # 国内版 DOMESTIC_VERSION 海外版 OVERSEAS_VERSION | ||
| 7 | +payload_special="SPECIAL_NORMAL" # 特殊固件注释 | ||
| 8 | +# 目前已有的特殊版本类型 | ||
| 9 | +# SPECIAL_NORMAL 普通版本 | ||
| 10 | +# SPECIAL_DAOTONG 道通版本 | ||
| 11 | + | ||
| 12 | +# #2、识别设备类型,并设置编译链 | ||
| 13 | +# if [ "${payload_name}" == "JZ_H150S" ] || | ||
| 14 | +# [ "${payload_name}" == "JZ_H150T" ] || | ||
| 15 | +# [ "${payload_name}" == "JZ_H10" ] || | ||
| 16 | +# [ "${payload_name}" == "JZ_H10T" ] || | ||
| 17 | +# [ "${payload_name}" == "JZ_H1T" ] || | ||
| 18 | +# [ "${payload_name}" == "JZ_H1E" ] || | ||
| 19 | +# [ "${payload_name}" == "JZ_U3" ] || | ||
| 20 | +# [ "${payload_name}" == "TF_A1" ]; then | ||
| 21 | +# payload_type="MEGAPHONE" | ||
| 22 | +# Compiler_CMake="set(MAKE_COMPILER ARM_CORTEXA9_LINUX) " | ||
| 23 | +# elif [ "${payload_name}" == "JZ_IRC" ]; then | ||
| 24 | +# payload_type="CAMERA" | ||
| 25 | +# Compiler_CMake="set(MAKE_COMPILER ARM_X86_64_ARRCH64) " | ||
| 26 | +# else | ||
| 27 | +# payload_type="OTHER_TYPE" | ||
| 28 | +# fi | ||
| 29 | + | ||
| 30 | +# sed -i "33s/.*/$Compiler_CMake/" ../CMakeLists.txt | ||
| 31 | + | ||
| 32 | +# #3、特殊库的引入 | ||
| 33 | +# # 开 VERSION_SWITCH_ON 关 VERSION_SWITCH_OFF | ||
| 34 | +# CedarxLib="VERSION_SWITCH_OFF" | ||
| 35 | + | ||
| 36 | +# #0x01库 全志编解码 | ||
| 37 | +# if [ "${CedarxLib}" == "VERSION_SWITCH_ON" ] ; then | ||
| 38 | +# CedarXLib_CMake="set(CedarxLib VERSION_SWITCH_ON) " | ||
| 39 | +# CedarXLib_Version="#define ALLWINNER_CEDAR VERSION_SWITCH_ON" | ||
| 40 | +# else | ||
| 41 | +# CedarXLib_CMake="set(CedarxLib VERSION_SWITCH_OFF) " | ||
| 42 | +# CedarXLib_Version="#define ALLWINNER_CEDAR VERSION_SWITCH_OFF" | ||
| 43 | +# fi | ||
| 44 | +# sed -i "30s/.*/$CedarXLib_CMake/" ../CMakeLists.txt | ||
| 45 | +# sed -i "34s/.*/$CedarXLib_Version/" ../application/version_choose.h | ||
| 46 | + | ||
| 47 | +# #0x02库 音频库 | ||
| 48 | +# #根据负载选择滤波方式,目前仅h10使用带阻滤波 | ||
| 49 | +# #high_pass_filtering | ||
| 50 | +# #directed_stopband_filtering | ||
| 51 | +# if [ "${payload_name}" == "JZ_H10" ] ; then | ||
| 52 | +# filtering_way="directed_stopband_filtering" | ||
| 53 | +# filter_type="DIRECTED_STOPBAND_FILTERING" | ||
| 54 | +# elif [ "${payload_name}" == "JZ_IRC" ] ; then #无音频库 | ||
| 55 | +# filtering_way="OFF" | ||
| 56 | +# filter_type="OFF" | ||
| 57 | +# else | ||
| 58 | +# filtering_way="high_pass_filtering" | ||
| 59 | +# filter_type="HIGH_PASS_FILTERING" | ||
| 60 | +# fi | ||
| 61 | + | ||
| 62 | +# #将滤波方式写进cmake文件 | ||
| 63 | +# cmake_filtering="set(filtering_type ${filtering_way}) " | ||
| 64 | +# sed -i "24s/.*/$cmake_filtering/" ../CMakeLists.txt | ||
| 65 | + | ||
| 66 | +# #将滤波方式写进version_choose.h | ||
| 67 | +# filter_type_text="#define FILTERING_TYPE ${filter_type}" | ||
| 68 | +# sed -i "25s/.*/$filter_type_text/" ../application/version_choose.h | ||
| 69 | + | ||
| 70 | +# # #将工程名进cmake文件 | ||
| 71 | +# # # 国内版 | ||
| 72 | +# # if [ "${payload_origin}" == "DOMESTIC_VERSION" ]; then | ||
| 73 | +# # cmake_filtering="project(${payload_name}) " | ||
| 74 | +# # sed -i "3s/.*/$cmake_filtering/" ../CMakeLists.txt | ||
| 75 | +# # # 海外版 | ||
| 76 | +# # elif [ "${payload_origin}" == "OVERSEAS_VERSION" ]; then | ||
| 77 | +# # if [[ $payload_name == *"_"* ]]; then | ||
| 78 | +# # replaced_payload_name=${payload_name//_/-} | ||
| 79 | +# # echo "替换前的工程名: $payload_name" | ||
| 80 | +# # echo "替换后的工程名: $replaced_payload_name" | ||
| 81 | +# # cmake_filtering="project(${replaced_payload_name}) " | ||
| 82 | +# # sed -i "3s/.*/$cmake_filtering/" ../CMakeLists.txt | ||
| 83 | +# # else | ||
| 84 | +# # echo "出错,这个名字不含_符号,请修改你的工程名" | ||
| 85 | +# # exit | ||
| 86 | +# # fi | ||
| 87 | +# # fi | ||
| 88 | + | ||
| 89 | +# #将滤波方式写进cmake文件 | ||
| 90 | +# cmake_filtering="set(filtering_type ${filtering_way}) " | ||
| 91 | +# sed -i "24s/.*/$cmake_filtering/" ../CMakeLists.txt | ||
| 92 | + | ||
| 93 | +# #将滤波方式写进version_choose.h | ||
| 94 | +# filter_type_text="#define FILTERING_TYPE ${filter_type}" | ||
| 95 | +# sed -i "25s/.*/$filter_type_text/" ../application/version_choose.h | ||
| 96 | + | ||
| 97 | +# #将固件特殊类型名写入version_choose.h | ||
| 98 | +# payload_special_text="#define SPECIAL_VERSION ${payload_special}" | ||
| 99 | +# sed -i "31s/.*/$payload_special_text/" ../application/version_choose.h | ||
| 100 | + | ||
| 101 | +# #3、将负载版本 负载模式 负载平台 负载版本号 写入version_choose.h | ||
| 102 | +# #负载版本 | ||
| 103 | +# name_text="#define DEVICE_VERSION ${payload_name}" | ||
| 104 | +# echo $name_text | ||
| 105 | +# sed -i "10s/.*/$name_text/" ../application/version_choose.h | ||
| 106 | + | ||
| 107 | +# #负载模式 | ||
| 108 | +# mode_text="#define APP_VERSION ${payload_mode}" | ||
| 109 | +# echo $mode_text | ||
| 110 | +# sed -i "13s/.*/$mode_text/" ../application/version_choose.h | ||
| 111 | + | ||
| 112 | +# #负载平台 | ||
| 113 | +# platform_text="#define PLATFORM_VERSION ${payload_platform}" | ||
| 114 | +# echo $platform_text | ||
| 115 | +# sed -i "16s/.*/$platform_text/" ../application/version_choose.h | ||
| 116 | + | ||
| 117 | +# #负载版本号 | ||
| 118 | +# # 提取版本号的四个部分 | ||
| 119 | +# payload_version_part1=${payload_version:1:2} # 截取第2和第3个字符 | ||
| 120 | +# payload_version_part2=${payload_version:4:2} # 截取第5和第6个字符 | ||
| 121 | +# payload_version_part3=${payload_version:7:2} # 截取第8和第9个字符 | ||
| 122 | +# payload_version_part4=${payload_version:10:2} # 截取第11和第12个字符 | ||
| 123 | + | ||
| 124 | +# version_text="#define MAJOR_VERSION 0x${payload_version_part1}" | ||
| 125 | +# echo $version_text | ||
| 126 | +# sed -i "19s/.*/$version_text/" ../application/version_choose.h | ||
| 127 | +# version_text="#define MINOR_VERSION 0x${payload_version_part2}" | ||
| 128 | +# echo $version_text | ||
| 129 | +# sed -i "20s/.*/$version_text/" ../application/version_choose.h | ||
| 130 | +# version_text="#define MODIFY_VERSION 0x${payload_version_part3}" | ||
| 131 | +# echo $version_text | ||
| 132 | +# sed -i "21s/.*/$version_text/" ../application/version_choose.h | ||
| 133 | +# version_text="#define DEBUG_VERSION 0x${payload_version_part4}" | ||
| 134 | +# echo $version_text | ||
| 135 | +# sed -i "22s/.*/$version_text/" ../application/version_choose.h | ||
| 136 | + | ||
| 137 | +# # 负载的固件归属地 | ||
| 138 | +# # 修改cmake文件,是否需要加载海外tts库 | ||
| 139 | +# cmake_origin="set(firewarm_origin ${payload_origin}) " | ||
| 140 | +# sed -i "27s/.*/$cmake_origin/" ../CMakeLists.txt | ||
| 141 | +# # 修改version.h,是否需要加载海外tts模块 | ||
| 142 | +# version_origin="#define FIRMWARE_ORIGIN ${payload_origin}" | ||
| 143 | +# sed -i "28s/.*/$version_origin/" ../application/version_choose.h | ||
| 144 | + | ||
| 145 | +#打包诱骗升级包 | ||
| 146 | +# 拼接字符串得到更新包名字 | ||
| 147 | +BinName=$payload_name"_"$payload_version".bin" | ||
| 148 | +TarPackage_second=UpgradePackage.tar.gz #二次解压包的名字 | ||
| 149 | +MD5saveFile=UpdateMD5num #md5文件内部的md5值 | ||
| 150 | + | ||
| 151 | +#二次压缩包的打包 | ||
| 152 | +cd ShellPack | ||
| 153 | +./shellpack.sh | ||
| 154 | +cd ../ | ||
| 155 | + | ||
| 156 | +#一次压缩包的打包 | ||
| 157 | +mkdir Temp | ||
| 158 | +mv $TarPackage_second ./Temp/ # 二次压缩包 | ||
| 159 | + | ||
| 160 | +#md5 校准 | ||
| 161 | +# 获取文件的md5值 | ||
| 162 | +cd Temp | ||
| 163 | +md5_File="$(md5sum "$TarPackage_second" | cut -d ' ' -f 1)" | ||
| 164 | +echo $md5_File | ||
| 165 | + | ||
| 166 | +#把md5校准码写进去 | ||
| 167 | +echo $md5_File | tee $MD5saveFile > /dev/null #覆盖写 | ||
| 168 | + | ||
| 169 | +tar -zcf $BinName * | ||
| 170 | +mv $BinName ../ | ||
| 171 | +cd ../ | ||
| 172 | +rm -rf Temp | ||
| 173 | + | ||
| 174 | +echo "_____输出一次压缩包目录_____" | ||
| 175 | +#参数说明 t 查看内容 f 压缩包名字指定 | ||
| 176 | +tar -tf $BinName |
| @@ -17,6 +17,7 @@ | @@ -17,6 +17,7 @@ | ||
| 17 | #include "Dji_Control/DJI_WidgetControl.h" | 17 | #include "Dji_Control/DJI_WidgetControl.h" |
| 18 | #include "Lighting_InAndOut.h" | 18 | #include "Lighting_InAndOut.h" |
| 19 | #include "Camera_InAndOut.h" | 19 | #include "Camera_InAndOut.h" |
| 20 | +#include "JZsdk_network/JZsdk_network.h" | ||
| 20 | 21 | ||
| 21 | #include "JZsdk_TaskManagement/TaskManagement.h" | 22 | #include "JZsdk_TaskManagement/TaskManagement.h" |
| 22 | 23 | ||
| @@ -44,7 +45,8 @@ extern int MegaphoneStatusFlag; | @@ -44,7 +45,8 @@ extern int MegaphoneStatusFlag; | ||
| 44 | int Main_Device_Wheather_Use() | 45 | int Main_Device_Wheather_Use() |
| 45 | { | 46 | { |
| 46 | //先判断是否有激活 | 47 | //先判断是否有激活 |
| 47 | - if (SerialMAT_Get_SerialNumberStatus() != JZ_FLAGCODE_ON) | 48 | + T_JZsdkReturnCode ret = SerialMAT_Get_SerialNumberStatus(); |
| 49 | + if(ret == 0x02 || ret == 0x03) | ||
| 48 | { | 50 | { |
| 49 | //未激活 返回1 | 51 | //未激活 返回1 |
| 50 | return 1; | 52 | return 1; |
| @@ -202,6 +204,16 @@ int Main_APP_Psdk() | @@ -202,6 +204,16 @@ int Main_APP_Psdk() | ||
| 202 | #endif | 204 | #endif |
| 203 | } | 205 | } |
| 204 | 206 | ||
| 207 | + else if (DEVICE_VERSION == JZ_IRC) | ||
| 208 | + { | ||
| 209 | + //云台初始化 | ||
| 210 | + Gimbal_Init(); | ||
| 211 | + | ||
| 212 | + //相机初始化 | ||
| 213 | + JZsdk_CameraMuduleInit(); | ||
| 214 | + } | ||
| 215 | + | ||
| 216 | + | ||
| 205 | //初始化dji控件 | 217 | //初始化dji控件 |
| 206 | DJI_WidgetControlInit(); | 218 | DJI_WidgetControlInit(); |
| 207 | 219 | ||
| @@ -259,17 +271,23 @@ int Main_APP_Uart() | @@ -259,17 +271,23 @@ int Main_APP_Uart() | ||
| 259 | //串口设备1初始化 | 271 | //串口设备1初始化 |
| 260 | JZsdk_Uart_Init(UART_DEV_1); | 272 | JZsdk_Uart_Init(UART_DEV_1); |
| 261 | 273 | ||
| 274 | + //网口初始化 | ||
| 275 | + JZsdk_NetWork_Init(); | ||
| 276 | + | ||
| 262 | if (DEVICE_VERSION == JZ_H150T) | 277 | if (DEVICE_VERSION == JZ_H150T) |
| 263 | { | 278 | { |
| 264 | //4g设备初始化 | 279 | //4g设备初始化 |
| 265 | JZsdk_Uart_Init(UART_4G); | 280 | JZsdk_Uart_Init(UART_4G); |
| 266 | } | 281 | } |
| 267 | 282 | ||
| 268 | - //喊话器初始化 | ||
| 269 | - Megaphone_Init(); | ||
| 270 | - | ||
| 271 | //云台初始化 | 283 | //云台初始化 |
| 272 | Gimbal_Init(); | 284 | Gimbal_Init(); |
| 285 | + | ||
| 286 | + //相机初始化 | ||
| 287 | + JZsdk_CameraMuduleInit(); | ||
| 288 | + | ||
| 289 | + //喊话器初始化 | ||
| 290 | + Megaphone_Init(); | ||
| 273 | } | 291 | } |
| 274 | 292 | ||
| 275 | if (DEVICE_VERSION == JZ_H10) | 293 | if (DEVICE_VERSION == JZ_H10) |
| @@ -371,20 +389,46 @@ static int Main_WorkMode() | @@ -371,20 +389,46 @@ static int Main_WorkMode() | ||
| 371 | } | 389 | } |
| 372 | } | 390 | } |
| 373 | 391 | ||
| 392 | +static T_JZsdkReturnCode Start_voice() | ||
| 393 | +{ | ||
| 394 | + if (APP_VERSION == APP_UART) | ||
| 395 | + { | ||
| 396 | + if (SPECIAL_VERSION == SPECIAL_DAOTONG) | ||
| 397 | + { | ||
| 398 | + | ||
| 399 | + } | ||
| 400 | + else | ||
| 401 | + { | ||
| 402 | +#if FIRMWARE_ORIGIN == DOMESTIC_VERSION //国内版才有方言 | ||
| 403 | + //播放喊话器启动中 | ||
| 404 | + Megaphone_TTS_Play(strlen("喊话器直连模式启动中"), "喊话器直连模式启动中", 0); | ||
| 405 | +#elif FIRMWARE_ORIGIN == OVERSEAS_VERSION //海外版才有其他国家的语音 | ||
| 406 | + //设置语音为英文 | ||
| 407 | + Megaphone_TTS_SetTone(0x11); | ||
| 408 | + | ||
| 409 | + //播放喊话器启动中 | ||
| 410 | + Megaphone_TTS_Play(strlen("The direct connection mode of the speaker is being activated"),"The direct connection mode of the speaker is being activated", 0); | ||
| 411 | +#endif | ||
| 412 | + | ||
| 413 | + delayS(4); | ||
| 414 | + } | ||
| 415 | + } | ||
| 416 | +} | ||
| 417 | + | ||
| 374 | static T_JZsdkReturnCode Start_up_and_broadcast_voice() | 418 | static T_JZsdkReturnCode Start_up_and_broadcast_voice() |
| 375 | { | 419 | { |
| 376 | if (APP_VERSION == APP_PSDK) | 420 | if (APP_VERSION == APP_PSDK) |
| 377 | { | 421 | { |
| 378 | #if FIRMWARE_ORIGIN == DOMESTIC_VERSION //国内版才有方言 | 422 | #if FIRMWARE_ORIGIN == DOMESTIC_VERSION //国内版才有方言 |
| 379 | - //播放喊话器启动中 | 423 | + //播放喊话器准备就绪 |
| 380 | Megaphone_TTS_Play(strlen("喊话器准备就绪"), "喊话器准备就绪", 0); | 424 | Megaphone_TTS_Play(strlen("喊话器准备就绪"), "喊话器准备就绪", 0); |
| 381 | #elif FIRMWARE_ORIGIN == OVERSEAS_VERSION //海外版才有其他国家的语音 | 425 | #elif FIRMWARE_ORIGIN == OVERSEAS_VERSION //海外版才有其他国家的语音 |
| 382 | //设置语音为英文 | 426 | //设置语音为英文 |
| 383 | Megaphone_TTS_SetTone(0x11); | 427 | Megaphone_TTS_SetTone(0x11); |
| 384 | 428 | ||
| 385 | - //播放喊话器启动中 | ||
| 386 | - Megaphone_TTS_Play(strlen("The direct connection mode of the speaker is being activated"),"The direct connection mode of the speaker is being activated", 0); | ||
| 387 | -#endif | 429 | + //播放喊话器准备就绪 |
| 430 | + Megaphone_TTS_Play(strlen("Speaker Ready"),"Speaker Ready", 0); | ||
| 431 | + #endif | ||
| 388 | } | 432 | } |
| 389 | 433 | ||
| 390 | else if (APP_VERSION == APP_UART) | 434 | else if (APP_VERSION == APP_UART) |
| @@ -423,6 +467,7 @@ static void *Main_WorkModeTask(void *arg) | @@ -423,6 +467,7 @@ static void *Main_WorkModeTask(void *arg) | ||
| 423 | //计时flag | 467 | //计时flag |
| 424 | int i=0; | 468 | int i=0; |
| 425 | printf("进入串口等待函数\n"); | 469 | printf("进入串口等待函数\n"); |
| 470 | + int start_voice_flag = JZ_FLAGCODE_OFF; | ||
| 426 | 471 | ||
| 427 | #if APP_VERSION == APP_UART | 472 | #if APP_VERSION == APP_UART |
| 428 | for (i = 0; i < 60; i++) | 473 | for (i = 0; i < 60; i++) |
| @@ -430,6 +475,12 @@ static void *Main_WorkModeTask(void *arg) | @@ -430,6 +475,12 @@ static void *Main_WorkModeTask(void *arg) | ||
| 430 | delayMs(1000);//延迟一秒钟 | 475 | delayMs(1000);//延迟一秒钟 |
| 431 | printf("计数%d\n",i); | 476 | printf("计数%d\n",i); |
| 432 | 477 | ||
| 478 | + if (start_voice_flag == JZ_FLAGCODE_OFF && MegaphoneStatusFlag == JZ_FLAGCODE_ON) | ||
| 479 | + { | ||
| 480 | + start_voice_flag = JZ_FLAGCODE_ON; | ||
| 481 | + Start_voice(); | ||
| 482 | + } | ||
| 483 | + | ||
| 433 | if (WorkMode == JZ_FLAGCODE_ON) | 484 | if (WorkMode == JZ_FLAGCODE_ON) |
| 434 | { | 485 | { |
| 435 | printf("串口连接成功,进入串口模式\n"); | 486 | printf("串口连接成功,进入串口模式\n"); |
| @@ -448,16 +499,25 @@ static void *Main_WorkModeTask(void *arg) | @@ -448,16 +499,25 @@ static void *Main_WorkModeTask(void *arg) | ||
| 448 | 499 | ||
| 449 | #endif | 500 | #endif |
| 450 | 501 | ||
| 502 | +#if MEGAPHONE_MODE == VERSION_SWITCH_ON | ||
| 451 | while (1) | 503 | while (1) |
| 452 | { | 504 | { |
| 505 | + if (start_voice_flag == JZ_FLAGCODE_OFF && MegaphoneStatusFlag == JZ_FLAGCODE_ON) | ||
| 506 | + { | ||
| 507 | + start_voice_flag = JZ_FLAGCODE_ON; | ||
| 508 | + Start_voice(); | ||
| 509 | + } | ||
| 510 | + | ||
| 453 | //如果开启工作模式已经打开,且喊话模块已经初始化完毕,播报启动完成 | 511 | //如果开启工作模式已经打开,且喊话模块已经初始化完毕,播报启动完成 |
| 454 | - if (WorkMode == JZ_FLAGCODE_ON && MegaphoneStatusFlag == JZ_FLAGCODE_ON) | 512 | + if (WorkMode == JZ_FLAGCODE_ON && MegaphoneStatusFlag == JZ_FLAGCODE_ON && start_voice_flag == JZ_FLAGCODE_ON) |
| 455 | { | 513 | { |
| 514 | + | ||
| 456 | Start_up_and_broadcast_voice(); | 515 | Start_up_and_broadcast_voice(); |
| 457 | break; | 516 | break; |
| 458 | } | 517 | } |
| 459 | 518 | ||
| 460 | delayMs(100); | 519 | delayMs(100); |
| 461 | } | 520 | } |
| 521 | +#endif | ||
| 462 | } | 522 | } |
| 463 | 523 |
| @@ -17,7 +17,12 @@ | @@ -17,7 +17,12 @@ | ||
| 17 | #include "Dji_Control/DJI_WidgetControl.h" | 17 | #include "Dji_Control/DJI_WidgetControl.h" |
| 18 | #include "Lighting_InAndOut.h" | 18 | #include "Lighting_InAndOut.h" |
| 19 | #include "Camera_InAndOut.h" | 19 | #include "Camera_InAndOut.h" |
| 20 | + | ||
| 21 | +#include "JZsdk_TaskManagement/TaskManagement.h" | ||
| 22 | + | ||
| 23 | +#if APP_VERSION == APP_PSDK | ||
| 20 | #include "fc_subscription/test_fc_subscription.h" | 24 | #include "fc_subscription/test_fc_subscription.h" |
| 25 | +#endif | ||
| 21 | #include "./SerialMAT_InAndOut.h" | 26 | #include "./SerialMAT_InAndOut.h" |
| 22 | 27 | ||
| 23 | 28 | ||
| @@ -39,7 +44,8 @@ extern int MegaphoneStatusFlag; | @@ -39,7 +44,8 @@ extern int MegaphoneStatusFlag; | ||
| 39 | int Main_Device_Wheather_Use() | 44 | int Main_Device_Wheather_Use() |
| 40 | { | 45 | { |
| 41 | //先判断是否有激活 | 46 | //先判断是否有激活 |
| 42 | - if (SerialMAT_Get_SerialNumberStatus() != JZ_FLAGCODE_ON) | 47 | + T_JZsdkReturnCode ret = SerialMAT_Get_SerialNumberStatus(); |
| 48 | + if(ret == 0x02 || ret == 0x03) | ||
| 43 | { | 49 | { |
| 44 | //未激活 返回1 | 50 | //未激活 返回1 |
| 45 | return 1; | 51 | return 1; |
| @@ -211,12 +217,13 @@ int Main_APP_Psdk() | @@ -211,12 +217,13 @@ int Main_APP_Psdk() | ||
| 211 | 217 | ||
| 212 | int Main_APP_Uart() | 218 | int Main_APP_Uart() |
| 213 | { | 219 | { |
| 220 | + //lib库初始化 | ||
| 214 | JZsdk_LibInit(); | 221 | JZsdk_LibInit(); |
| 215 | - | 222 | + |
| 216 | JZSDK_LOG_INFO("%x,UartVersion%x.%x.%x.%x\n",DEVICE_VERSION,MAJOR_VERSION, MINOR_VERSION, MODIFY_VERSION, DEBUG_VERSION); | 223 | JZSDK_LOG_INFO("%x,UartVersion%x.%x.%x.%x\n",DEVICE_VERSION,MAJOR_VERSION, MINOR_VERSION, MODIFY_VERSION, DEBUG_VERSION); |
| 217 | 224 | ||
| 218 | //引脚初始化 | 225 | //引脚初始化 |
| 219 | - Ircut_Init(); | 226 | + Ircut_Init(); |
| 220 | 227 | ||
| 221 | //序列号初始化 | 228 | //序列号初始化 |
| 222 | SerialMAT_Init(); | 229 | SerialMAT_Init(); |
| @@ -318,7 +325,7 @@ int Main_APP_Uart() | @@ -318,7 +325,7 @@ int Main_APP_Uart() | ||
| 318 | 325 | ||
| 319 | 326 | ||
| 320 | 327 | ||
| 321 | - if (DEBUG_VERSION == TF_A1) | 328 | + if (DEVICE_VERSION == TF_A1) |
| 322 | { | 329 | { |
| 323 | //串口设备1初始化 | 330 | //串口设备1初始化 |
| 324 | JZsdk_Uart_Init(UART_DEV_1); | 331 | JZsdk_Uart_Init(UART_DEV_1); |
| @@ -365,20 +372,46 @@ static int Main_WorkMode() | @@ -365,20 +372,46 @@ static int Main_WorkMode() | ||
| 365 | } | 372 | } |
| 366 | } | 373 | } |
| 367 | 374 | ||
| 375 | +static T_JZsdkReturnCode Start_voice() | ||
| 376 | +{ | ||
| 377 | + if (APP_VERSION == APP_UART) | ||
| 378 | + { | ||
| 379 | + if (SPECIAL_VERSION == SPECIAL_DAOTONG) | ||
| 380 | + { | ||
| 381 | + | ||
| 382 | + } | ||
| 383 | + else | ||
| 384 | + { | ||
| 385 | +#if FIRMWARE_ORIGIN == DOMESTIC_VERSION //国内版才有方言 | ||
| 386 | + //播放喊话器启动中 | ||
| 387 | + Megaphone_TTS_Play(strlen("喊话器直连模式启动中"), "喊话器直连模式启动中", 0); | ||
| 388 | +#elif FIRMWARE_ORIGIN == OVERSEAS_VERSION //海外版才有其他国家的语音 | ||
| 389 | + //设置语音为英文 | ||
| 390 | + Megaphone_TTS_SetTone(0x11); | ||
| 391 | + | ||
| 392 | + //播放喊话器启动中 | ||
| 393 | + Megaphone_TTS_Play(strlen("The direct connection mode of the speaker is being activated"),"The direct connection mode of the speaker is being activated", 0); | ||
| 394 | +#endif | ||
| 395 | + | ||
| 396 | + delayS(4); | ||
| 397 | + } | ||
| 398 | + } | ||
| 399 | +} | ||
| 400 | + | ||
| 368 | static T_JZsdkReturnCode Start_up_and_broadcast_voice() | 401 | static T_JZsdkReturnCode Start_up_and_broadcast_voice() |
| 369 | { | 402 | { |
| 370 | if (APP_VERSION == APP_PSDK) | 403 | if (APP_VERSION == APP_PSDK) |
| 371 | { | 404 | { |
| 372 | #if FIRMWARE_ORIGIN == DOMESTIC_VERSION //国内版才有方言 | 405 | #if FIRMWARE_ORIGIN == DOMESTIC_VERSION //国内版才有方言 |
| 373 | - //播放喊话器启动中 | 406 | + //播放喊话器准备就绪 |
| 374 | Megaphone_TTS_Play(strlen("喊话器准备就绪"), "喊话器准备就绪", 0); | 407 | Megaphone_TTS_Play(strlen("喊话器准备就绪"), "喊话器准备就绪", 0); |
| 375 | #elif FIRMWARE_ORIGIN == OVERSEAS_VERSION //海外版才有其他国家的语音 | 408 | #elif FIRMWARE_ORIGIN == OVERSEAS_VERSION //海外版才有其他国家的语音 |
| 376 | //设置语音为英文 | 409 | //设置语音为英文 |
| 377 | Megaphone_TTS_SetTone(0x11); | 410 | Megaphone_TTS_SetTone(0x11); |
| 378 | 411 | ||
| 379 | - //播放喊话器启动中 | ||
| 380 | - Megaphone_TTS_Play(strlen("The direct connection mode of the speaker is being activated"),"The direct connection mode of the speaker is being activated", 0); | ||
| 381 | -#endif | 412 | + //播放喊话器准备就绪 |
| 413 | + Megaphone_TTS_Play(strlen("Speaker Ready"),"Speaker Ready", 0); | ||
| 414 | + #endif | ||
| 382 | } | 415 | } |
| 383 | 416 | ||
| 384 | else if (APP_VERSION == APP_UART) | 417 | else if (APP_VERSION == APP_UART) |
| @@ -417,6 +450,7 @@ static void *Main_WorkModeTask(void *arg) | @@ -417,6 +450,7 @@ static void *Main_WorkModeTask(void *arg) | ||
| 417 | //计时flag | 450 | //计时flag |
| 418 | int i=0; | 451 | int i=0; |
| 419 | printf("进入串口等待函数\n"); | 452 | printf("进入串口等待函数\n"); |
| 453 | + int start_voice_flag = JZ_FLAGCODE_OFF; | ||
| 420 | 454 | ||
| 421 | #if APP_VERSION == APP_UART | 455 | #if APP_VERSION == APP_UART |
| 422 | for (i = 0; i < 60; i++) | 456 | for (i = 0; i < 60; i++) |
| @@ -424,6 +458,12 @@ static void *Main_WorkModeTask(void *arg) | @@ -424,6 +458,12 @@ static void *Main_WorkModeTask(void *arg) | ||
| 424 | delayMs(1000);//延迟一秒钟 | 458 | delayMs(1000);//延迟一秒钟 |
| 425 | printf("计数%d\n",i); | 459 | printf("计数%d\n",i); |
| 426 | 460 | ||
| 461 | + if (start_voice_flag == JZ_FLAGCODE_OFF && MegaphoneStatusFlag == JZ_FLAGCODE_ON) | ||
| 462 | + { | ||
| 463 | + start_voice_flag = JZ_FLAGCODE_ON; | ||
| 464 | + Start_voice(); | ||
| 465 | + } | ||
| 466 | + | ||
| 427 | if (WorkMode == JZ_FLAGCODE_ON) | 467 | if (WorkMode == JZ_FLAGCODE_ON) |
| 428 | { | 468 | { |
| 429 | printf("串口连接成功,进入串口模式\n"); | 469 | printf("串口连接成功,进入串口模式\n"); |
| @@ -444,9 +484,16 @@ static void *Main_WorkModeTask(void *arg) | @@ -444,9 +484,16 @@ static void *Main_WorkModeTask(void *arg) | ||
| 444 | 484 | ||
| 445 | while (1) | 485 | while (1) |
| 446 | { | 486 | { |
| 487 | + if (start_voice_flag == JZ_FLAGCODE_OFF && MegaphoneStatusFlag == JZ_FLAGCODE_ON) | ||
| 488 | + { | ||
| 489 | + start_voice_flag = JZ_FLAGCODE_ON; | ||
| 490 | + Start_voice(); | ||
| 491 | + } | ||
| 492 | + | ||
| 447 | //如果开启工作模式已经打开,且喊话模块已经初始化完毕,播报启动完成 | 493 | //如果开启工作模式已经打开,且喊话模块已经初始化完毕,播报启动完成 |
| 448 | - if (WorkMode == JZ_FLAGCODE_ON && MegaphoneStatusFlag == JZ_FLAGCODE_ON) | 494 | + if (WorkMode == JZ_FLAGCODE_ON && MegaphoneStatusFlag == JZ_FLAGCODE_ON && start_voice_flag == JZ_FLAGCODE_ON) |
| 449 | { | 495 | { |
| 496 | + | ||
| 450 | Start_up_and_broadcast_voice(); | 497 | Start_up_and_broadcast_voice(); |
| 451 | break; | 498 | break; |
| 452 | } | 499 | } |
| @@ -38,6 +38,10 @@ extern "C" { | @@ -38,6 +38,10 @@ extern "C" { | ||
| 38 | #define GIMBAL_UART_NUM "/dev/ttyS2" | 38 | #define GIMBAL_UART_NUM "/dev/ttyS2" |
| 39 | #define GIMBAL_UART_BITRATE (115200) | 39 | #define GIMBAL_UART_BITRATE (115200) |
| 40 | 40 | ||
| 41 | + #define NET_WORK_IPADDR "192.168.5.3" | ||
| 42 | + #define NET_WORK_TARGET_IPADDR "192.168.5.10" | ||
| 43 | + #define NET_WORK_NETMASK "255.255.255.0" | ||
| 44 | + | ||
| 41 | #elif DEVICE_VERSION == JZ_H1E | 45 | #elif DEVICE_VERSION == JZ_H1E |
| 42 | #define UART_DEV1_NUM "/dev/ttyS1" | 46 | #define UART_DEV1_NUM "/dev/ttyS1" |
| 43 | #define UART_DEV1_BITRATE (115200) | 47 | #define UART_DEV1_BITRATE (115200) |
| @@ -51,6 +55,10 @@ extern "C" { | @@ -51,6 +55,10 @@ extern "C" { | ||
| 51 | #define GIMBAL_UART_NUM NULL | 55 | #define GIMBAL_UART_NUM NULL |
| 52 | #define GIMBAL_UART_BITRATE (0) | 56 | #define GIMBAL_UART_BITRATE (0) |
| 53 | 57 | ||
| 58 | + #define NET_WORK_IPADDR NULL | ||
| 59 | + #define NET_WORK_TARGET_IPADDR NULL | ||
| 60 | + #define NET_WORK_NETMASK NULL | ||
| 61 | + | ||
| 54 | #elif DEVICE_VERSION == JZ_H1T | 62 | #elif DEVICE_VERSION == JZ_H1T |
| 55 | #define UART_DEV1_NUM "/dev/ttyS2" | 63 | #define UART_DEV1_NUM "/dev/ttyS2" |
| 56 | #define UART_DEV1_BITRATE (115200) | 64 | #define UART_DEV1_BITRATE (115200) |
| @@ -62,7 +70,11 @@ extern "C" { | @@ -62,7 +70,11 @@ extern "C" { | ||
| 62 | #define COMM_4G_UART_BITRATE (115200) | 70 | #define COMM_4G_UART_BITRATE (115200) |
| 63 | 71 | ||
| 64 | #define GIMBAL_UART_NUM NULL | 72 | #define GIMBAL_UART_NUM NULL |
| 65 | - #define GIMBAL_UART_BITRATE (0) | 73 | + #define GIMBAL_UART_BITRATE (0) |
| 74 | + | ||
| 75 | + #define NET_WORK_IPADDR NULL | ||
| 76 | + #define NET_WORK_TARGET_IPADDR NULL | ||
| 77 | + #define NET_WORK_NETMASK NULL | ||
| 66 | 78 | ||
| 67 | #elif DEVICE_VERSION == JZ_H10 | 79 | #elif DEVICE_VERSION == JZ_H10 |
| 68 | #define UART_DEV1_NUM "/dev/ttyUSB0" | 80 | #define UART_DEV1_NUM "/dev/ttyUSB0" |
| @@ -77,6 +89,10 @@ extern "C" { | @@ -77,6 +89,10 @@ extern "C" { | ||
| 77 | #define GIMBAL_UART_NUM NULL | 89 | #define GIMBAL_UART_NUM NULL |
| 78 | #define GIMBAL_UART_BITRATE (0) | 90 | #define GIMBAL_UART_BITRATE (0) |
| 79 | 91 | ||
| 92 | + #define NET_WORK_IPADDR NULL | ||
| 93 | + #define NET_WORK_TARGET_IPADDR NULL | ||
| 94 | + #define NET_WORK_NETMASK NULL | ||
| 95 | + | ||
| 80 | #elif DEVICE_VERSION == JZ_H10T | 96 | #elif DEVICE_VERSION == JZ_H10T |
| 81 | #define UART_DEV1_NUM "/dev/ttyS2" | 97 | #define UART_DEV1_NUM "/dev/ttyS2" |
| 82 | #define UART_DEV1_BITRATE (115200) | 98 | #define UART_DEV1_BITRATE (115200) |
| @@ -89,6 +105,11 @@ extern "C" { | @@ -89,6 +105,11 @@ extern "C" { | ||
| 89 | 105 | ||
| 90 | #define GIMBAL_UART_NUM NULL | 106 | #define GIMBAL_UART_NUM NULL |
| 91 | #define GIMBAL_UART_BITRATE (0) | 107 | #define GIMBAL_UART_BITRATE (0) |
| 108 | + | ||
| 109 | + #define NET_WORK_IPADDR NULL | ||
| 110 | + #define NET_WORK_TARGET_IPADDR NULL | ||
| 111 | + #define NET_WORK_NETMASK NULL | ||
| 112 | + | ||
| 92 | #elif DEVICE_VERSION == JZ_U3 | 113 | #elif DEVICE_VERSION == JZ_U3 |
| 93 | #define UART_DEV1_NUM "/dev/ttyS1" | 114 | #define UART_DEV1_NUM "/dev/ttyS1" |
| 94 | #define UART_DEV1_BITRATE (115200) | 115 | #define UART_DEV1_BITRATE (115200) |
| @@ -101,6 +122,11 @@ extern "C" { | @@ -101,6 +122,11 @@ extern "C" { | ||
| 101 | 122 | ||
| 102 | #define GIMBAL_UART_NUM NULL | 123 | #define GIMBAL_UART_NUM NULL |
| 103 | #define GIMBAL_UART_BITRATE (0) | 124 | #define GIMBAL_UART_BITRATE (0) |
| 125 | + | ||
| 126 | + #define NET_WORK_IPADDR NULL | ||
| 127 | + #define NET_WORK_TARGET_IPADDR NULL | ||
| 128 | + #define NET_WORK_NETMASK NULL | ||
| 129 | + | ||
| 104 | #elif DEVICE_VERSION == TF_A1 | 130 | #elif DEVICE_VERSION == TF_A1 |
| 105 | #define UART_DEV1_NUM "/dev/ttyS2" | 131 | #define UART_DEV1_NUM "/dev/ttyS2" |
| 106 | #define UART_DEV1_BITRATE (115200) | 132 | #define UART_DEV1_BITRATE (115200) |
| @@ -113,6 +139,28 @@ extern "C" { | @@ -113,6 +139,28 @@ extern "C" { | ||
| 113 | 139 | ||
| 114 | #define GIMBAL_UART_NUM NULL | 140 | #define GIMBAL_UART_NUM NULL |
| 115 | #define GIMBAL_UART_BITRATE (0) | 141 | #define GIMBAL_UART_BITRATE (0) |
| 142 | + | ||
| 143 | + #define NET_WORK_IPADDR NULL | ||
| 144 | + #define NET_WORK_TARGET_IPADDR NULL | ||
| 145 | + #define NET_WORK_NETMASK NULL | ||
| 146 | + | ||
| 147 | +#elif DEVICE_VERSION == JZ_IRC | ||
| 148 | + #define UART_DEV1_NUM "/dev/ttyUSB0" | ||
| 149 | + #define UART_DEV1_BITRATE (115200) | ||
| 150 | + | ||
| 151 | + #define UART_DEV2_NUM NULL | ||
| 152 | + #define UART_DEV2_BITRATE (115200) | ||
| 153 | + | ||
| 154 | + #define COMM_4G_UART_NUM NULL | ||
| 155 | + #define COMM_4G_UART_BITRATE (0) | ||
| 156 | + | ||
| 157 | + #define GIMBAL_UART_NUM NULL | ||
| 158 | + #define GIMBAL_UART_BITRATE (0) | ||
| 159 | + | ||
| 160 | + #define NET_WORK_IPADDR NULL | ||
| 161 | + #define NET_WORK_TARGET_IPADDR NULL | ||
| 162 | + #define NET_WORK_NETMASK NULL | ||
| 163 | + | ||
| 116 | #else | 164 | #else |
| 117 | #define UART_DEV1_NUM NULL | 165 | #define UART_DEV1_NUM NULL |
| 118 | #define UART_DEV1_BITRATE (0) | 166 | #define UART_DEV1_BITRATE (0) |
| @@ -125,6 +173,11 @@ extern "C" { | @@ -125,6 +173,11 @@ extern "C" { | ||
| 125 | 173 | ||
| 126 | #define GIMBAL_UART_NUM NULL | 174 | #define GIMBAL_UART_NUM NULL |
| 127 | #define GIMBAL_UART_BITRATE (0) | 175 | #define GIMBAL_UART_BITRATE (0) |
| 176 | + | ||
| 177 | + #define NET_WORK_IPADDR NULL | ||
| 178 | + #define NET_WORK_TARGET_IPADDR NULL | ||
| 179 | + #define NET_WORK_NETMASK NULL | ||
| 180 | + | ||
| 128 | #endif | 181 | #endif |
| 129 | 182 | ||
| 130 | 183 | ||
| @@ -135,6 +188,7 @@ int Main_WorkModeSet(int mode); | @@ -135,6 +188,7 @@ int Main_WorkModeSet(int mode); | ||
| 135 | int Main_APP_Uart(); | 188 | int Main_APP_Uart(); |
| 136 | int Main_APP_Psdk(); | 189 | int Main_APP_Psdk(); |
| 137 | int Main_TestAPP(); | 190 | int Main_TestAPP(); |
| 191 | +int Main_Device_Wheather_Use(); | ||
| 138 | 192 | ||
| 139 | #ifdef __cplusplus | 193 | #ifdef __cplusplus |
| 140 | } | 194 | } |
| @@ -7,25 +7,25 @@ | @@ -7,25 +7,25 @@ | ||
| 7 | #define VERSION_CHOOSE_H | 7 | #define VERSION_CHOOSE_H |
| 8 | 8 | ||
| 9 | //1~10行 除了D可以修改版本选择 禁止动任何东西 | 9 | //1~10行 除了D可以修改版本选择 禁止动任何东西 |
| 10 | -#define DEVICE_VERSION JZ_U3 | 10 | +#define DEVICE_VERSION JZ_H150S |
| 11 | 11 | ||
| 12 | //禁止修改行 选择是串口程序 还是 psdk程序 | 12 | //禁止修改行 选择是串口程序 还是 psdk程序 |
| 13 | #define APP_VERSION APP_UART | 13 | #define APP_VERSION APP_UART |
| 14 | 14 | ||
| 15 | //禁止修改行 板子型号 | 15 | //禁止修改行 板子型号 |
| 16 | -#define PLATFORM_VERSION PLATFORM_V3S | 16 | +#define PLATFORM_VERSION PLATFORM_H3 |
| 17 | 17 | ||
| 18 | //禁止修改行 串口连接程序的软件版本号 | 18 | //禁止修改行 串口连接程序的软件版本号 |
| 19 | #define MAJOR_VERSION 0x00 | 19 | #define MAJOR_VERSION 0x00 |
| 20 | #define MINOR_VERSION 0x00 | 20 | #define MINOR_VERSION 0x00 |
| 21 | #define MODIFY_VERSION 0x01 | 21 | #define MODIFY_VERSION 0x01 |
| 22 | -#define DEBUG_VERSION 0x08 | 22 | +#define DEBUG_VERSION 0x09 |
| 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 |
| @@ -34,7 +34,14 @@ | @@ -34,7 +34,14 @@ | ||
| 34 | #define ALLWINNER_CEDAR VERSION_SWITCH_OFF | 34 | #define ALLWINNER_CEDAR VERSION_SWITCH_OFF |
| 35 | 35 | ||
| 36 | //禁止修改行 是否开启连接超时 | 36 | //禁止修改行 是否开启连接超时 |
| 37 | -#define CONNECTION_TIMED_OUT VERSION_SWITCH_ON | 37 | +#define CONNECTION_TIMED_OUT VERSION_SWITCH_OFF |
| 38 | + | ||
| 39 | +//是否开启喊话器功能 | ||
| 40 | +#ifdef FUNTION_MEGAPHONE | ||
| 41 | + #define MEGAPHONE_MODE VERSION_SWITCH_ON | ||
| 42 | +#else | ||
| 43 | + #define MEGAPHONE_MODE VERSION_SWITCH_OFF | ||
| 44 | +#endif | ||
| 38 | 45 | ||
| 39 | //特殊版本号 | 46 | //特殊版本号 |
| 40 | #define SPECIAL_NORMAL 0x01 | 47 | #define SPECIAL_NORMAL 0x01 |
| @@ -78,6 +85,6 @@ | @@ -78,6 +85,6 @@ | ||
| 78 | 85 | ||
| 79 | #define TF_A1 0x1010 | 86 | #define TF_A1 0x1010 |
| 80 | 87 | ||
| 81 | - | 88 | +#define JZ_IRC 0x0040 |
| 82 | 89 | ||
| 83 | #endif | 90 | #endif |
| 1 | # This is the CMakeCache file. | 1 | # This is the CMakeCache file. |
| 2 | # For build in directory: /mnt/hgfs/share/展架程序/build | 2 | # For build in directory: /mnt/hgfs/share/展架程序/build |
| 3 | -# It was generated by CMake: /usr/local/bin/cmake | 3 | +# It was generated by CMake: /usr/bin/cmake |
| 4 | # You can edit this file to change values found and used by cmake. | 4 | # You can edit this file to change values found and used by cmake. |
| 5 | # If you do not want to change any of the values, simply exit the editor. | 5 | # If you do not want to change any of the values, simply exit the editor. |
| 6 | # If you do want to change a value, simply edit, save, and exit the editor. | 6 | # If you do want to change a value, simply edit, save, and exit the editor. |
| @@ -32,11 +32,11 @@ CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/c++ | @@ -32,11 +32,11 @@ CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/c++ | ||
| 32 | 32 | ||
| 33 | //A wrapper around 'ar' adding the appropriate '--plugin' option | 33 | //A wrapper around 'ar' adding the appropriate '--plugin' option |
| 34 | // for the GCC compiler | 34 | // for the GCC compiler |
| 35 | -CMAKE_CXX_COMPILER_AR:FILEPATH=/usr/bin/gcc-ar-5 | 35 | +CMAKE_CXX_COMPILER_AR:FILEPATH=/usr/bin/gcc-ar-11 |
| 36 | 36 | ||
| 37 | //A wrapper around 'ranlib' adding the appropriate '--plugin' option | 37 | //A wrapper around 'ranlib' adding the appropriate '--plugin' option |
| 38 | // for the GCC compiler | 38 | // for the GCC compiler |
| 39 | -CMAKE_CXX_COMPILER_RANLIB:FILEPATH=/usr/bin/gcc-ranlib-5 | 39 | +CMAKE_CXX_COMPILER_RANLIB:FILEPATH=/usr/bin/gcc-ranlib-11 |
| 40 | 40 | ||
| 41 | //Flags used by the CXX compiler during all build types. | 41 | //Flags used by the CXX compiler during all build types. |
| 42 | CMAKE_CXX_FLAGS:STRING= | 42 | CMAKE_CXX_FLAGS:STRING= |
| @@ -58,11 +58,11 @@ CMAKE_C_COMPILER:FILEPATH=/usr/bin/cc | @@ -58,11 +58,11 @@ CMAKE_C_COMPILER:FILEPATH=/usr/bin/cc | ||
| 58 | 58 | ||
| 59 | //A wrapper around 'ar' adding the appropriate '--plugin' option | 59 | //A wrapper around 'ar' adding the appropriate '--plugin' option |
| 60 | // for the GCC compiler | 60 | // for the GCC compiler |
| 61 | -CMAKE_C_COMPILER_AR:FILEPATH=/usr/bin/gcc-ar-5 | 61 | +CMAKE_C_COMPILER_AR:FILEPATH=/usr/bin/gcc-ar-11 |
| 62 | 62 | ||
| 63 | //A wrapper around 'ranlib' adding the appropriate '--plugin' option | 63 | //A wrapper around 'ranlib' adding the appropriate '--plugin' option |
| 64 | // for the GCC compiler | 64 | // for the GCC compiler |
| 65 | -CMAKE_C_COMPILER_RANLIB:FILEPATH=/usr/bin/gcc-ranlib-5 | 65 | +CMAKE_C_COMPILER_RANLIB:FILEPATH=/usr/bin/gcc-ranlib-11 |
| 66 | 66 | ||
| 67 | //Flags used by the C compiler during all build types. | 67 | //Flags used by the C compiler during all build types. |
| 68 | CMAKE_C_FLAGS:STRING= | 68 | CMAKE_C_FLAGS:STRING= |
| @@ -100,9 +100,6 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= | @@ -100,9 +100,6 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= | ||
| 100 | //Enable/Disable output of compile commands during generation. | 100 | //Enable/Disable output of compile commands during generation. |
| 101 | CMAKE_EXPORT_COMPILE_COMMANDS:BOOL= | 101 | CMAKE_EXPORT_COMPILE_COMMANDS:BOOL= |
| 102 | 102 | ||
| 103 | -//Value Computed by CMake. | ||
| 104 | -CMAKE_FIND_PACKAGE_REDIRECTS_DIR:STATIC=/mnt/hgfs/share/展架程序/build/CMakeFiles/pkgRedirects | ||
| 105 | - | ||
| 106 | //Install path prefix, prepended onto install directories. | 103 | //Install path prefix, prepended onto install directories. |
| 107 | CMAKE_INSTALL_PREFIX:PATH=/usr/local | 104 | CMAKE_INSTALL_PREFIX:PATH=/usr/local |
| 108 | 105 | ||
| @@ -110,7 +107,7 @@ CMAKE_INSTALL_PREFIX:PATH=/usr/local | @@ -110,7 +107,7 @@ CMAKE_INSTALL_PREFIX:PATH=/usr/local | ||
| 110 | CMAKE_LINKER:FILEPATH=/usr/bin/ld | 107 | CMAKE_LINKER:FILEPATH=/usr/bin/ld |
| 111 | 108 | ||
| 112 | //Path to a program. | 109 | //Path to a program. |
| 113 | -CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make | 110 | +CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/gmake |
| 114 | 111 | ||
| 115 | //Flags used by the linker during the creation of modules during | 112 | //Flags used by the linker during the creation of modules during |
| 116 | // all build types. | 113 | // all build types. |
| @@ -235,17 +232,17 @@ CMAKE_CACHEFILE_DIR:INTERNAL=/mnt/hgfs/share/展架程序/build | @@ -235,17 +232,17 @@ CMAKE_CACHEFILE_DIR:INTERNAL=/mnt/hgfs/share/展架程序/build | ||
| 235 | //Major version of cmake used to create the current loaded cache | 232 | //Major version of cmake used to create the current loaded cache |
| 236 | CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 | 233 | CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 |
| 237 | //Minor version of cmake used to create the current loaded cache | 234 | //Minor version of cmake used to create the current loaded cache |
| 238 | -CMAKE_CACHE_MINOR_VERSION:INTERNAL=24 | 235 | +CMAKE_CACHE_MINOR_VERSION:INTERNAL=22 |
| 239 | //Patch version of cmake used to create the current loaded cache | 236 | //Patch version of cmake used to create the current loaded cache |
| 240 | CMAKE_CACHE_PATCH_VERSION:INTERNAL=1 | 237 | CMAKE_CACHE_PATCH_VERSION:INTERNAL=1 |
| 241 | //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE | 238 | //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE |
| 242 | CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1 | 239 | CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1 |
| 243 | //Path to CMake executable. | 240 | //Path to CMake executable. |
| 244 | -CMAKE_COMMAND:INTERNAL=/usr/local/bin/cmake | 241 | +CMAKE_COMMAND:INTERNAL=/usr/bin/cmake |
| 245 | //Path to cpack program executable. | 242 | //Path to cpack program executable. |
| 246 | -CMAKE_CPACK_COMMAND:INTERNAL=/usr/local/bin/cpack | 243 | +CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack |
| 247 | //Path to ctest program executable. | 244 | //Path to ctest program executable. |
| 248 | -CMAKE_CTEST_COMMAND:INTERNAL=/usr/local/bin/ctest | 245 | +CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest |
| 249 | //ADVANCED property for variable: CMAKE_CXX_COMPILER | 246 | //ADVANCED property for variable: CMAKE_CXX_COMPILER |
| 250 | CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1 | 247 | CMAKE_CXX_COMPILER-ADVANCED:INTERNAL=1 |
| 251 | //ADVANCED property for variable: CMAKE_CXX_COMPILER_AR | 248 | //ADVANCED property for variable: CMAKE_CXX_COMPILER_AR |
| @@ -338,7 +335,7 @@ CMAKE_RANLIB-ADVANCED:INTERNAL=1 | @@ -338,7 +335,7 @@ CMAKE_RANLIB-ADVANCED:INTERNAL=1 | ||
| 338 | //ADVANCED property for variable: CMAKE_READELF | 335 | //ADVANCED property for variable: CMAKE_READELF |
| 339 | CMAKE_READELF-ADVANCED:INTERNAL=1 | 336 | CMAKE_READELF-ADVANCED:INTERNAL=1 |
| 340 | //Path to CMake installation. | 337 | //Path to CMake installation. |
| 341 | -CMAKE_ROOT:INTERNAL=/usr/local/share/cmake-3.24 | 338 | +CMAKE_ROOT:INTERNAL=/usr/share/cmake-3.22 |
| 342 | //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS | 339 | //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS |
| 343 | CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 | 340 | CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 |
| 344 | //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG | 341 | //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG |
| @@ -366,9 +363,7 @@ CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 | @@ -366,9 +363,7 @@ CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 | ||
| 366 | //ADVANCED property for variable: CMAKE_STRIP | 363 | //ADVANCED property for variable: CMAKE_STRIP |
| 367 | CMAKE_STRIP-ADVANCED:INTERNAL=1 | 364 | CMAKE_STRIP-ADVANCED:INTERNAL=1 |
| 368 | //uname command | 365 | //uname command |
| 369 | -CMAKE_UNAME:INTERNAL=/bin/uname | 366 | +CMAKE_UNAME:INTERNAL=/usr/bin/uname |
| 370 | //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE | 367 | //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE |
| 371 | CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 | 368 | CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 |
| 372 | -//linker supports push/pop state | ||
| 373 | -_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED:INTERNAL=TRUE | ||
| 374 | 369 |
| 1 | set(CMAKE_C_COMPILER "/usr/bin/cc") | 1 | set(CMAKE_C_COMPILER "/usr/bin/cc") |
| 2 | set(CMAKE_C_COMPILER_ARG1 "") | 2 | set(CMAKE_C_COMPILER_ARG1 "") |
| 3 | set(CMAKE_C_COMPILER_ID "GNU") | 3 | set(CMAKE_C_COMPILER_ID "GNU") |
| 4 | -set(CMAKE_C_COMPILER_VERSION "5.4.0") | 4 | +set(CMAKE_C_COMPILER_VERSION "11.4.0") |
| 5 | set(CMAKE_C_COMPILER_VERSION_INTERNAL "") | 5 | set(CMAKE_C_COMPILER_VERSION_INTERNAL "") |
| 6 | set(CMAKE_C_COMPILER_WRAPPER "") | 6 | set(CMAKE_C_COMPILER_WRAPPER "") |
| 7 | -set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "11") | 7 | +set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "17") |
| 8 | set(CMAKE_C_EXTENSIONS_COMPUTED_DEFAULT "ON") | 8 | set(CMAKE_C_EXTENSIONS_COMPUTED_DEFAULT "ON") |
| 9 | -set(CMAKE_C_COMPILE_FEATURES "c_std_90;c_function_prototypes;c_std_99;c_restrict;c_variadic_macros;c_std_11;c_static_assert") | 9 | +set(CMAKE_C_COMPILE_FEATURES "c_std_90;c_function_prototypes;c_std_99;c_restrict;c_variadic_macros;c_std_11;c_static_assert;c_std_17;c_std_23") |
| 10 | set(CMAKE_C90_COMPILE_FEATURES "c_std_90;c_function_prototypes") | 10 | set(CMAKE_C90_COMPILE_FEATURES "c_std_90;c_function_prototypes") |
| 11 | set(CMAKE_C99_COMPILE_FEATURES "c_std_99;c_restrict;c_variadic_macros") | 11 | set(CMAKE_C99_COMPILE_FEATURES "c_std_99;c_restrict;c_variadic_macros") |
| 12 | set(CMAKE_C11_COMPILE_FEATURES "c_std_11;c_static_assert") | 12 | set(CMAKE_C11_COMPILE_FEATURES "c_std_11;c_static_assert") |
| 13 | -set(CMAKE_C17_COMPILE_FEATURES "") | ||
| 14 | -set(CMAKE_C23_COMPILE_FEATURES "") | 13 | +set(CMAKE_C17_COMPILE_FEATURES "c_std_17") |
| 14 | +set(CMAKE_C23_COMPILE_FEATURES "c_std_23") | ||
| 15 | 15 | ||
| 16 | set(CMAKE_C_PLATFORM_ID "Linux") | 16 | set(CMAKE_C_PLATFORM_ID "Linux") |
| 17 | set(CMAKE_C_SIMULATE_ID "") | 17 | set(CMAKE_C_SIMULATE_ID "") |
| @@ -22,9 +22,9 @@ set(CMAKE_C_SIMULATE_VERSION "") | @@ -22,9 +22,9 @@ set(CMAKE_C_SIMULATE_VERSION "") | ||
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | set(CMAKE_AR "/usr/bin/ar") | 24 | set(CMAKE_AR "/usr/bin/ar") |
| 25 | -set(CMAKE_C_COMPILER_AR "/usr/bin/gcc-ar-5") | 25 | +set(CMAKE_C_COMPILER_AR "/usr/bin/gcc-ar-11") |
| 26 | set(CMAKE_RANLIB "/usr/bin/ranlib") | 26 | set(CMAKE_RANLIB "/usr/bin/ranlib") |
| 27 | -set(CMAKE_C_COMPILER_RANLIB "/usr/bin/gcc-ranlib-5") | 27 | +set(CMAKE_C_COMPILER_RANLIB "/usr/bin/gcc-ranlib-11") |
| 28 | set(CMAKE_LINKER "/usr/bin/ld") | 28 | set(CMAKE_LINKER "/usr/bin/ld") |
| 29 | set(CMAKE_MT "") | 29 | set(CMAKE_MT "") |
| 30 | set(CMAKE_COMPILER_IS_GNUCC 1) | 30 | set(CMAKE_COMPILER_IS_GNUCC 1) |
| @@ -66,7 +66,7 @@ endif() | @@ -66,7 +66,7 @@ endif() | ||
| 66 | 66 | ||
| 67 | 67 | ||
| 68 | 68 | ||
| 69 | -set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "/usr/lib/gcc/x86_64-linux-gnu/5/include;/usr/local/include;/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed;/usr/include/x86_64-linux-gnu;/usr/include") | 69 | +set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "/usr/lib/gcc/x86_64-linux-gnu/11/include;/usr/local/include;/usr/include/x86_64-linux-gnu;/usr/include") |
| 70 | set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "gcc;gcc_s;c;gcc;gcc_s") | 70 | set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "gcc;gcc_s;c;gcc;gcc_s") |
| 71 | -set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/x86_64-linux-gnu/5;/usr/lib/x86_64-linux-gnu;/usr/lib;/lib/x86_64-linux-gnu;/lib") | 71 | +set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/x86_64-linux-gnu/11;/usr/lib/x86_64-linux-gnu;/usr/lib;/lib/x86_64-linux-gnu;/lib") |
| 72 | set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") | 72 | set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") |
| 1 | set(CMAKE_CXX_COMPILER "/usr/bin/c++") | 1 | set(CMAKE_CXX_COMPILER "/usr/bin/c++") |
| 2 | set(CMAKE_CXX_COMPILER_ARG1 "") | 2 | set(CMAKE_CXX_COMPILER_ARG1 "") |
| 3 | set(CMAKE_CXX_COMPILER_ID "GNU") | 3 | set(CMAKE_CXX_COMPILER_ID "GNU") |
| 4 | -set(CMAKE_CXX_COMPILER_VERSION "5.4.0") | 4 | +set(CMAKE_CXX_COMPILER_VERSION "11.4.0") |
| 5 | set(CMAKE_CXX_COMPILER_VERSION_INTERNAL "") | 5 | set(CMAKE_CXX_COMPILER_VERSION_INTERNAL "") |
| 6 | set(CMAKE_CXX_COMPILER_WRAPPER "") | 6 | set(CMAKE_CXX_COMPILER_WRAPPER "") |
| 7 | -set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "98") | 7 | +set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "17") |
| 8 | set(CMAKE_CXX_EXTENSIONS_COMPUTED_DEFAULT "ON") | 8 | set(CMAKE_CXX_EXTENSIONS_COMPUTED_DEFAULT "ON") |
| 9 | -set(CMAKE_CXX_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters;cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates;cxx_std_17") | 9 | +set(CMAKE_CXX_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters;cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates;cxx_std_17;cxx_std_20;cxx_std_23") |
| 10 | set(CMAKE_CXX98_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters") | 10 | set(CMAKE_CXX98_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters") |
| 11 | set(CMAKE_CXX11_COMPILE_FEATURES "cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates") | 11 | set(CMAKE_CXX11_COMPILE_FEATURES "cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates") |
| 12 | set(CMAKE_CXX14_COMPILE_FEATURES "cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") | 12 | set(CMAKE_CXX14_COMPILE_FEATURES "cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") |
| 13 | set(CMAKE_CXX17_COMPILE_FEATURES "cxx_std_17") | 13 | set(CMAKE_CXX17_COMPILE_FEATURES "cxx_std_17") |
| 14 | -set(CMAKE_CXX20_COMPILE_FEATURES "") | ||
| 15 | -set(CMAKE_CXX23_COMPILE_FEATURES "") | 14 | +set(CMAKE_CXX20_COMPILE_FEATURES "cxx_std_20") |
| 15 | +set(CMAKE_CXX23_COMPILE_FEATURES "cxx_std_23") | ||
| 16 | 16 | ||
| 17 | set(CMAKE_CXX_PLATFORM_ID "Linux") | 17 | set(CMAKE_CXX_PLATFORM_ID "Linux") |
| 18 | set(CMAKE_CXX_SIMULATE_ID "") | 18 | set(CMAKE_CXX_SIMULATE_ID "") |
| @@ -23,9 +23,9 @@ set(CMAKE_CXX_SIMULATE_VERSION "") | @@ -23,9 +23,9 @@ set(CMAKE_CXX_SIMULATE_VERSION "") | ||
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | set(CMAKE_AR "/usr/bin/ar") | 25 | set(CMAKE_AR "/usr/bin/ar") |
| 26 | -set(CMAKE_CXX_COMPILER_AR "/usr/bin/gcc-ar-5") | 26 | +set(CMAKE_CXX_COMPILER_AR "/usr/bin/gcc-ar-11") |
| 27 | set(CMAKE_RANLIB "/usr/bin/ranlib") | 27 | set(CMAKE_RANLIB "/usr/bin/ranlib") |
| 28 | -set(CMAKE_CXX_COMPILER_RANLIB "/usr/bin/gcc-ranlib-5") | 28 | +set(CMAKE_CXX_COMPILER_RANLIB "/usr/bin/gcc-ranlib-11") |
| 29 | set(CMAKE_LINKER "/usr/bin/ld") | 29 | set(CMAKE_LINKER "/usr/bin/ld") |
| 30 | set(CMAKE_MT "") | 30 | set(CMAKE_MT "") |
| 31 | set(CMAKE_COMPILER_IS_GNUCXX 1) | 31 | set(CMAKE_COMPILER_IS_GNUCXX 1) |
| @@ -77,7 +77,7 @@ endif() | @@ -77,7 +77,7 @@ endif() | ||
| 77 | 77 | ||
| 78 | 78 | ||
| 79 | 79 | ||
| 80 | -set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "/usr/include/c++/5;/usr/include/x86_64-linux-gnu/c++/5;/usr/include/c++/5/backward;/usr/lib/gcc/x86_64-linux-gnu/5/include;/usr/local/include;/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed;/usr/include/x86_64-linux-gnu;/usr/include") | 80 | +set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "/usr/include/c++/11;/usr/include/x86_64-linux-gnu/c++/11;/usr/include/c++/11/backward;/usr/lib/gcc/x86_64-linux-gnu/11/include;/usr/local/include;/usr/include/x86_64-linux-gnu;/usr/include") |
| 81 | set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "stdc++;m;gcc_s;gcc;c;gcc_s;gcc") | 81 | set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "stdc++;m;gcc_s;gcc;c;gcc_s;gcc") |
| 82 | -set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/x86_64-linux-gnu/5;/usr/lib/x86_64-linux-gnu;/usr/lib;/lib/x86_64-linux-gnu;/lib") | 82 | +set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/x86_64-linux-gnu/11;/usr/lib/x86_64-linux-gnu;/usr/lib;/lib/x86_64-linux-gnu;/lib") |
| 83 | set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") | 83 | set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") |
不能预览此文件类型
不能预览此文件类型
| 1 | -set(CMAKE_HOST_SYSTEM "Linux-4.15.0-142-generic") | 1 | +set(CMAKE_HOST_SYSTEM "Linux-6.5.0-14-generic") |
| 2 | set(CMAKE_HOST_SYSTEM_NAME "Linux") | 2 | set(CMAKE_HOST_SYSTEM_NAME "Linux") |
| 3 | -set(CMAKE_HOST_SYSTEM_VERSION "4.15.0-142-generic") | 3 | +set(CMAKE_HOST_SYSTEM_VERSION "6.5.0-14-generic") |
| 4 | set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64") | 4 | set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64") |
| 5 | 5 | ||
| 6 | 6 | ||
| 7 | 7 | ||
| 8 | -set(CMAKE_SYSTEM "Linux-4.15.0-142-generic") | 8 | +set(CMAKE_SYSTEM "Linux-6.5.0-14-generic") |
| 9 | set(CMAKE_SYSTEM_NAME "Linux") | 9 | set(CMAKE_SYSTEM_NAME "Linux") |
| 10 | -set(CMAKE_SYSTEM_VERSION "4.15.0-142-generic") | 10 | +set(CMAKE_SYSTEM_VERSION "6.5.0-14-generic") |
| 11 | set(CMAKE_SYSTEM_PROCESSOR "x86_64") | 11 | set(CMAKE_SYSTEM_PROCESSOR "x86_64") |
| 12 | 12 | ||
| 13 | set(CMAKE_CROSSCOMPILING "FALSE") | 13 | set(CMAKE_CROSSCOMPILING "FALSE") |
| @@ -178,14 +178,6 @@ | @@ -178,14 +178,6 @@ | ||
| 178 | # define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10) | 178 | # define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10) |
| 179 | # define COMPILER_VERSION_PATCH DEC(__IBMC__ % 10) | 179 | # define COMPILER_VERSION_PATCH DEC(__IBMC__ % 10) |
| 180 | 180 | ||
| 181 | -#elif defined(__open_xl__) && defined(__clang__) | ||
| 182 | -# define COMPILER_ID "IBMClang" | ||
| 183 | -# define COMPILER_VERSION_MAJOR DEC(__open_xl_version__) | ||
| 184 | -# define COMPILER_VERSION_MINOR DEC(__open_xl_release__) | ||
| 185 | -# define COMPILER_VERSION_PATCH DEC(__open_xl_modification__) | ||
| 186 | -# define COMPILER_VERSION_TWEAK DEC(__open_xl_ptf_fix_level__) | ||
| 187 | - | ||
| 188 | - | ||
| 189 | #elif defined(__ibmxl__) && defined(__clang__) | 181 | #elif defined(__ibmxl__) && defined(__clang__) |
| 190 | # define COMPILER_ID "XLClang" | 182 | # define COMPILER_ID "XLClang" |
| 191 | # define COMPILER_VERSION_MAJOR DEC(__ibmxl_version__) | 183 | # define COMPILER_VERSION_MAJOR DEC(__ibmxl_version__) |
| @@ -329,24 +321,6 @@ | @@ -329,24 +321,6 @@ | ||
| 329 | # define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) | 321 | # define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) |
| 330 | # endif | 322 | # endif |
| 331 | 323 | ||
| 332 | -#elif defined(__LCC__) && (defined(__GNUC__) || defined(__GNUG__) || defined(__MCST__)) | ||
| 333 | -# define COMPILER_ID "LCC" | ||
| 334 | -# define COMPILER_VERSION_MAJOR DEC(1) | ||
| 335 | -# if defined(__LCC__) | ||
| 336 | -# define COMPILER_VERSION_MINOR DEC(__LCC__- 100) | ||
| 337 | -# endif | ||
| 338 | -# if defined(__LCC_MINOR__) | ||
| 339 | -# define COMPILER_VERSION_PATCH DEC(__LCC_MINOR__) | ||
| 340 | -# endif | ||
| 341 | -# if defined(__GNUC__) && defined(__GNUC_MINOR__) | ||
| 342 | -# define SIMULATE_ID "GNU" | ||
| 343 | -# define SIMULATE_VERSION_MAJOR DEC(__GNUC__) | ||
| 344 | -# define SIMULATE_VERSION_MINOR DEC(__GNUC_MINOR__) | ||
| 345 | -# if defined(__GNUC_PATCHLEVEL__) | ||
| 346 | -# define SIMULATE_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) | ||
| 347 | -# endif | ||
| 348 | -# endif | ||
| 349 | - | ||
| 350 | #elif defined(__GNUC__) | 324 | #elif defined(__GNUC__) |
| 351 | # define COMPILER_ID "GNU" | 325 | # define COMPILER_ID "GNU" |
| 352 | # define COMPILER_VERSION_MAJOR DEC(__GNUC__) | 326 | # define COMPILER_VERSION_MAJOR DEC(__GNUC__) |
| @@ -375,14 +349,13 @@ | @@ -375,14 +349,13 @@ | ||
| 375 | # define COMPILER_VERSION_TWEAK DEC(_MSC_BUILD) | 349 | # define COMPILER_VERSION_TWEAK DEC(_MSC_BUILD) |
| 376 | # endif | 350 | # endif |
| 377 | 351 | ||
| 378 | -#elif defined(_ADI_COMPILER) | 352 | +#elif defined(__VISUALDSPVERSION__) || defined(__ADSPBLACKFIN__) || defined(__ADSPTS__) || defined(__ADSP21000__) |
| 379 | # define COMPILER_ID "ADSP" | 353 | # define COMPILER_ID "ADSP" |
| 380 | -#if defined(__VERSIONNUM__) | ||
| 381 | - /* __VERSIONNUM__ = 0xVVRRPPTT */ | ||
| 382 | -# define COMPILER_VERSION_MAJOR DEC(__VERSIONNUM__ >> 24 & 0xFF) | ||
| 383 | -# define COMPILER_VERSION_MINOR DEC(__VERSIONNUM__ >> 16 & 0xFF) | ||
| 384 | -# define COMPILER_VERSION_PATCH DEC(__VERSIONNUM__ >> 8 & 0xFF) | ||
| 385 | -# define COMPILER_VERSION_TWEAK DEC(__VERSIONNUM__ & 0xFF) | 354 | +#if defined(__VISUALDSPVERSION__) |
| 355 | + /* __VISUALDSPVERSION__ = 0xVVRRPP00 */ | ||
| 356 | +# define COMPILER_VERSION_MAJOR HEX(__VISUALDSPVERSION__>>24) | ||
| 357 | +# define COMPILER_VERSION_MINOR HEX(__VISUALDSPVERSION__>>16 & 0xFF) | ||
| 358 | +# define COMPILER_VERSION_PATCH HEX(__VISUALDSPVERSION__>>8 & 0xFF) | ||
| 386 | #endif | 359 | #endif |
| 387 | 360 | ||
| 388 | #elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC) | 361 | #elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC) |
| @@ -547,9 +520,6 @@ char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; | @@ -547,9 +520,6 @@ char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; | ||
| 547 | # define PLATFORM_ID "Integrity" | 520 | # define PLATFORM_ID "Integrity" |
| 548 | # endif | 521 | # endif |
| 549 | 522 | ||
| 550 | -# elif defined(_ADI_COMPILER) | ||
| 551 | -# define PLATFORM_ID "ADSP" | ||
| 552 | - | ||
| 553 | #else /* unknown platform */ | 523 | #else /* unknown platform */ |
| 554 | # define PLATFORM_ID | 524 | # define PLATFORM_ID |
| 555 | 525 | ||
| @@ -678,12 +648,6 @@ char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; | @@ -678,12 +648,6 @@ char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; | ||
| 678 | # define ARCHITECTURE_ID "" | 648 | # define ARCHITECTURE_ID "" |
| 679 | # endif | 649 | # endif |
| 680 | 650 | ||
| 681 | -# elif defined(__ADSPSHARC__) | ||
| 682 | -# define ARCHITECTURE_ID "SHARC" | ||
| 683 | - | ||
| 684 | -# elif defined(__ADSPBLACKFIN__) | ||
| 685 | -# define ARCHITECTURE_ID "Blackfin" | ||
| 686 | - | ||
| 687 | #else | 651 | #else |
| 688 | # define ARCHITECTURE_ID | 652 | # define ARCHITECTURE_ID |
| 689 | #endif | 653 | #endif |
| @@ -791,9 +755,10 @@ const char* info_language_standard_default = | @@ -791,9 +755,10 @@ const char* info_language_standard_default = | ||
| 791 | "INFO" ":" "standard_default[" C_VERSION "]"; | 755 | "INFO" ":" "standard_default[" C_VERSION "]"; |
| 792 | 756 | ||
| 793 | const char* info_language_extensions_default = "INFO" ":" "extensions_default[" | 757 | const char* info_language_extensions_default = "INFO" ":" "extensions_default[" |
| 794 | -#if (defined(__clang__) || defined(__GNUC__) || defined(__xlC__) || \ | 758 | +/* !defined(_MSC_VER) to exclude Clang's MSVC compatibility mode. */ |
| 759 | +#if (defined(__clang__) || defined(__GNUC__) || \ | ||
| 795 | defined(__TI_COMPILER_VERSION__)) && \ | 760 | defined(__TI_COMPILER_VERSION__)) && \ |
| 796 | - !defined(__STRICT_ANSI__) | 761 | + !defined(__STRICT_ANSI__) && !defined(_MSC_VER) |
| 797 | "ON" | 762 | "ON" |
| 798 | #else | 763 | #else |
| 799 | "OFF" | 764 | "OFF" |
build/CMakeFiles/3.22.1/CompilerIdC/a.out
0 → 100644
不能预览此文件类型
| @@ -178,14 +178,6 @@ | @@ -178,14 +178,6 @@ | ||
| 178 | # define COMPILER_VERSION_MINOR DEC(__IBMCPP__/10 % 10) | 178 | # define COMPILER_VERSION_MINOR DEC(__IBMCPP__/10 % 10) |
| 179 | # define COMPILER_VERSION_PATCH DEC(__IBMCPP__ % 10) | 179 | # define COMPILER_VERSION_PATCH DEC(__IBMCPP__ % 10) |
| 180 | 180 | ||
| 181 | -#elif defined(__open_xl__) && defined(__clang__) | ||
| 182 | -# define COMPILER_ID "IBMClang" | ||
| 183 | -# define COMPILER_VERSION_MAJOR DEC(__open_xl_version__) | ||
| 184 | -# define COMPILER_VERSION_MINOR DEC(__open_xl_release__) | ||
| 185 | -# define COMPILER_VERSION_PATCH DEC(__open_xl_modification__) | ||
| 186 | -# define COMPILER_VERSION_TWEAK DEC(__open_xl_ptf_fix_level__) | ||
| 187 | - | ||
| 188 | - | ||
| 189 | #elif defined(__ibmxl__) && defined(__clang__) | 181 | #elif defined(__ibmxl__) && defined(__clang__) |
| 190 | # define COMPILER_ID "XLClang" | 182 | # define COMPILER_ID "XLClang" |
| 191 | # define COMPILER_VERSION_MAJOR DEC(__ibmxl_version__) | 183 | # define COMPILER_VERSION_MAJOR DEC(__ibmxl_version__) |
| @@ -323,24 +315,6 @@ | @@ -323,24 +315,6 @@ | ||
| 323 | # define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) | 315 | # define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) |
| 324 | # endif | 316 | # endif |
| 325 | 317 | ||
| 326 | -#elif defined(__LCC__) && (defined(__GNUC__) || defined(__GNUG__) || defined(__MCST__)) | ||
| 327 | -# define COMPILER_ID "LCC" | ||
| 328 | -# define COMPILER_VERSION_MAJOR DEC(1) | ||
| 329 | -# if defined(__LCC__) | ||
| 330 | -# define COMPILER_VERSION_MINOR DEC(__LCC__- 100) | ||
| 331 | -# endif | ||
| 332 | -# if defined(__LCC_MINOR__) | ||
| 333 | -# define COMPILER_VERSION_PATCH DEC(__LCC_MINOR__) | ||
| 334 | -# endif | ||
| 335 | -# if defined(__GNUC__) && defined(__GNUC_MINOR__) | ||
| 336 | -# define SIMULATE_ID "GNU" | ||
| 337 | -# define SIMULATE_VERSION_MAJOR DEC(__GNUC__) | ||
| 338 | -# define SIMULATE_VERSION_MINOR DEC(__GNUC_MINOR__) | ||
| 339 | -# if defined(__GNUC_PATCHLEVEL__) | ||
| 340 | -# define SIMULATE_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) | ||
| 341 | -# endif | ||
| 342 | -# endif | ||
| 343 | - | ||
| 344 | #elif defined(__GNUC__) || defined(__GNUG__) | 318 | #elif defined(__GNUC__) || defined(__GNUG__) |
| 345 | # define COMPILER_ID "GNU" | 319 | # define COMPILER_ID "GNU" |
| 346 | # if defined(__GNUC__) | 320 | # if defined(__GNUC__) |
| @@ -373,14 +347,13 @@ | @@ -373,14 +347,13 @@ | ||
| 373 | # define COMPILER_VERSION_TWEAK DEC(_MSC_BUILD) | 347 | # define COMPILER_VERSION_TWEAK DEC(_MSC_BUILD) |
| 374 | # endif | 348 | # endif |
| 375 | 349 | ||
| 376 | -#elif defined(_ADI_COMPILER) | 350 | +#elif defined(__VISUALDSPVERSION__) || defined(__ADSPBLACKFIN__) || defined(__ADSPTS__) || defined(__ADSP21000__) |
| 377 | # define COMPILER_ID "ADSP" | 351 | # define COMPILER_ID "ADSP" |
| 378 | -#if defined(__VERSIONNUM__) | ||
| 379 | - /* __VERSIONNUM__ = 0xVVRRPPTT */ | ||
| 380 | -# define COMPILER_VERSION_MAJOR DEC(__VERSIONNUM__ >> 24 & 0xFF) | ||
| 381 | -# define COMPILER_VERSION_MINOR DEC(__VERSIONNUM__ >> 16 & 0xFF) | ||
| 382 | -# define COMPILER_VERSION_PATCH DEC(__VERSIONNUM__ >> 8 & 0xFF) | ||
| 383 | -# define COMPILER_VERSION_TWEAK DEC(__VERSIONNUM__ & 0xFF) | 352 | +#if defined(__VISUALDSPVERSION__) |
| 353 | + /* __VISUALDSPVERSION__ = 0xVVRRPP00 */ | ||
| 354 | +# define COMPILER_VERSION_MAJOR HEX(__VISUALDSPVERSION__>>24) | ||
| 355 | +# define COMPILER_VERSION_MINOR HEX(__VISUALDSPVERSION__>>16 & 0xFF) | ||
| 356 | +# define COMPILER_VERSION_PATCH HEX(__VISUALDSPVERSION__>>8 & 0xFF) | ||
| 384 | #endif | 357 | #endif |
| 385 | 358 | ||
| 386 | #elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC) | 359 | #elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC) |
| @@ -532,9 +505,6 @@ char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; | @@ -532,9 +505,6 @@ char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; | ||
| 532 | # define PLATFORM_ID "Integrity" | 505 | # define PLATFORM_ID "Integrity" |
| 533 | # endif | 506 | # endif |
| 534 | 507 | ||
| 535 | -# elif defined(_ADI_COMPILER) | ||
| 536 | -# define PLATFORM_ID "ADSP" | ||
| 537 | - | ||
| 538 | #else /* unknown platform */ | 508 | #else /* unknown platform */ |
| 539 | # define PLATFORM_ID | 509 | # define PLATFORM_ID |
| 540 | 510 | ||
| @@ -663,12 +633,6 @@ char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; | @@ -663,12 +633,6 @@ char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; | ||
| 663 | # define ARCHITECTURE_ID "" | 633 | # define ARCHITECTURE_ID "" |
| 664 | # endif | 634 | # endif |
| 665 | 635 | ||
| 666 | -# elif defined(__ADSPSHARC__) | ||
| 667 | -# define ARCHITECTURE_ID "SHARC" | ||
| 668 | - | ||
| 669 | -# elif defined(__ADSPBLACKFIN__) | ||
| 670 | -# define ARCHITECTURE_ID "Blackfin" | ||
| 671 | - | ||
| 672 | #else | 636 | #else |
| 673 | # define ARCHITECTURE_ID | 637 | # define ARCHITECTURE_ID |
| 674 | #endif | 638 | #endif |
| @@ -788,9 +752,10 @@ const char* info_language_standard_default = "INFO" ":" "standard_default[" | @@ -788,9 +752,10 @@ const char* info_language_standard_default = "INFO" ":" "standard_default[" | ||
| 788 | "]"; | 752 | "]"; |
| 789 | 753 | ||
| 790 | const char* info_language_extensions_default = "INFO" ":" "extensions_default[" | 754 | const char* info_language_extensions_default = "INFO" ":" "extensions_default[" |
| 791 | -#if (defined(__clang__) || defined(__GNUC__) || defined(__xlC__) || \ | 755 | +/* !defined(_MSC_VER) to exclude Clang's MSVC compatibility mode. */ |
| 756 | +#if (defined(__clang__) || defined(__GNUC__) || \ | ||
| 792 | defined(__TI_COMPILER_VERSION__)) && \ | 757 | defined(__TI_COMPILER_VERSION__)) && \ |
| 793 | - !defined(__STRICT_ANSI__) | 758 | + !defined(__STRICT_ANSI__) && !defined(_MSC_VER) |
| 794 | "ON" | 759 | "ON" |
| 795 | #else | 760 | #else |
| 796 | "OFF" | 761 | "OFF" |
build/CMakeFiles/3.22.1/CompilerIdCXX/a.out
0 → 100644
不能预览此文件类型
不能预览此文件类型
不能预览此文件类型
不能预览此文件类型
不能预览此文件类型
| 1 | # CMAKE generated file: DO NOT EDIT! | 1 | # CMAKE generated file: DO NOT EDIT! |
| 2 | -# Generated by "Unix Makefiles" Generator, CMake Version 3.24 | 2 | +# Generated by "Unix Makefiles" Generator, CMake Version 3.22 |
| 3 | 3 | ||
| 4 | # Relative path conversion top directories. | 4 | # Relative path conversion top directories. |
| 5 | set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/mnt/hgfs/share/展架程序") | 5 | set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/mnt/hgfs/share/展架程序") |
| 1 | -The system is: Linux - 4.15.0-142-generic - x86_64 | 1 | +The system is: Linux - 6.5.0-14-generic - x86_64 |
| 2 | Compiling the C compiler identification source file "CMakeCCompilerId.c" succeeded. | 2 | Compiling the C compiler identification source file "CMakeCCompilerId.c" succeeded. |
| 3 | Compiler: /usr/bin/cc | 3 | Compiler: /usr/bin/cc |
| 4 | Build flags: | 4 | Build flags: |
| @@ -10,7 +10,7 @@ The output was: | @@ -10,7 +10,7 @@ The output was: | ||
| 10 | 10 | ||
| 11 | Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "a.out" | 11 | Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "a.out" |
| 12 | 12 | ||
| 13 | -The C compiler identification is GNU, found in "/mnt/hgfs/share/展架程序/build/CMakeFiles/3.24.1/CompilerIdC/a.out" | 13 | +The C compiler identification is GNU, found in "/mnt/hgfs/share/展架程序/build/CMakeFiles/3.22.1/CompilerIdC/a.out" |
| 14 | 14 | ||
| 15 | Compiling the CXX compiler identification source file "CMakeCXXCompilerId.cpp" succeeded. | 15 | Compiling the CXX compiler identification source file "CMakeCXXCompilerId.cpp" succeeded. |
| 16 | Compiler: /usr/bin/c++ | 16 | Compiler: /usr/bin/c++ |
| @@ -23,149 +23,159 @@ The output was: | @@ -23,149 +23,159 @@ The output was: | ||
| 23 | 23 | ||
| 24 | Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" produced "a.out" | 24 | Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" produced "a.out" |
| 25 | 25 | ||
| 26 | -The CXX compiler identification is GNU, found in "/mnt/hgfs/share/展架程序/build/CMakeFiles/3.24.1/CompilerIdCXX/a.out" | 26 | +The CXX compiler identification is GNU, found in "/mnt/hgfs/share/展架程序/build/CMakeFiles/3.22.1/CompilerIdCXX/a.out" |
| 27 | 27 | ||
| 28 | Detecting C compiler ABI info compiled with the following output: | 28 | Detecting C compiler ABI info compiled with the following output: |
| 29 | Change Dir: /mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp | 29 | Change Dir: /mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp |
| 30 | 30 | ||
| 31 | -Run Build Command(s):/usr/bin/make -f Makefile cmTC_00447/fast && /usr/bin/make -f CMakeFiles/cmTC_00447.dir/build.make CMakeFiles/cmTC_00447.dir/build | ||
| 32 | -make[1]: Entering directory '/mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp' | ||
| 33 | -Building C object CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o | ||
| 34 | -/usr/bin/cc -v -o CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o -c /usr/local/share/cmake-3.24/Modules/CMakeCCompilerABI.c | 31 | +Run Build Command(s):/usr/bin/gmake -f Makefile cmTC_19687/fast && /usr/bin/gmake -f CMakeFiles/cmTC_19687.dir/build.make CMakeFiles/cmTC_19687.dir/build |
| 32 | +gmake[1]: Entering directory '/mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp' | ||
| 33 | +Building C object CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o | ||
| 34 | +/usr/bin/cc -v -o CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o -c /usr/share/cmake-3.22/Modules/CMakeCCompilerABI.c | ||
| 35 | Using built-in specs. | 35 | Using built-in specs. |
| 36 | COLLECT_GCC=/usr/bin/cc | 36 | COLLECT_GCC=/usr/bin/cc |
| 37 | +OFFLOAD_TARGET_NAMES=nvptx-none:amdgcn-amdhsa | ||
| 38 | +OFFLOAD_TARGET_DEFAULT=1 | ||
| 37 | Target: x86_64-linux-gnu | 39 | Target: x86_64-linux-gnu |
| 38 | -Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.12' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu | 40 | +Configured with: ../src/configure -v --with-pkgversion='Ubuntu 11.4.0-1ubuntu1~22.04' --with-bugurl=file:///usr/share/doc/gcc-11/README.Bugs --enable-languages=c,ada,c++,go,brig,d,fortran,objc,obj-c++,m2 --prefix=/usr --with-gcc-major-version-only --program-suffix=-11 --program-prefix=x86_64-linux-gnu- --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --enable-bootstrap --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-plugin --enable-default-pie --with-system-zlib --enable-libphobos-checking=release --with-target-system-zlib=auto --enable-objc-gc=auto --enable-multiarch --disable-werror --enable-cet --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-offload-targets=nvptx-none=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-nvptx/usr,amdgcn-amdhsa=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-gcn/usr --without-cuda-driver --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu --with-build-config=bootstrap-lto-lean --enable-link-serialization=2 |
| 39 | Thread model: posix | 41 | Thread model: posix |
| 40 | -gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.12) | ||
| 41 | -COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' | ||
| 42 | - /usr/lib/gcc/x86_64-linux-gnu/5/cc1 -quiet -v -imultiarch x86_64-linux-gnu /usr/local/share/cmake-3.24/Modules/CMakeCCompilerABI.c -quiet -dumpbase CMakeCCompilerABI.c -mtune=generic -march=x86-64 -auxbase-strip CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o -version -fstack-protector-strong -Wformat -Wformat-security -o /tmp/ccIxyOM6.s | ||
| 43 | -GNU C11 (Ubuntu 5.4.0-6ubuntu1~16.04.12) version 5.4.0 20160609 (x86_64-linux-gnu) | ||
| 44 | - compiled by GNU C version 5.4.0 20160609, GMP version 6.1.0, MPFR version 3.1.4, MPC version 1.0.3 | ||
| 45 | -warning: GMP header version 6.1.0 differs from library version 6.1.2. | 42 | +Supported LTO compression algorithms: zlib zstd |
| 43 | +gcc version 11.4.0 (Ubuntu 11.4.0-1ubuntu1~22.04) | ||
| 44 | +COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_19687.dir/' | ||
| 45 | + /usr/lib/gcc/x86_64-linux-gnu/11/cc1 -quiet -v -imultiarch x86_64-linux-gnu /usr/share/cmake-3.22/Modules/CMakeCCompilerABI.c -quiet -dumpdir CMakeFiles/cmTC_19687.dir/ -dumpbase CMakeCCompilerABI.c.c -dumpbase-ext .c -mtune=generic -march=x86-64 -version -fasynchronous-unwind-tables -fstack-protector-strong -Wformat -Wformat-security -fstack-clash-protection -fcf-protection -o /tmp/cc311es4.s | ||
| 46 | +GNU C17 (Ubuntu 11.4.0-1ubuntu1~22.04) version 11.4.0 (x86_64-linux-gnu) | ||
| 47 | + compiled by GNU C version 11.4.0, GMP version 6.2.1, MPFR version 4.1.0, MPC version 1.2.1, isl version isl-0.24-GMP | ||
| 48 | + | ||
| 46 | GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072 | 49 | GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072 |
| 47 | ignoring nonexistent directory "/usr/local/include/x86_64-linux-gnu" | 50 | ignoring nonexistent directory "/usr/local/include/x86_64-linux-gnu" |
| 48 | -ignoring nonexistent directory "/usr/lib/gcc/x86_64-linux-gnu/5/../../../../x86_64-linux-gnu/include" | 51 | +ignoring nonexistent directory "/usr/lib/gcc/x86_64-linux-gnu/11/include-fixed" |
| 52 | +ignoring nonexistent directory "/usr/lib/gcc/x86_64-linux-gnu/11/../../../../x86_64-linux-gnu/include" | ||
| 49 | #include "..." search starts here: | 53 | #include "..." search starts here: |
| 50 | #include <...> search starts here: | 54 | #include <...> search starts here: |
| 51 | - /usr/lib/gcc/x86_64-linux-gnu/5/include | 55 | + /usr/lib/gcc/x86_64-linux-gnu/11/include |
| 52 | /usr/local/include | 56 | /usr/local/include |
| 53 | - /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed | ||
| 54 | /usr/include/x86_64-linux-gnu | 57 | /usr/include/x86_64-linux-gnu |
| 55 | /usr/include | 58 | /usr/include |
| 56 | End of search list. | 59 | End of search list. |
| 57 | -GNU C11 (Ubuntu 5.4.0-6ubuntu1~16.04.12) version 5.4.0 20160609 (x86_64-linux-gnu) | ||
| 58 | - compiled by GNU C version 5.4.0 20160609, GMP version 6.1.0, MPFR version 3.1.4, MPC version 1.0.3 | ||
| 59 | -warning: GMP header version 6.1.0 differs from library version 6.1.2. | 60 | +GNU C17 (Ubuntu 11.4.0-1ubuntu1~22.04) version 11.4.0 (x86_64-linux-gnu) |
| 61 | + compiled by GNU C version 11.4.0, GMP version 6.2.1, MPFR version 4.1.0, MPC version 1.2.1, isl version isl-0.24-GMP | ||
| 62 | + | ||
| 60 | GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072 | 63 | GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072 |
| 61 | -Compiler executable checksum: 8087146d2ee737d238113fb57fabb1f2 | ||
| 62 | -COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' | ||
| 63 | - as -v --64 -o CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o /tmp/ccIxyOM6.s | ||
| 64 | -GNU assembler version 2.26.1 (x86_64-linux-gnu) using BFD version (GNU Binutils for Ubuntu) 2.26.1 | ||
| 65 | -COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/ | ||
| 66 | -LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../:/lib/:/usr/lib/ | ||
| 67 | -COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' | ||
| 68 | -Linking C executable cmTC_00447 | ||
| 69 | -/usr/local/bin/cmake -E cmake_link_script CMakeFiles/cmTC_00447.dir/link.txt --verbose=1 | ||
| 70 | -/usr/bin/cc -v -rdynamic CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o -o cmTC_00447 | 64 | +Compiler executable checksum: 50eaa2331df977b8016186198deb2d18 |
| 65 | +COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_19687.dir/' | ||
| 66 | + as -v --64 -o CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o /tmp/cc311es4.s | ||
| 67 | +GNU assembler version 2.38 (x86_64-linux-gnu) using BFD version (GNU Binutils for Ubuntu) 2.38 | ||
| 68 | +COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/ | ||
| 69 | +LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../:/lib/:/usr/lib/ | ||
| 70 | +COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.' | ||
| 71 | +Linking C executable cmTC_19687 | ||
| 72 | +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_19687.dir/link.txt --verbose=1 | ||
| 73 | +/usr/bin/cc -v -rdynamic CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o -o cmTC_19687 | ||
| 71 | Using built-in specs. | 74 | Using built-in specs. |
| 72 | COLLECT_GCC=/usr/bin/cc | 75 | COLLECT_GCC=/usr/bin/cc |
| 73 | -COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper | 76 | +COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/11/lto-wrapper |
| 77 | +OFFLOAD_TARGET_NAMES=nvptx-none:amdgcn-amdhsa | ||
| 78 | +OFFLOAD_TARGET_DEFAULT=1 | ||
| 74 | Target: x86_64-linux-gnu | 79 | Target: x86_64-linux-gnu |
| 75 | -Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.12' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu | 80 | +Configured with: ../src/configure -v --with-pkgversion='Ubuntu 11.4.0-1ubuntu1~22.04' --with-bugurl=file:///usr/share/doc/gcc-11/README.Bugs --enable-languages=c,ada,c++,go,brig,d,fortran,objc,obj-c++,m2 --prefix=/usr --with-gcc-major-version-only --program-suffix=-11 --program-prefix=x86_64-linux-gnu- --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --enable-bootstrap --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-plugin --enable-default-pie --with-system-zlib --enable-libphobos-checking=release --with-target-system-zlib=auto --enable-objc-gc=auto --enable-multiarch --disable-werror --enable-cet --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-offload-targets=nvptx-none=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-nvptx/usr,amdgcn-amdhsa=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-gcn/usr --without-cuda-driver --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu --with-build-config=bootstrap-lto-lean --enable-link-serialization=2 |
| 76 | Thread model: posix | 81 | Thread model: posix |
| 77 | -gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.12) | ||
| 78 | -COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/ | ||
| 79 | -LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../:/lib/:/usr/lib/ | ||
| 80 | -COLLECT_GCC_OPTIONS='-v' '-rdynamic' '-o' 'cmTC_00447' '-mtune=generic' '-march=x86-64' | ||
| 81 | - /usr/lib/gcc/x86_64-linux-gnu/5/collect2 -plugin /usr/lib/gcc/x86_64-linux-gnu/5/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper -plugin-opt=-fresolution=/tmp/ccEoXNga.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --sysroot=/ --build-id --eh-frame-hdr -m elf_x86_64 --hash-style=gnu --as-needed -export-dynamic -dynamic-linker /lib64/ld-linux-x86-64.so.2 -z relro -o cmTC_00447 /usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crt1.o /usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crti.o /usr/lib/gcc/x86_64-linux-gnu/5/crtbegin.o -L/usr/lib/gcc/x86_64-linux-gnu/5 -L/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/5/../../.. CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o -lgcc --as-needed -lgcc_s --no-as-needed -lc -lgcc --as-needed -lgcc_s --no-as-needed /usr/lib/gcc/x86_64-linux-gnu/5/crtend.o /usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crtn.o | ||
| 82 | -make[1]: Leaving directory '/mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp' | 82 | +Supported LTO compression algorithms: zlib zstd |
| 83 | +gcc version 11.4.0 (Ubuntu 11.4.0-1ubuntu1~22.04) | ||
| 84 | +COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/ | ||
| 85 | +LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../:/lib/:/usr/lib/ | ||
| 86 | +COLLECT_GCC_OPTIONS='-v' '-rdynamic' '-o' 'cmTC_19687' '-mtune=generic' '-march=x86-64' '-dumpdir' 'cmTC_19687.' | ||
| 87 | + /usr/lib/gcc/x86_64-linux-gnu/11/collect2 -plugin /usr/lib/gcc/x86_64-linux-gnu/11/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-linux-gnu/11/lto-wrapper -plugin-opt=-fresolution=/tmp/ccfuqfIm.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --build-id --eh-frame-hdr -m elf_x86_64 --hash-style=gnu --as-needed -export-dynamic -dynamic-linker /lib64/ld-linux-x86-64.so.2 -pie -z now -z relro -o cmTC_19687 /usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/Scrt1.o /usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crti.o /usr/lib/gcc/x86_64-linux-gnu/11/crtbeginS.o -L/usr/lib/gcc/x86_64-linux-gnu/11 -L/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/11/../../.. CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o -lgcc --push-state --as-needed -lgcc_s --pop-state -lc -lgcc --push-state --as-needed -lgcc_s --pop-state /usr/lib/gcc/x86_64-linux-gnu/11/crtendS.o /usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crtn.o | ||
| 88 | +COLLECT_GCC_OPTIONS='-v' '-rdynamic' '-o' 'cmTC_19687' '-mtune=generic' '-march=x86-64' '-dumpdir' 'cmTC_19687.' | ||
| 89 | +gmake[1]: Leaving directory '/mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp' | ||
| 83 | 90 | ||
| 84 | 91 | ||
| 85 | 92 | ||
| 86 | Parsed C implicit include dir info from above output: rv=done | 93 | Parsed C implicit include dir info from above output: rv=done |
| 87 | found start of include info | 94 | found start of include info |
| 88 | found start of implicit include info | 95 | found start of implicit include info |
| 89 | - add: [/usr/lib/gcc/x86_64-linux-gnu/5/include] | 96 | + add: [/usr/lib/gcc/x86_64-linux-gnu/11/include] |
| 90 | add: [/usr/local/include] | 97 | add: [/usr/local/include] |
| 91 | - add: [/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed] | ||
| 92 | add: [/usr/include/x86_64-linux-gnu] | 98 | add: [/usr/include/x86_64-linux-gnu] |
| 93 | add: [/usr/include] | 99 | add: [/usr/include] |
| 94 | end of search list found | 100 | end of search list found |
| 95 | - collapse include dir [/usr/lib/gcc/x86_64-linux-gnu/5/include] ==> [/usr/lib/gcc/x86_64-linux-gnu/5/include] | 101 | + collapse include dir [/usr/lib/gcc/x86_64-linux-gnu/11/include] ==> [/usr/lib/gcc/x86_64-linux-gnu/11/include] |
| 96 | collapse include dir [/usr/local/include] ==> [/usr/local/include] | 102 | collapse include dir [/usr/local/include] ==> [/usr/local/include] |
| 97 | - collapse include dir [/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed] ==> [/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed] | ||
| 98 | collapse include dir [/usr/include/x86_64-linux-gnu] ==> [/usr/include/x86_64-linux-gnu] | 103 | collapse include dir [/usr/include/x86_64-linux-gnu] ==> [/usr/include/x86_64-linux-gnu] |
| 99 | collapse include dir [/usr/include] ==> [/usr/include] | 104 | collapse include dir [/usr/include] ==> [/usr/include] |
| 100 | - implicit include dirs: [/usr/lib/gcc/x86_64-linux-gnu/5/include;/usr/local/include;/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed;/usr/include/x86_64-linux-gnu;/usr/include] | 105 | + implicit include dirs: [/usr/lib/gcc/x86_64-linux-gnu/11/include;/usr/local/include;/usr/include/x86_64-linux-gnu;/usr/include] |
| 101 | 106 | ||
| 102 | 107 | ||
| 103 | Parsed C implicit link information from above output: | 108 | Parsed C implicit link information from above output: |
| 104 | link line regex: [^( *|.*[/\])(ld|CMAKE_LINK_STARTFILE-NOTFOUND|([^/\]+-)?ld|collect2)[^/\]*( |$)] | 109 | link line regex: [^( *|.*[/\])(ld|CMAKE_LINK_STARTFILE-NOTFOUND|([^/\]+-)?ld|collect2)[^/\]*( |$)] |
| 105 | ignore line: [Change Dir: /mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp] | 110 | ignore line: [Change Dir: /mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp] |
| 106 | ignore line: [] | 111 | ignore line: [] |
| 107 | - ignore line: [Run Build Command(s):/usr/bin/make -f Makefile cmTC_00447/fast && /usr/bin/make -f CMakeFiles/cmTC_00447.dir/build.make CMakeFiles/cmTC_00447.dir/build] | ||
| 108 | - ignore line: [make[1]: Entering directory '/mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp'] | ||
| 109 | - ignore line: [Building C object CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o] | ||
| 110 | - ignore line: [/usr/bin/cc -v -o CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o -c /usr/local/share/cmake-3.24/Modules/CMakeCCompilerABI.c] | 112 | + ignore line: [Run Build Command(s):/usr/bin/gmake -f Makefile cmTC_19687/fast && /usr/bin/gmake -f CMakeFiles/cmTC_19687.dir/build.make CMakeFiles/cmTC_19687.dir/build] |
| 113 | + ignore line: [gmake[1]: Entering directory '/mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp'] | ||
| 114 | + ignore line: [Building C object CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o] | ||
| 115 | + ignore line: [/usr/bin/cc -v -o CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o -c /usr/share/cmake-3.22/Modules/CMakeCCompilerABI.c] | ||
| 111 | ignore line: [Using built-in specs.] | 116 | ignore line: [Using built-in specs.] |
| 112 | ignore line: [COLLECT_GCC=/usr/bin/cc] | 117 | ignore line: [COLLECT_GCC=/usr/bin/cc] |
| 118 | + ignore line: [OFFLOAD_TARGET_NAMES=nvptx-none:amdgcn-amdhsa] | ||
| 119 | + ignore line: [OFFLOAD_TARGET_DEFAULT=1] | ||
| 113 | ignore line: [Target: x86_64-linux-gnu] | 120 | ignore line: [Target: x86_64-linux-gnu] |
| 114 | - ignore line: [Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.12' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c ada c++ java go d fortran objc obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32 m64 mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu] | 121 | + ignore line: [Configured with: ../src/configure -v --with-pkgversion='Ubuntu 11.4.0-1ubuntu1~22.04' --with-bugurl=file:///usr/share/doc/gcc-11/README.Bugs --enable-languages=c ada c++ go brig d fortran objc obj-c++ m2 --prefix=/usr --with-gcc-major-version-only --program-suffix=-11 --program-prefix=x86_64-linux-gnu- --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --enable-bootstrap --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-plugin --enable-default-pie --with-system-zlib --enable-libphobos-checking=release --with-target-system-zlib=auto --enable-objc-gc=auto --enable-multiarch --disable-werror --enable-cet --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32 m64 mx32 --enable-multilib --with-tune=generic --enable-offload-targets=nvptx-none=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-nvptx/usr amdgcn-amdhsa=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-gcn/usr --without-cuda-driver --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu --with-build-config=bootstrap-lto-lean --enable-link-serialization=2] |
| 115 | ignore line: [Thread model: posix] | 122 | ignore line: [Thread model: posix] |
| 116 | - ignore line: [gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.12) ] | ||
| 117 | - ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64'] | ||
| 118 | - ignore line: [ /usr/lib/gcc/x86_64-linux-gnu/5/cc1 -quiet -v -imultiarch x86_64-linux-gnu /usr/local/share/cmake-3.24/Modules/CMakeCCompilerABI.c -quiet -dumpbase CMakeCCompilerABI.c -mtune=generic -march=x86-64 -auxbase-strip CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o -version -fstack-protector-strong -Wformat -Wformat-security -o /tmp/ccIxyOM6.s] | ||
| 119 | - ignore line: [GNU C11 (Ubuntu 5.4.0-6ubuntu1~16.04.12) version 5.4.0 20160609 (x86_64-linux-gnu)] | ||
| 120 | - ignore line: [ compiled by GNU C version 5.4.0 20160609 GMP version 6.1.0 MPFR version 3.1.4 MPC version 1.0.3] | ||
| 121 | - ignore line: [warning: GMP header version 6.1.0 differs from library version 6.1.2.] | 123 | + ignore line: [Supported LTO compression algorithms: zlib zstd] |
| 124 | + ignore line: [gcc version 11.4.0 (Ubuntu 11.4.0-1ubuntu1~22.04) ] | ||
| 125 | + ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_19687.dir/'] | ||
| 126 | + ignore line: [ /usr/lib/gcc/x86_64-linux-gnu/11/cc1 -quiet -v -imultiarch x86_64-linux-gnu /usr/share/cmake-3.22/Modules/CMakeCCompilerABI.c -quiet -dumpdir CMakeFiles/cmTC_19687.dir/ -dumpbase CMakeCCompilerABI.c.c -dumpbase-ext .c -mtune=generic -march=x86-64 -version -fasynchronous-unwind-tables -fstack-protector-strong -Wformat -Wformat-security -fstack-clash-protection -fcf-protection -o /tmp/cc311es4.s] | ||
| 127 | + ignore line: [GNU C17 (Ubuntu 11.4.0-1ubuntu1~22.04) version 11.4.0 (x86_64-linux-gnu)] | ||
| 128 | + ignore line: [ compiled by GNU C version 11.4.0 GMP version 6.2.1 MPFR version 4.1.0 MPC version 1.2.1 isl version isl-0.24-GMP] | ||
| 129 | + ignore line: [] | ||
| 122 | ignore line: [GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072] | 130 | ignore line: [GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072] |
| 123 | ignore line: [ignoring nonexistent directory "/usr/local/include/x86_64-linux-gnu"] | 131 | ignore line: [ignoring nonexistent directory "/usr/local/include/x86_64-linux-gnu"] |
| 124 | - ignore line: [ignoring nonexistent directory "/usr/lib/gcc/x86_64-linux-gnu/5/../../../../x86_64-linux-gnu/include"] | 132 | + ignore line: [ignoring nonexistent directory "/usr/lib/gcc/x86_64-linux-gnu/11/include-fixed"] |
| 133 | + ignore line: [ignoring nonexistent directory "/usr/lib/gcc/x86_64-linux-gnu/11/../../../../x86_64-linux-gnu/include"] | ||
| 125 | ignore line: [#include "..." search starts here:] | 134 | ignore line: [#include "..." search starts here:] |
| 126 | ignore line: [#include <...> search starts here:] | 135 | ignore line: [#include <...> search starts here:] |
| 127 | - ignore line: [ /usr/lib/gcc/x86_64-linux-gnu/5/include] | 136 | + ignore line: [ /usr/lib/gcc/x86_64-linux-gnu/11/include] |
| 128 | ignore line: [ /usr/local/include] | 137 | ignore line: [ /usr/local/include] |
| 129 | - ignore line: [ /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed] | ||
| 130 | ignore line: [ /usr/include/x86_64-linux-gnu] | 138 | ignore line: [ /usr/include/x86_64-linux-gnu] |
| 131 | ignore line: [ /usr/include] | 139 | ignore line: [ /usr/include] |
| 132 | ignore line: [End of search list.] | 140 | ignore line: [End of search list.] |
| 133 | - ignore line: [GNU C11 (Ubuntu 5.4.0-6ubuntu1~16.04.12) version 5.4.0 20160609 (x86_64-linux-gnu)] | ||
| 134 | - ignore line: [ compiled by GNU C version 5.4.0 20160609 GMP version 6.1.0 MPFR version 3.1.4 MPC version 1.0.3] | ||
| 135 | - ignore line: [warning: GMP header version 6.1.0 differs from library version 6.1.2.] | 141 | + ignore line: [GNU C17 (Ubuntu 11.4.0-1ubuntu1~22.04) version 11.4.0 (x86_64-linux-gnu)] |
| 142 | + ignore line: [ compiled by GNU C version 11.4.0 GMP version 6.2.1 MPFR version 4.1.0 MPC version 1.2.1 isl version isl-0.24-GMP] | ||
| 143 | + ignore line: [] | ||
| 136 | ignore line: [GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072] | 144 | ignore line: [GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072] |
| 137 | - ignore line: [Compiler executable checksum: 8087146d2ee737d238113fb57fabb1f2] | ||
| 138 | - ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64'] | ||
| 139 | - ignore line: [ as -v --64 -o CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o /tmp/ccIxyOM6.s] | ||
| 140 | - ignore line: [GNU assembler version 2.26.1 (x86_64-linux-gnu) using BFD version (GNU Binutils for Ubuntu) 2.26.1] | ||
| 141 | - ignore line: [COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/] | ||
| 142 | - ignore line: [LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../:/lib/:/usr/lib/] | ||
| 143 | - ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64'] | ||
| 144 | - ignore line: [Linking C executable cmTC_00447] | ||
| 145 | - ignore line: [/usr/local/bin/cmake -E cmake_link_script CMakeFiles/cmTC_00447.dir/link.txt --verbose=1] | ||
| 146 | - ignore line: [/usr/bin/cc -v -rdynamic CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o -o cmTC_00447 ] | 145 | + ignore line: [Compiler executable checksum: 50eaa2331df977b8016186198deb2d18] |
| 146 | + ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_19687.dir/'] | ||
| 147 | + ignore line: [ as -v --64 -o CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o /tmp/cc311es4.s] | ||
| 148 | + ignore line: [GNU assembler version 2.38 (x86_64-linux-gnu) using BFD version (GNU Binutils for Ubuntu) 2.38] | ||
| 149 | + ignore line: [COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/] | ||
| 150 | + ignore line: [LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../:/lib/:/usr/lib/] | ||
| 151 | + ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.'] | ||
| 152 | + ignore line: [Linking C executable cmTC_19687] | ||
| 153 | + ignore line: [/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_19687.dir/link.txt --verbose=1] | ||
| 154 | + ignore line: [/usr/bin/cc -v -rdynamic CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o -o cmTC_19687 ] | ||
| 147 | ignore line: [Using built-in specs.] | 155 | ignore line: [Using built-in specs.] |
| 148 | ignore line: [COLLECT_GCC=/usr/bin/cc] | 156 | ignore line: [COLLECT_GCC=/usr/bin/cc] |
| 149 | - ignore line: [COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper] | 157 | + ignore line: [COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/11/lto-wrapper] |
| 158 | + ignore line: [OFFLOAD_TARGET_NAMES=nvptx-none:amdgcn-amdhsa] | ||
| 159 | + ignore line: [OFFLOAD_TARGET_DEFAULT=1] | ||
| 150 | ignore line: [Target: x86_64-linux-gnu] | 160 | ignore line: [Target: x86_64-linux-gnu] |
| 151 | - ignore line: [Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.12' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c ada c++ java go d fortran objc obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32 m64 mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu] | 161 | + ignore line: [Configured with: ../src/configure -v --with-pkgversion='Ubuntu 11.4.0-1ubuntu1~22.04' --with-bugurl=file:///usr/share/doc/gcc-11/README.Bugs --enable-languages=c ada c++ go brig d fortran objc obj-c++ m2 --prefix=/usr --with-gcc-major-version-only --program-suffix=-11 --program-prefix=x86_64-linux-gnu- --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --enable-bootstrap --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-plugin --enable-default-pie --with-system-zlib --enable-libphobos-checking=release --with-target-system-zlib=auto --enable-objc-gc=auto --enable-multiarch --disable-werror --enable-cet --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32 m64 mx32 --enable-multilib --with-tune=generic --enable-offload-targets=nvptx-none=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-nvptx/usr amdgcn-amdhsa=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-gcn/usr --without-cuda-driver --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu --with-build-config=bootstrap-lto-lean --enable-link-serialization=2] |
| 152 | ignore line: [Thread model: posix] | 162 | ignore line: [Thread model: posix] |
| 153 | - ignore line: [gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.12) ] | ||
| 154 | - ignore line: [COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/] | ||
| 155 | - ignore line: [LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../:/lib/:/usr/lib/] | ||
| 156 | - ignore line: [COLLECT_GCC_OPTIONS='-v' '-rdynamic' '-o' 'cmTC_00447' '-mtune=generic' '-march=x86-64'] | ||
| 157 | - link line: [ /usr/lib/gcc/x86_64-linux-gnu/5/collect2 -plugin /usr/lib/gcc/x86_64-linux-gnu/5/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper -plugin-opt=-fresolution=/tmp/ccEoXNga.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --sysroot=/ --build-id --eh-frame-hdr -m elf_x86_64 --hash-style=gnu --as-needed -export-dynamic -dynamic-linker /lib64/ld-linux-x86-64.so.2 -z relro -o cmTC_00447 /usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crt1.o /usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crti.o /usr/lib/gcc/x86_64-linux-gnu/5/crtbegin.o -L/usr/lib/gcc/x86_64-linux-gnu/5 -L/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/5/../../.. CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o -lgcc --as-needed -lgcc_s --no-as-needed -lc -lgcc --as-needed -lgcc_s --no-as-needed /usr/lib/gcc/x86_64-linux-gnu/5/crtend.o /usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crtn.o] | ||
| 158 | - arg [/usr/lib/gcc/x86_64-linux-gnu/5/collect2] ==> ignore | 163 | + ignore line: [Supported LTO compression algorithms: zlib zstd] |
| 164 | + ignore line: [gcc version 11.4.0 (Ubuntu 11.4.0-1ubuntu1~22.04) ] | ||
| 165 | + ignore line: [COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/] | ||
| 166 | + ignore line: [LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../:/lib/:/usr/lib/] | ||
| 167 | + ignore line: [COLLECT_GCC_OPTIONS='-v' '-rdynamic' '-o' 'cmTC_19687' '-mtune=generic' '-march=x86-64' '-dumpdir' 'cmTC_19687.'] | ||
| 168 | + link line: [ /usr/lib/gcc/x86_64-linux-gnu/11/collect2 -plugin /usr/lib/gcc/x86_64-linux-gnu/11/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-linux-gnu/11/lto-wrapper -plugin-opt=-fresolution=/tmp/ccfuqfIm.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --build-id --eh-frame-hdr -m elf_x86_64 --hash-style=gnu --as-needed -export-dynamic -dynamic-linker /lib64/ld-linux-x86-64.so.2 -pie -z now -z relro -o cmTC_19687 /usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/Scrt1.o /usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crti.o /usr/lib/gcc/x86_64-linux-gnu/11/crtbeginS.o -L/usr/lib/gcc/x86_64-linux-gnu/11 -L/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/11/../../.. CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o -lgcc --push-state --as-needed -lgcc_s --pop-state -lc -lgcc --push-state --as-needed -lgcc_s --pop-state /usr/lib/gcc/x86_64-linux-gnu/11/crtendS.o /usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crtn.o] | ||
| 169 | + arg [/usr/lib/gcc/x86_64-linux-gnu/11/collect2] ==> ignore | ||
| 159 | arg [-plugin] ==> ignore | 170 | arg [-plugin] ==> ignore |
| 160 | - arg [/usr/lib/gcc/x86_64-linux-gnu/5/liblto_plugin.so] ==> ignore | ||
| 161 | - arg [-plugin-opt=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper] ==> ignore | ||
| 162 | - arg [-plugin-opt=-fresolution=/tmp/ccEoXNga.res] ==> ignore | 171 | + arg [/usr/lib/gcc/x86_64-linux-gnu/11/liblto_plugin.so] ==> ignore |
| 172 | + arg [-plugin-opt=/usr/lib/gcc/x86_64-linux-gnu/11/lto-wrapper] ==> ignore | ||
| 173 | + arg [-plugin-opt=-fresolution=/tmp/ccfuqfIm.res] ==> ignore | ||
| 163 | arg [-plugin-opt=-pass-through=-lgcc] ==> ignore | 174 | arg [-plugin-opt=-pass-through=-lgcc] ==> ignore |
| 164 | arg [-plugin-opt=-pass-through=-lgcc_s] ==> ignore | 175 | arg [-plugin-opt=-pass-through=-lgcc_s] ==> ignore |
| 165 | arg [-plugin-opt=-pass-through=-lc] ==> ignore | 176 | arg [-plugin-opt=-pass-through=-lc] ==> ignore |
| 166 | arg [-plugin-opt=-pass-through=-lgcc] ==> ignore | 177 | arg [-plugin-opt=-pass-through=-lgcc] ==> ignore |
| 167 | arg [-plugin-opt=-pass-through=-lgcc_s] ==> ignore | 178 | arg [-plugin-opt=-pass-through=-lgcc_s] ==> ignore |
| 168 | - arg [--sysroot=/] ==> ignore | ||
| 169 | arg [--build-id] ==> ignore | 179 | arg [--build-id] ==> ignore |
| 170 | arg [--eh-frame-hdr] ==> ignore | 180 | arg [--eh-frame-hdr] ==> ignore |
| 171 | arg [-m] ==> ignore | 181 | arg [-m] ==> ignore |
| @@ -175,204 +185,218 @@ Parsed C implicit link information from above output: | @@ -175,204 +185,218 @@ Parsed C implicit link information from above output: | ||
| 175 | arg [-export-dynamic] ==> ignore | 185 | arg [-export-dynamic] ==> ignore |
| 176 | arg [-dynamic-linker] ==> ignore | 186 | arg [-dynamic-linker] ==> ignore |
| 177 | arg [/lib64/ld-linux-x86-64.so.2] ==> ignore | 187 | arg [/lib64/ld-linux-x86-64.so.2] ==> ignore |
| 188 | + arg [-pie] ==> ignore | ||
| 189 | + arg [-znow] ==> ignore | ||
| 178 | arg [-zrelro] ==> ignore | 190 | arg [-zrelro] ==> ignore |
| 179 | arg [-o] ==> ignore | 191 | arg [-o] ==> ignore |
| 180 | - arg [cmTC_00447] ==> ignore | ||
| 181 | - arg [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crt1.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crt1.o] | ||
| 182 | - arg [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crti.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crti.o] | ||
| 183 | - arg [/usr/lib/gcc/x86_64-linux-gnu/5/crtbegin.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/5/crtbegin.o] | ||
| 184 | - arg [-L/usr/lib/gcc/x86_64-linux-gnu/5] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/5] | ||
| 185 | - arg [-L/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu] | ||
| 186 | - arg [-L/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib] | 192 | + arg [cmTC_19687] ==> ignore |
| 193 | + arg [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/Scrt1.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/Scrt1.o] | ||
| 194 | + arg [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crti.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crti.o] | ||
| 195 | + arg [/usr/lib/gcc/x86_64-linux-gnu/11/crtbeginS.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/11/crtbeginS.o] | ||
| 196 | + arg [-L/usr/lib/gcc/x86_64-linux-gnu/11] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/11] | ||
| 197 | + arg [-L/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu] | ||
| 198 | + arg [-L/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib] | ||
| 187 | arg [-L/lib/x86_64-linux-gnu] ==> dir [/lib/x86_64-linux-gnu] | 199 | arg [-L/lib/x86_64-linux-gnu] ==> dir [/lib/x86_64-linux-gnu] |
| 188 | arg [-L/lib/../lib] ==> dir [/lib/../lib] | 200 | arg [-L/lib/../lib] ==> dir [/lib/../lib] |
| 189 | arg [-L/usr/lib/x86_64-linux-gnu] ==> dir [/usr/lib/x86_64-linux-gnu] | 201 | arg [-L/usr/lib/x86_64-linux-gnu] ==> dir [/usr/lib/x86_64-linux-gnu] |
| 190 | arg [-L/usr/lib/../lib] ==> dir [/usr/lib/../lib] | 202 | arg [-L/usr/lib/../lib] ==> dir [/usr/lib/../lib] |
| 191 | - arg [-L/usr/lib/gcc/x86_64-linux-gnu/5/../../..] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/5/../../..] | ||
| 192 | - arg [CMakeFiles/cmTC_00447.dir/CMakeCCompilerABI.c.o] ==> ignore | 203 | + arg [-L/usr/lib/gcc/x86_64-linux-gnu/11/../../..] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/11/../../..] |
| 204 | + arg [CMakeFiles/cmTC_19687.dir/CMakeCCompilerABI.c.o] ==> ignore | ||
| 193 | arg [-lgcc] ==> lib [gcc] | 205 | arg [-lgcc] ==> lib [gcc] |
| 206 | + arg [--push-state] ==> ignore | ||
| 194 | arg [--as-needed] ==> ignore | 207 | arg [--as-needed] ==> ignore |
| 195 | arg [-lgcc_s] ==> lib [gcc_s] | 208 | arg [-lgcc_s] ==> lib [gcc_s] |
| 196 | - arg [--no-as-needed] ==> ignore | 209 | + arg [--pop-state] ==> ignore |
| 197 | arg [-lc] ==> lib [c] | 210 | arg [-lc] ==> lib [c] |
| 198 | arg [-lgcc] ==> lib [gcc] | 211 | arg [-lgcc] ==> lib [gcc] |
| 212 | + arg [--push-state] ==> ignore | ||
| 199 | arg [--as-needed] ==> ignore | 213 | arg [--as-needed] ==> ignore |
| 200 | arg [-lgcc_s] ==> lib [gcc_s] | 214 | arg [-lgcc_s] ==> lib [gcc_s] |
| 201 | - arg [--no-as-needed] ==> ignore | ||
| 202 | - arg [/usr/lib/gcc/x86_64-linux-gnu/5/crtend.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/5/crtend.o] | ||
| 203 | - arg [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crtn.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crtn.o] | ||
| 204 | - collapse obj [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crt1.o] ==> [/usr/lib/x86_64-linux-gnu/crt1.o] | ||
| 205 | - collapse obj [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crti.o] ==> [/usr/lib/x86_64-linux-gnu/crti.o] | ||
| 206 | - collapse obj [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crtn.o] ==> [/usr/lib/x86_64-linux-gnu/crtn.o] | ||
| 207 | - collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/5] ==> [/usr/lib/gcc/x86_64-linux-gnu/5] | ||
| 208 | - collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu] ==> [/usr/lib/x86_64-linux-gnu] | ||
| 209 | - collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib] ==> [/usr/lib] | 215 | + arg [--pop-state] ==> ignore |
| 216 | + arg [/usr/lib/gcc/x86_64-linux-gnu/11/crtendS.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/11/crtendS.o] | ||
| 217 | + arg [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crtn.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crtn.o] | ||
| 218 | + collapse obj [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/Scrt1.o] ==> [/usr/lib/x86_64-linux-gnu/Scrt1.o] | ||
| 219 | + collapse obj [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crti.o] ==> [/usr/lib/x86_64-linux-gnu/crti.o] | ||
| 220 | + collapse obj [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crtn.o] ==> [/usr/lib/x86_64-linux-gnu/crtn.o] | ||
| 221 | + collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/11] ==> [/usr/lib/gcc/x86_64-linux-gnu/11] | ||
| 222 | + collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu] ==> [/usr/lib/x86_64-linux-gnu] | ||
| 223 | + collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib] ==> [/usr/lib] | ||
| 210 | collapse library dir [/lib/x86_64-linux-gnu] ==> [/lib/x86_64-linux-gnu] | 224 | collapse library dir [/lib/x86_64-linux-gnu] ==> [/lib/x86_64-linux-gnu] |
| 211 | collapse library dir [/lib/../lib] ==> [/lib] | 225 | collapse library dir [/lib/../lib] ==> [/lib] |
| 212 | collapse library dir [/usr/lib/x86_64-linux-gnu] ==> [/usr/lib/x86_64-linux-gnu] | 226 | collapse library dir [/usr/lib/x86_64-linux-gnu] ==> [/usr/lib/x86_64-linux-gnu] |
| 213 | collapse library dir [/usr/lib/../lib] ==> [/usr/lib] | 227 | collapse library dir [/usr/lib/../lib] ==> [/usr/lib] |
| 214 | - collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/5/../../..] ==> [/usr/lib] | 228 | + collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/11/../../..] ==> [/usr/lib] |
| 215 | implicit libs: [gcc;gcc_s;c;gcc;gcc_s] | 229 | implicit libs: [gcc;gcc_s;c;gcc;gcc_s] |
| 216 | - implicit objs: [/usr/lib/x86_64-linux-gnu/crt1.o;/usr/lib/x86_64-linux-gnu/crti.o;/usr/lib/gcc/x86_64-linux-gnu/5/crtbegin.o;/usr/lib/gcc/x86_64-linux-gnu/5/crtend.o;/usr/lib/x86_64-linux-gnu/crtn.o] | ||
| 217 | - implicit dirs: [/usr/lib/gcc/x86_64-linux-gnu/5;/usr/lib/x86_64-linux-gnu;/usr/lib;/lib/x86_64-linux-gnu;/lib] | 230 | + implicit objs: [/usr/lib/x86_64-linux-gnu/Scrt1.o;/usr/lib/x86_64-linux-gnu/crti.o;/usr/lib/gcc/x86_64-linux-gnu/11/crtbeginS.o;/usr/lib/gcc/x86_64-linux-gnu/11/crtendS.o;/usr/lib/x86_64-linux-gnu/crtn.o] |
| 231 | + implicit dirs: [/usr/lib/gcc/x86_64-linux-gnu/11;/usr/lib/x86_64-linux-gnu;/usr/lib;/lib/x86_64-linux-gnu;/lib] | ||
| 218 | implicit fwks: [] | 232 | implicit fwks: [] |
| 219 | 233 | ||
| 220 | 234 | ||
| 221 | Detecting CXX compiler ABI info compiled with the following output: | 235 | Detecting CXX compiler ABI info compiled with the following output: |
| 222 | Change Dir: /mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp | 236 | Change Dir: /mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp |
| 223 | 237 | ||
| 224 | -Run Build Command(s):/usr/bin/make -f Makefile cmTC_4d967/fast && /usr/bin/make -f CMakeFiles/cmTC_4d967.dir/build.make CMakeFiles/cmTC_4d967.dir/build | ||
| 225 | -make[1]: Entering directory '/mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp' | ||
| 226 | -Building CXX object CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o | ||
| 227 | -/usr/bin/c++ -v -o CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o -c /usr/local/share/cmake-3.24/Modules/CMakeCXXCompilerABI.cpp | 238 | +Run Build Command(s):/usr/bin/gmake -f Makefile cmTC_26a04/fast && /usr/bin/gmake -f CMakeFiles/cmTC_26a04.dir/build.make CMakeFiles/cmTC_26a04.dir/build |
| 239 | +gmake[1]: Entering directory '/mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp' | ||
| 240 | +Building CXX object CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o | ||
| 241 | +/usr/bin/c++ -v -o CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o -c /usr/share/cmake-3.22/Modules/CMakeCXXCompilerABI.cpp | ||
| 228 | Using built-in specs. | 242 | Using built-in specs. |
| 229 | COLLECT_GCC=/usr/bin/c++ | 243 | COLLECT_GCC=/usr/bin/c++ |
| 244 | +OFFLOAD_TARGET_NAMES=nvptx-none:amdgcn-amdhsa | ||
| 245 | +OFFLOAD_TARGET_DEFAULT=1 | ||
| 230 | Target: x86_64-linux-gnu | 246 | Target: x86_64-linux-gnu |
| 231 | -Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.12' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu | 247 | +Configured with: ../src/configure -v --with-pkgversion='Ubuntu 11.4.0-1ubuntu1~22.04' --with-bugurl=file:///usr/share/doc/gcc-11/README.Bugs --enable-languages=c,ada,c++,go,brig,d,fortran,objc,obj-c++,m2 --prefix=/usr --with-gcc-major-version-only --program-suffix=-11 --program-prefix=x86_64-linux-gnu- --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --enable-bootstrap --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-plugin --enable-default-pie --with-system-zlib --enable-libphobos-checking=release --with-target-system-zlib=auto --enable-objc-gc=auto --enable-multiarch --disable-werror --enable-cet --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-offload-targets=nvptx-none=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-nvptx/usr,amdgcn-amdhsa=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-gcn/usr --without-cuda-driver --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu --with-build-config=bootstrap-lto-lean --enable-link-serialization=2 |
| 232 | Thread model: posix | 248 | Thread model: posix |
| 233 | -gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.12) | ||
| 234 | -COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o' '-c' '-shared-libgcc' '-mtune=generic' '-march=x86-64' | ||
| 235 | - /usr/lib/gcc/x86_64-linux-gnu/5/cc1plus -quiet -v -imultiarch x86_64-linux-gnu -D_GNU_SOURCE /usr/local/share/cmake-3.24/Modules/CMakeCXXCompilerABI.cpp -quiet -dumpbase CMakeCXXCompilerABI.cpp -mtune=generic -march=x86-64 -auxbase-strip CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o -version -fstack-protector-strong -Wformat -Wformat-security -o /tmp/ccAN8kvg.s | ||
| 236 | -GNU C++ (Ubuntu 5.4.0-6ubuntu1~16.04.12) version 5.4.0 20160609 (x86_64-linux-gnu) | ||
| 237 | - compiled by GNU C version 5.4.0 20160609, GMP version 6.1.0, MPFR version 3.1.4, MPC version 1.0.3 | ||
| 238 | -warning: GMP header version 6.1.0 differs from library version 6.1.2. | 249 | +Supported LTO compression algorithms: zlib zstd |
| 250 | +gcc version 11.4.0 (Ubuntu 11.4.0-1ubuntu1~22.04) | ||
| 251 | +COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o' '-c' '-shared-libgcc' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_26a04.dir/' | ||
| 252 | + /usr/lib/gcc/x86_64-linux-gnu/11/cc1plus -quiet -v -imultiarch x86_64-linux-gnu -D_GNU_SOURCE /usr/share/cmake-3.22/Modules/CMakeCXXCompilerABI.cpp -quiet -dumpdir CMakeFiles/cmTC_26a04.dir/ -dumpbase CMakeCXXCompilerABI.cpp.cpp -dumpbase-ext .cpp -mtune=generic -march=x86-64 -version -fasynchronous-unwind-tables -fstack-protector-strong -Wformat -Wformat-security -fstack-clash-protection -fcf-protection -o /tmp/ccUVymap.s | ||
| 253 | +GNU C++17 (Ubuntu 11.4.0-1ubuntu1~22.04) version 11.4.0 (x86_64-linux-gnu) | ||
| 254 | + compiled by GNU C version 11.4.0, GMP version 6.2.1, MPFR version 4.1.0, MPC version 1.2.1, isl version isl-0.24-GMP | ||
| 255 | + | ||
| 239 | GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072 | 256 | GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072 |
| 240 | -ignoring duplicate directory "/usr/include/x86_64-linux-gnu/c++/5" | 257 | +ignoring duplicate directory "/usr/include/x86_64-linux-gnu/c++/11" |
| 241 | ignoring nonexistent directory "/usr/local/include/x86_64-linux-gnu" | 258 | ignoring nonexistent directory "/usr/local/include/x86_64-linux-gnu" |
| 242 | -ignoring nonexistent directory "/usr/lib/gcc/x86_64-linux-gnu/5/../../../../x86_64-linux-gnu/include" | 259 | +ignoring nonexistent directory "/usr/lib/gcc/x86_64-linux-gnu/11/include-fixed" |
| 260 | +ignoring nonexistent directory "/usr/lib/gcc/x86_64-linux-gnu/11/../../../../x86_64-linux-gnu/include" | ||
| 243 | #include "..." search starts here: | 261 | #include "..." search starts here: |
| 244 | #include <...> search starts here: | 262 | #include <...> search starts here: |
| 245 | - /usr/include/c++/5 | ||
| 246 | - /usr/include/x86_64-linux-gnu/c++/5 | ||
| 247 | - /usr/include/c++/5/backward | ||
| 248 | - /usr/lib/gcc/x86_64-linux-gnu/5/include | 263 | + /usr/include/c++/11 |
| 264 | + /usr/include/x86_64-linux-gnu/c++/11 | ||
| 265 | + /usr/include/c++/11/backward | ||
| 266 | + /usr/lib/gcc/x86_64-linux-gnu/11/include | ||
| 249 | /usr/local/include | 267 | /usr/local/include |
| 250 | - /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed | ||
| 251 | /usr/include/x86_64-linux-gnu | 268 | /usr/include/x86_64-linux-gnu |
| 252 | /usr/include | 269 | /usr/include |
| 253 | End of search list. | 270 | End of search list. |
| 254 | -GNU C++ (Ubuntu 5.4.0-6ubuntu1~16.04.12) version 5.4.0 20160609 (x86_64-linux-gnu) | ||
| 255 | - compiled by GNU C version 5.4.0 20160609, GMP version 6.1.0, MPFR version 3.1.4, MPC version 1.0.3 | ||
| 256 | -warning: GMP header version 6.1.0 differs from library version 6.1.2. | 271 | +GNU C++17 (Ubuntu 11.4.0-1ubuntu1~22.04) version 11.4.0 (x86_64-linux-gnu) |
| 272 | + compiled by GNU C version 11.4.0, GMP version 6.2.1, MPFR version 4.1.0, MPC version 1.2.1, isl version isl-0.24-GMP | ||
| 273 | + | ||
| 257 | GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072 | 274 | GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072 |
| 258 | -Compiler executable checksum: 85af4995304287cdd19cfa43cf5d6cf1 | ||
| 259 | -COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o' '-c' '-shared-libgcc' '-mtune=generic' '-march=x86-64' | ||
| 260 | - as -v --64 -o CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o /tmp/ccAN8kvg.s | ||
| 261 | -GNU assembler version 2.26.1 (x86_64-linux-gnu) using BFD version (GNU Binutils for Ubuntu) 2.26.1 | ||
| 262 | -COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/ | ||
| 263 | -LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../:/lib/:/usr/lib/ | ||
| 264 | -COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o' '-c' '-shared-libgcc' '-mtune=generic' '-march=x86-64' | ||
| 265 | -Linking CXX executable cmTC_4d967 | ||
| 266 | -/usr/local/bin/cmake -E cmake_link_script CMakeFiles/cmTC_4d967.dir/link.txt --verbose=1 | ||
| 267 | -/usr/bin/c++ -v -rdynamic CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o -o cmTC_4d967 | 275 | +Compiler executable checksum: d591828bb4d392ae8b7b160e5bb0b95f |
| 276 | +COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o' '-c' '-shared-libgcc' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_26a04.dir/' | ||
| 277 | + as -v --64 -o CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o /tmp/ccUVymap.s | ||
| 278 | +GNU assembler version 2.38 (x86_64-linux-gnu) using BFD version (GNU Binutils for Ubuntu) 2.38 | ||
| 279 | +COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/ | ||
| 280 | +LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../:/lib/:/usr/lib/ | ||
| 281 | +COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o' '-c' '-shared-libgcc' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.' | ||
| 282 | +Linking CXX executable cmTC_26a04 | ||
| 283 | +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_26a04.dir/link.txt --verbose=1 | ||
| 284 | +/usr/bin/c++ -v -rdynamic CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o -o cmTC_26a04 | ||
| 268 | Using built-in specs. | 285 | Using built-in specs. |
| 269 | COLLECT_GCC=/usr/bin/c++ | 286 | COLLECT_GCC=/usr/bin/c++ |
| 270 | -COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper | 287 | +COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/11/lto-wrapper |
| 288 | +OFFLOAD_TARGET_NAMES=nvptx-none:amdgcn-amdhsa | ||
| 289 | +OFFLOAD_TARGET_DEFAULT=1 | ||
| 271 | Target: x86_64-linux-gnu | 290 | Target: x86_64-linux-gnu |
| 272 | -Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.12' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu | 291 | +Configured with: ../src/configure -v --with-pkgversion='Ubuntu 11.4.0-1ubuntu1~22.04' --with-bugurl=file:///usr/share/doc/gcc-11/README.Bugs --enable-languages=c,ada,c++,go,brig,d,fortran,objc,obj-c++,m2 --prefix=/usr --with-gcc-major-version-only --program-suffix=-11 --program-prefix=x86_64-linux-gnu- --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --enable-bootstrap --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-plugin --enable-default-pie --with-system-zlib --enable-libphobos-checking=release --with-target-system-zlib=auto --enable-objc-gc=auto --enable-multiarch --disable-werror --enable-cet --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-offload-targets=nvptx-none=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-nvptx/usr,amdgcn-amdhsa=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-gcn/usr --without-cuda-driver --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu --with-build-config=bootstrap-lto-lean --enable-link-serialization=2 |
| 273 | Thread model: posix | 292 | Thread model: posix |
| 274 | -gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.12) | ||
| 275 | -COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/ | ||
| 276 | -LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../:/lib/:/usr/lib/ | ||
| 277 | -COLLECT_GCC_OPTIONS='-v' '-rdynamic' '-o' 'cmTC_4d967' '-shared-libgcc' '-mtune=generic' '-march=x86-64' | ||
| 278 | - /usr/lib/gcc/x86_64-linux-gnu/5/collect2 -plugin /usr/lib/gcc/x86_64-linux-gnu/5/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper -plugin-opt=-fresolution=/tmp/cc112s3j.res -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lgcc --sysroot=/ --build-id --eh-frame-hdr -m elf_x86_64 --hash-style=gnu --as-needed -export-dynamic -dynamic-linker /lib64/ld-linux-x86-64.so.2 -z relro -o cmTC_4d967 /usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crt1.o /usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crti.o /usr/lib/gcc/x86_64-linux-gnu/5/crtbegin.o -L/usr/lib/gcc/x86_64-linux-gnu/5 -L/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/5/../../.. CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc_s -lgcc -lc -lgcc_s -lgcc /usr/lib/gcc/x86_64-linux-gnu/5/crtend.o /usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crtn.o | ||
| 279 | -make[1]: Leaving directory '/mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp' | 293 | +Supported LTO compression algorithms: zlib zstd |
| 294 | +gcc version 11.4.0 (Ubuntu 11.4.0-1ubuntu1~22.04) | ||
| 295 | +COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/ | ||
| 296 | +LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../:/lib/:/usr/lib/ | ||
| 297 | +COLLECT_GCC_OPTIONS='-v' '-rdynamic' '-o' 'cmTC_26a04' '-shared-libgcc' '-mtune=generic' '-march=x86-64' '-dumpdir' 'cmTC_26a04.' | ||
| 298 | + /usr/lib/gcc/x86_64-linux-gnu/11/collect2 -plugin /usr/lib/gcc/x86_64-linux-gnu/11/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-linux-gnu/11/lto-wrapper -plugin-opt=-fresolution=/tmp/cc01sBHC.res -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lgcc --build-id --eh-frame-hdr -m elf_x86_64 --hash-style=gnu --as-needed -export-dynamic -dynamic-linker /lib64/ld-linux-x86-64.so.2 -pie -z now -z relro -o cmTC_26a04 /usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/Scrt1.o /usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crti.o /usr/lib/gcc/x86_64-linux-gnu/11/crtbeginS.o -L/usr/lib/gcc/x86_64-linux-gnu/11 -L/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/11/../../.. CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc_s -lgcc -lc -lgcc_s -lgcc /usr/lib/gcc/x86_64-linux-gnu/11/crtendS.o /usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crtn.o | ||
| 299 | +COLLECT_GCC_OPTIONS='-v' '-rdynamic' '-o' 'cmTC_26a04' '-shared-libgcc' '-mtune=generic' '-march=x86-64' '-dumpdir' 'cmTC_26a04.' | ||
| 300 | +gmake[1]: Leaving directory '/mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp' | ||
| 280 | 301 | ||
| 281 | 302 | ||
| 282 | 303 | ||
| 283 | Parsed CXX implicit include dir info from above output: rv=done | 304 | Parsed CXX implicit include dir info from above output: rv=done |
| 284 | found start of include info | 305 | found start of include info |
| 285 | found start of implicit include info | 306 | found start of implicit include info |
| 286 | - add: [/usr/include/c++/5] | ||
| 287 | - add: [/usr/include/x86_64-linux-gnu/c++/5] | ||
| 288 | - add: [/usr/include/c++/5/backward] | ||
| 289 | - add: [/usr/lib/gcc/x86_64-linux-gnu/5/include] | 307 | + add: [/usr/include/c++/11] |
| 308 | + add: [/usr/include/x86_64-linux-gnu/c++/11] | ||
| 309 | + add: [/usr/include/c++/11/backward] | ||
| 310 | + add: [/usr/lib/gcc/x86_64-linux-gnu/11/include] | ||
| 290 | add: [/usr/local/include] | 311 | add: [/usr/local/include] |
| 291 | - add: [/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed] | ||
| 292 | add: [/usr/include/x86_64-linux-gnu] | 312 | add: [/usr/include/x86_64-linux-gnu] |
| 293 | add: [/usr/include] | 313 | add: [/usr/include] |
| 294 | end of search list found | 314 | end of search list found |
| 295 | - collapse include dir [/usr/include/c++/5] ==> [/usr/include/c++/5] | ||
| 296 | - collapse include dir [/usr/include/x86_64-linux-gnu/c++/5] ==> [/usr/include/x86_64-linux-gnu/c++/5] | ||
| 297 | - collapse include dir [/usr/include/c++/5/backward] ==> [/usr/include/c++/5/backward] | ||
| 298 | - collapse include dir [/usr/lib/gcc/x86_64-linux-gnu/5/include] ==> [/usr/lib/gcc/x86_64-linux-gnu/5/include] | 315 | + collapse include dir [/usr/include/c++/11] ==> [/usr/include/c++/11] |
| 316 | + collapse include dir [/usr/include/x86_64-linux-gnu/c++/11] ==> [/usr/include/x86_64-linux-gnu/c++/11] | ||
| 317 | + collapse include dir [/usr/include/c++/11/backward] ==> [/usr/include/c++/11/backward] | ||
| 318 | + collapse include dir [/usr/lib/gcc/x86_64-linux-gnu/11/include] ==> [/usr/lib/gcc/x86_64-linux-gnu/11/include] | ||
| 299 | collapse include dir [/usr/local/include] ==> [/usr/local/include] | 319 | collapse include dir [/usr/local/include] ==> [/usr/local/include] |
| 300 | - collapse include dir [/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed] ==> [/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed] | ||
| 301 | collapse include dir [/usr/include/x86_64-linux-gnu] ==> [/usr/include/x86_64-linux-gnu] | 320 | collapse include dir [/usr/include/x86_64-linux-gnu] ==> [/usr/include/x86_64-linux-gnu] |
| 302 | collapse include dir [/usr/include] ==> [/usr/include] | 321 | collapse include dir [/usr/include] ==> [/usr/include] |
| 303 | - implicit include dirs: [/usr/include/c++/5;/usr/include/x86_64-linux-gnu/c++/5;/usr/include/c++/5/backward;/usr/lib/gcc/x86_64-linux-gnu/5/include;/usr/local/include;/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed;/usr/include/x86_64-linux-gnu;/usr/include] | 322 | + implicit include dirs: [/usr/include/c++/11;/usr/include/x86_64-linux-gnu/c++/11;/usr/include/c++/11/backward;/usr/lib/gcc/x86_64-linux-gnu/11/include;/usr/local/include;/usr/include/x86_64-linux-gnu;/usr/include] |
| 304 | 323 | ||
| 305 | 324 | ||
| 306 | Parsed CXX implicit link information from above output: | 325 | Parsed CXX implicit link information from above output: |
| 307 | link line regex: [^( *|.*[/\])(ld|CMAKE_LINK_STARTFILE-NOTFOUND|([^/\]+-)?ld|collect2)[^/\]*( |$)] | 326 | link line regex: [^( *|.*[/\])(ld|CMAKE_LINK_STARTFILE-NOTFOUND|([^/\]+-)?ld|collect2)[^/\]*( |$)] |
| 308 | ignore line: [Change Dir: /mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp] | 327 | ignore line: [Change Dir: /mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp] |
| 309 | ignore line: [] | 328 | ignore line: [] |
| 310 | - ignore line: [Run Build Command(s):/usr/bin/make -f Makefile cmTC_4d967/fast && /usr/bin/make -f CMakeFiles/cmTC_4d967.dir/build.make CMakeFiles/cmTC_4d967.dir/build] | ||
| 311 | - ignore line: [make[1]: Entering directory '/mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp'] | ||
| 312 | - ignore line: [Building CXX object CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o] | ||
| 313 | - ignore line: [/usr/bin/c++ -v -o CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o -c /usr/local/share/cmake-3.24/Modules/CMakeCXXCompilerABI.cpp] | 329 | + ignore line: [Run Build Command(s):/usr/bin/gmake -f Makefile cmTC_26a04/fast && /usr/bin/gmake -f CMakeFiles/cmTC_26a04.dir/build.make CMakeFiles/cmTC_26a04.dir/build] |
| 330 | + ignore line: [gmake[1]: Entering directory '/mnt/hgfs/share/展架程序/build/CMakeFiles/CMakeTmp'] | ||
| 331 | + ignore line: [Building CXX object CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o] | ||
| 332 | + ignore line: [/usr/bin/c++ -v -o CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o -c /usr/share/cmake-3.22/Modules/CMakeCXXCompilerABI.cpp] | ||
| 314 | ignore line: [Using built-in specs.] | 333 | ignore line: [Using built-in specs.] |
| 315 | ignore line: [COLLECT_GCC=/usr/bin/c++] | 334 | ignore line: [COLLECT_GCC=/usr/bin/c++] |
| 335 | + ignore line: [OFFLOAD_TARGET_NAMES=nvptx-none:amdgcn-amdhsa] | ||
| 336 | + ignore line: [OFFLOAD_TARGET_DEFAULT=1] | ||
| 316 | ignore line: [Target: x86_64-linux-gnu] | 337 | ignore line: [Target: x86_64-linux-gnu] |
| 317 | - ignore line: [Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.12' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c ada c++ java go d fortran objc obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32 m64 mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu] | 338 | + ignore line: [Configured with: ../src/configure -v --with-pkgversion='Ubuntu 11.4.0-1ubuntu1~22.04' --with-bugurl=file:///usr/share/doc/gcc-11/README.Bugs --enable-languages=c ada c++ go brig d fortran objc obj-c++ m2 --prefix=/usr --with-gcc-major-version-only --program-suffix=-11 --program-prefix=x86_64-linux-gnu- --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --enable-bootstrap --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-plugin --enable-default-pie --with-system-zlib --enable-libphobos-checking=release --with-target-system-zlib=auto --enable-objc-gc=auto --enable-multiarch --disable-werror --enable-cet --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32 m64 mx32 --enable-multilib --with-tune=generic --enable-offload-targets=nvptx-none=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-nvptx/usr amdgcn-amdhsa=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-gcn/usr --without-cuda-driver --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu --with-build-config=bootstrap-lto-lean --enable-link-serialization=2] |
| 318 | ignore line: [Thread model: posix] | 339 | ignore line: [Thread model: posix] |
| 319 | - ignore line: [gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.12) ] | ||
| 320 | - ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o' '-c' '-shared-libgcc' '-mtune=generic' '-march=x86-64'] | ||
| 321 | - ignore line: [ /usr/lib/gcc/x86_64-linux-gnu/5/cc1plus -quiet -v -imultiarch x86_64-linux-gnu -D_GNU_SOURCE /usr/local/share/cmake-3.24/Modules/CMakeCXXCompilerABI.cpp -quiet -dumpbase CMakeCXXCompilerABI.cpp -mtune=generic -march=x86-64 -auxbase-strip CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o -version -fstack-protector-strong -Wformat -Wformat-security -o /tmp/ccAN8kvg.s] | ||
| 322 | - ignore line: [GNU C++ (Ubuntu 5.4.0-6ubuntu1~16.04.12) version 5.4.0 20160609 (x86_64-linux-gnu)] | ||
| 323 | - ignore line: [ compiled by GNU C version 5.4.0 20160609 GMP version 6.1.0 MPFR version 3.1.4 MPC version 1.0.3] | ||
| 324 | - ignore line: [warning: GMP header version 6.1.0 differs from library version 6.1.2.] | 340 | + ignore line: [Supported LTO compression algorithms: zlib zstd] |
| 341 | + ignore line: [gcc version 11.4.0 (Ubuntu 11.4.0-1ubuntu1~22.04) ] | ||
| 342 | + ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o' '-c' '-shared-libgcc' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_26a04.dir/'] | ||
| 343 | + ignore line: [ /usr/lib/gcc/x86_64-linux-gnu/11/cc1plus -quiet -v -imultiarch x86_64-linux-gnu -D_GNU_SOURCE /usr/share/cmake-3.22/Modules/CMakeCXXCompilerABI.cpp -quiet -dumpdir CMakeFiles/cmTC_26a04.dir/ -dumpbase CMakeCXXCompilerABI.cpp.cpp -dumpbase-ext .cpp -mtune=generic -march=x86-64 -version -fasynchronous-unwind-tables -fstack-protector-strong -Wformat -Wformat-security -fstack-clash-protection -fcf-protection -o /tmp/ccUVymap.s] | ||
| 344 | + ignore line: [GNU C++17 (Ubuntu 11.4.0-1ubuntu1~22.04) version 11.4.0 (x86_64-linux-gnu)] | ||
| 345 | + ignore line: [ compiled by GNU C version 11.4.0 GMP version 6.2.1 MPFR version 4.1.0 MPC version 1.2.1 isl version isl-0.24-GMP] | ||
| 346 | + ignore line: [] | ||
| 325 | ignore line: [GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072] | 347 | ignore line: [GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072] |
| 326 | - ignore line: [ignoring duplicate directory "/usr/include/x86_64-linux-gnu/c++/5"] | 348 | + ignore line: [ignoring duplicate directory "/usr/include/x86_64-linux-gnu/c++/11"] |
| 327 | ignore line: [ignoring nonexistent directory "/usr/local/include/x86_64-linux-gnu"] | 349 | ignore line: [ignoring nonexistent directory "/usr/local/include/x86_64-linux-gnu"] |
| 328 | - ignore line: [ignoring nonexistent directory "/usr/lib/gcc/x86_64-linux-gnu/5/../../../../x86_64-linux-gnu/include"] | 350 | + ignore line: [ignoring nonexistent directory "/usr/lib/gcc/x86_64-linux-gnu/11/include-fixed"] |
| 351 | + ignore line: [ignoring nonexistent directory "/usr/lib/gcc/x86_64-linux-gnu/11/../../../../x86_64-linux-gnu/include"] | ||
| 329 | ignore line: [#include "..." search starts here:] | 352 | ignore line: [#include "..." search starts here:] |
| 330 | ignore line: [#include <...> search starts here:] | 353 | ignore line: [#include <...> search starts here:] |
| 331 | - ignore line: [ /usr/include/c++/5] | ||
| 332 | - ignore line: [ /usr/include/x86_64-linux-gnu/c++/5] | ||
| 333 | - ignore line: [ /usr/include/c++/5/backward] | ||
| 334 | - ignore line: [ /usr/lib/gcc/x86_64-linux-gnu/5/include] | 354 | + ignore line: [ /usr/include/c++/11] |
| 355 | + ignore line: [ /usr/include/x86_64-linux-gnu/c++/11] | ||
| 356 | + ignore line: [ /usr/include/c++/11/backward] | ||
| 357 | + ignore line: [ /usr/lib/gcc/x86_64-linux-gnu/11/include] | ||
| 335 | ignore line: [ /usr/local/include] | 358 | ignore line: [ /usr/local/include] |
| 336 | - ignore line: [ /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed] | ||
| 337 | ignore line: [ /usr/include/x86_64-linux-gnu] | 359 | ignore line: [ /usr/include/x86_64-linux-gnu] |
| 338 | ignore line: [ /usr/include] | 360 | ignore line: [ /usr/include] |
| 339 | ignore line: [End of search list.] | 361 | ignore line: [End of search list.] |
| 340 | - ignore line: [GNU C++ (Ubuntu 5.4.0-6ubuntu1~16.04.12) version 5.4.0 20160609 (x86_64-linux-gnu)] | ||
| 341 | - ignore line: [ compiled by GNU C version 5.4.0 20160609 GMP version 6.1.0 MPFR version 3.1.4 MPC version 1.0.3] | ||
| 342 | - ignore line: [warning: GMP header version 6.1.0 differs from library version 6.1.2.] | 362 | + ignore line: [GNU C++17 (Ubuntu 11.4.0-1ubuntu1~22.04) version 11.4.0 (x86_64-linux-gnu)] |
| 363 | + ignore line: [ compiled by GNU C version 11.4.0 GMP version 6.2.1 MPFR version 4.1.0 MPC version 1.2.1 isl version isl-0.24-GMP] | ||
| 364 | + ignore line: [] | ||
| 343 | ignore line: [GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072] | 365 | ignore line: [GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072] |
| 344 | - ignore line: [Compiler executable checksum: 85af4995304287cdd19cfa43cf5d6cf1] | ||
| 345 | - ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o' '-c' '-shared-libgcc' '-mtune=generic' '-march=x86-64'] | ||
| 346 | - ignore line: [ as -v --64 -o CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o /tmp/ccAN8kvg.s] | ||
| 347 | - ignore line: [GNU assembler version 2.26.1 (x86_64-linux-gnu) using BFD version (GNU Binutils for Ubuntu) 2.26.1] | ||
| 348 | - ignore line: [COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/] | ||
| 349 | - ignore line: [LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../:/lib/:/usr/lib/] | ||
| 350 | - ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o' '-c' '-shared-libgcc' '-mtune=generic' '-march=x86-64'] | ||
| 351 | - ignore line: [Linking CXX executable cmTC_4d967] | ||
| 352 | - ignore line: [/usr/local/bin/cmake -E cmake_link_script CMakeFiles/cmTC_4d967.dir/link.txt --verbose=1] | ||
| 353 | - ignore line: [/usr/bin/c++ -v -rdynamic CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o -o cmTC_4d967 ] | 366 | + ignore line: [Compiler executable checksum: d591828bb4d392ae8b7b160e5bb0b95f] |
| 367 | + ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o' '-c' '-shared-libgcc' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_26a04.dir/'] | ||
| 368 | + ignore line: [ as -v --64 -o CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o /tmp/ccUVymap.s] | ||
| 369 | + ignore line: [GNU assembler version 2.38 (x86_64-linux-gnu) using BFD version (GNU Binutils for Ubuntu) 2.38] | ||
| 370 | + ignore line: [COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/] | ||
| 371 | + ignore line: [LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../:/lib/:/usr/lib/] | ||
| 372 | + ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o' '-c' '-shared-libgcc' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.'] | ||
| 373 | + ignore line: [Linking CXX executable cmTC_26a04] | ||
| 374 | + ignore line: [/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_26a04.dir/link.txt --verbose=1] | ||
| 375 | + ignore line: [/usr/bin/c++ -v -rdynamic CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o -o cmTC_26a04 ] | ||
| 354 | ignore line: [Using built-in specs.] | 376 | ignore line: [Using built-in specs.] |
| 355 | ignore line: [COLLECT_GCC=/usr/bin/c++] | 377 | ignore line: [COLLECT_GCC=/usr/bin/c++] |
| 356 | - ignore line: [COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper] | 378 | + ignore line: [COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/11/lto-wrapper] |
| 379 | + ignore line: [OFFLOAD_TARGET_NAMES=nvptx-none:amdgcn-amdhsa] | ||
| 380 | + ignore line: [OFFLOAD_TARGET_DEFAULT=1] | ||
| 357 | ignore line: [Target: x86_64-linux-gnu] | 381 | ignore line: [Target: x86_64-linux-gnu] |
| 358 | - ignore line: [Configured with: ../src/configure -v --with-pkgversion='Ubuntu 5.4.0-6ubuntu1~16.04.12' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs --enable-languages=c ada c++ java go d fortran objc obj-c++ --prefix=/usr --program-suffix=-5 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32 m64 mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu] | 382 | + ignore line: [Configured with: ../src/configure -v --with-pkgversion='Ubuntu 11.4.0-1ubuntu1~22.04' --with-bugurl=file:///usr/share/doc/gcc-11/README.Bugs --enable-languages=c ada c++ go brig d fortran objc obj-c++ m2 --prefix=/usr --with-gcc-major-version-only --program-suffix=-11 --program-prefix=x86_64-linux-gnu- --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --enable-bootstrap --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-plugin --enable-default-pie --with-system-zlib --enable-libphobos-checking=release --with-target-system-zlib=auto --enable-objc-gc=auto --enable-multiarch --disable-werror --enable-cet --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32 m64 mx32 --enable-multilib --with-tune=generic --enable-offload-targets=nvptx-none=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-nvptx/usr amdgcn-amdhsa=/build/gcc-11-XeT9lY/gcc-11-11.4.0/debian/tmp-gcn/usr --without-cuda-driver --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu --with-build-config=bootstrap-lto-lean --enable-link-serialization=2] |
| 359 | ignore line: [Thread model: posix] | 383 | ignore line: [Thread model: posix] |
| 360 | - ignore line: [gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.12) ] | ||
| 361 | - ignore line: [COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/] | ||
| 362 | - ignore line: [LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/5/../../../:/lib/:/usr/lib/] | ||
| 363 | - ignore line: [COLLECT_GCC_OPTIONS='-v' '-rdynamic' '-o' 'cmTC_4d967' '-shared-libgcc' '-mtune=generic' '-march=x86-64'] | ||
| 364 | - link line: [ /usr/lib/gcc/x86_64-linux-gnu/5/collect2 -plugin /usr/lib/gcc/x86_64-linux-gnu/5/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper -plugin-opt=-fresolution=/tmp/cc112s3j.res -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lgcc --sysroot=/ --build-id --eh-frame-hdr -m elf_x86_64 --hash-style=gnu --as-needed -export-dynamic -dynamic-linker /lib64/ld-linux-x86-64.so.2 -z relro -o cmTC_4d967 /usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crt1.o /usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crti.o /usr/lib/gcc/x86_64-linux-gnu/5/crtbegin.o -L/usr/lib/gcc/x86_64-linux-gnu/5 -L/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/5/../../.. CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc_s -lgcc -lc -lgcc_s -lgcc /usr/lib/gcc/x86_64-linux-gnu/5/crtend.o /usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crtn.o] | ||
| 365 | - arg [/usr/lib/gcc/x86_64-linux-gnu/5/collect2] ==> ignore | 384 | + ignore line: [Supported LTO compression algorithms: zlib zstd] |
| 385 | + ignore line: [gcc version 11.4.0 (Ubuntu 11.4.0-1ubuntu1~22.04) ] | ||
| 386 | + ignore line: [COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/] | ||
| 387 | + ignore line: [LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/11/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib/:/lib/x86_64-linux-gnu/:/lib/../lib/:/usr/lib/x86_64-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-linux-gnu/11/../../../:/lib/:/usr/lib/] | ||
| 388 | + ignore line: [COLLECT_GCC_OPTIONS='-v' '-rdynamic' '-o' 'cmTC_26a04' '-shared-libgcc' '-mtune=generic' '-march=x86-64' '-dumpdir' 'cmTC_26a04.'] | ||
| 389 | + link line: [ /usr/lib/gcc/x86_64-linux-gnu/11/collect2 -plugin /usr/lib/gcc/x86_64-linux-gnu/11/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-linux-gnu/11/lto-wrapper -plugin-opt=-fresolution=/tmp/cc01sBHC.res -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lgcc --build-id --eh-frame-hdr -m elf_x86_64 --hash-style=gnu --as-needed -export-dynamic -dynamic-linker /lib64/ld-linux-x86-64.so.2 -pie -z now -z relro -o cmTC_26a04 /usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/Scrt1.o /usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crti.o /usr/lib/gcc/x86_64-linux-gnu/11/crtbeginS.o -L/usr/lib/gcc/x86_64-linux-gnu/11 -L/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/11/../../.. CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc_s -lgcc -lc -lgcc_s -lgcc /usr/lib/gcc/x86_64-linux-gnu/11/crtendS.o /usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crtn.o] | ||
| 390 | + arg [/usr/lib/gcc/x86_64-linux-gnu/11/collect2] ==> ignore | ||
| 366 | arg [-plugin] ==> ignore | 391 | arg [-plugin] ==> ignore |
| 367 | - arg [/usr/lib/gcc/x86_64-linux-gnu/5/liblto_plugin.so] ==> ignore | ||
| 368 | - arg [-plugin-opt=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper] ==> ignore | ||
| 369 | - arg [-plugin-opt=-fresolution=/tmp/cc112s3j.res] ==> ignore | 392 | + arg [/usr/lib/gcc/x86_64-linux-gnu/11/liblto_plugin.so] ==> ignore |
| 393 | + arg [-plugin-opt=/usr/lib/gcc/x86_64-linux-gnu/11/lto-wrapper] ==> ignore | ||
| 394 | + arg [-plugin-opt=-fresolution=/tmp/cc01sBHC.res] ==> ignore | ||
| 370 | arg [-plugin-opt=-pass-through=-lgcc_s] ==> ignore | 395 | arg [-plugin-opt=-pass-through=-lgcc_s] ==> ignore |
| 371 | arg [-plugin-opt=-pass-through=-lgcc] ==> ignore | 396 | arg [-plugin-opt=-pass-through=-lgcc] ==> ignore |
| 372 | arg [-plugin-opt=-pass-through=-lc] ==> ignore | 397 | arg [-plugin-opt=-pass-through=-lc] ==> ignore |
| 373 | arg [-plugin-opt=-pass-through=-lgcc_s] ==> ignore | 398 | arg [-plugin-opt=-pass-through=-lgcc_s] ==> ignore |
| 374 | arg [-plugin-opt=-pass-through=-lgcc] ==> ignore | 399 | arg [-plugin-opt=-pass-through=-lgcc] ==> ignore |
| 375 | - arg [--sysroot=/] ==> ignore | ||
| 376 | arg [--build-id] ==> ignore | 400 | arg [--build-id] ==> ignore |
| 377 | arg [--eh-frame-hdr] ==> ignore | 401 | arg [--eh-frame-hdr] ==> ignore |
| 378 | arg [-m] ==> ignore | 402 | arg [-m] ==> ignore |
| @@ -382,21 +406,23 @@ Parsed CXX implicit link information from above output: | @@ -382,21 +406,23 @@ Parsed CXX implicit link information from above output: | ||
| 382 | arg [-export-dynamic] ==> ignore | 406 | arg [-export-dynamic] ==> ignore |
| 383 | arg [-dynamic-linker] ==> ignore | 407 | arg [-dynamic-linker] ==> ignore |
| 384 | arg [/lib64/ld-linux-x86-64.so.2] ==> ignore | 408 | arg [/lib64/ld-linux-x86-64.so.2] ==> ignore |
| 409 | + arg [-pie] ==> ignore | ||
| 410 | + arg [-znow] ==> ignore | ||
| 385 | arg [-zrelro] ==> ignore | 411 | arg [-zrelro] ==> ignore |
| 386 | arg [-o] ==> ignore | 412 | arg [-o] ==> ignore |
| 387 | - arg [cmTC_4d967] ==> ignore | ||
| 388 | - arg [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crt1.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crt1.o] | ||
| 389 | - arg [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crti.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crti.o] | ||
| 390 | - arg [/usr/lib/gcc/x86_64-linux-gnu/5/crtbegin.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/5/crtbegin.o] | ||
| 391 | - arg [-L/usr/lib/gcc/x86_64-linux-gnu/5] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/5] | ||
| 392 | - arg [-L/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu] | ||
| 393 | - arg [-L/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib] | 413 | + arg [cmTC_26a04] ==> ignore |
| 414 | + arg [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/Scrt1.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/Scrt1.o] | ||
| 415 | + arg [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crti.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crti.o] | ||
| 416 | + arg [/usr/lib/gcc/x86_64-linux-gnu/11/crtbeginS.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/11/crtbeginS.o] | ||
| 417 | + arg [-L/usr/lib/gcc/x86_64-linux-gnu/11] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/11] | ||
| 418 | + arg [-L/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu] | ||
| 419 | + arg [-L/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib] | ||
| 394 | arg [-L/lib/x86_64-linux-gnu] ==> dir [/lib/x86_64-linux-gnu] | 420 | arg [-L/lib/x86_64-linux-gnu] ==> dir [/lib/x86_64-linux-gnu] |
| 395 | arg [-L/lib/../lib] ==> dir [/lib/../lib] | 421 | arg [-L/lib/../lib] ==> dir [/lib/../lib] |
| 396 | arg [-L/usr/lib/x86_64-linux-gnu] ==> dir [/usr/lib/x86_64-linux-gnu] | 422 | arg [-L/usr/lib/x86_64-linux-gnu] ==> dir [/usr/lib/x86_64-linux-gnu] |
| 397 | arg [-L/usr/lib/../lib] ==> dir [/usr/lib/../lib] | 423 | arg [-L/usr/lib/../lib] ==> dir [/usr/lib/../lib] |
| 398 | - arg [-L/usr/lib/gcc/x86_64-linux-gnu/5/../../..] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/5/../../..] | ||
| 399 | - arg [CMakeFiles/cmTC_4d967.dir/CMakeCXXCompilerABI.cpp.o] ==> ignore | 424 | + arg [-L/usr/lib/gcc/x86_64-linux-gnu/11/../../..] ==> dir [/usr/lib/gcc/x86_64-linux-gnu/11/../../..] |
| 425 | + arg [CMakeFiles/cmTC_26a04.dir/CMakeCXXCompilerABI.cpp.o] ==> ignore | ||
| 400 | arg [-lstdc++] ==> lib [stdc++] | 426 | arg [-lstdc++] ==> lib [stdc++] |
| 401 | arg [-lm] ==> lib [m] | 427 | arg [-lm] ==> lib [m] |
| 402 | arg [-lgcc_s] ==> lib [gcc_s] | 428 | arg [-lgcc_s] ==> lib [gcc_s] |
| @@ -404,22 +430,22 @@ Parsed CXX implicit link information from above output: | @@ -404,22 +430,22 @@ Parsed CXX implicit link information from above output: | ||
| 404 | arg [-lc] ==> lib [c] | 430 | arg [-lc] ==> lib [c] |
| 405 | arg [-lgcc_s] ==> lib [gcc_s] | 431 | arg [-lgcc_s] ==> lib [gcc_s] |
| 406 | arg [-lgcc] ==> lib [gcc] | 432 | arg [-lgcc] ==> lib [gcc] |
| 407 | - arg [/usr/lib/gcc/x86_64-linux-gnu/5/crtend.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/5/crtend.o] | ||
| 408 | - arg [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crtn.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crtn.o] | ||
| 409 | - collapse obj [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crt1.o] ==> [/usr/lib/x86_64-linux-gnu/crt1.o] | ||
| 410 | - collapse obj [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crti.o] ==> [/usr/lib/x86_64-linux-gnu/crti.o] | ||
| 411 | - collapse obj [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crtn.o] ==> [/usr/lib/x86_64-linux-gnu/crtn.o] | ||
| 412 | - collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/5] ==> [/usr/lib/gcc/x86_64-linux-gnu/5] | ||
| 413 | - collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu] ==> [/usr/lib/x86_64-linux-gnu] | ||
| 414 | - collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/5/../../../../lib] ==> [/usr/lib] | 433 | + arg [/usr/lib/gcc/x86_64-linux-gnu/11/crtendS.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/11/crtendS.o] |
| 434 | + arg [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crtn.o] ==> obj [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crtn.o] | ||
| 435 | + collapse obj [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/Scrt1.o] ==> [/usr/lib/x86_64-linux-gnu/Scrt1.o] | ||
| 436 | + collapse obj [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crti.o] ==> [/usr/lib/x86_64-linux-gnu/crti.o] | ||
| 437 | + collapse obj [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu/crtn.o] ==> [/usr/lib/x86_64-linux-gnu/crtn.o] | ||
| 438 | + collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/11] ==> [/usr/lib/gcc/x86_64-linux-gnu/11] | ||
| 439 | + collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/11/../../../x86_64-linux-gnu] ==> [/usr/lib/x86_64-linux-gnu] | ||
| 440 | + collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/11/../../../../lib] ==> [/usr/lib] | ||
| 415 | collapse library dir [/lib/x86_64-linux-gnu] ==> [/lib/x86_64-linux-gnu] | 441 | collapse library dir [/lib/x86_64-linux-gnu] ==> [/lib/x86_64-linux-gnu] |
| 416 | collapse library dir [/lib/../lib] ==> [/lib] | 442 | collapse library dir [/lib/../lib] ==> [/lib] |
| 417 | collapse library dir [/usr/lib/x86_64-linux-gnu] ==> [/usr/lib/x86_64-linux-gnu] | 443 | collapse library dir [/usr/lib/x86_64-linux-gnu] ==> [/usr/lib/x86_64-linux-gnu] |
| 418 | collapse library dir [/usr/lib/../lib] ==> [/usr/lib] | 444 | collapse library dir [/usr/lib/../lib] ==> [/usr/lib] |
| 419 | - collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/5/../../..] ==> [/usr/lib] | 445 | + collapse library dir [/usr/lib/gcc/x86_64-linux-gnu/11/../../..] ==> [/usr/lib] |
| 420 | implicit libs: [stdc++;m;gcc_s;gcc;c;gcc_s;gcc] | 446 | implicit libs: [stdc++;m;gcc_s;gcc;c;gcc_s;gcc] |
| 421 | - implicit objs: [/usr/lib/x86_64-linux-gnu/crt1.o;/usr/lib/x86_64-linux-gnu/crti.o;/usr/lib/gcc/x86_64-linux-gnu/5/crtbegin.o;/usr/lib/gcc/x86_64-linux-gnu/5/crtend.o;/usr/lib/x86_64-linux-gnu/crtn.o] | ||
| 422 | - implicit dirs: [/usr/lib/gcc/x86_64-linux-gnu/5;/usr/lib/x86_64-linux-gnu;/usr/lib;/lib/x86_64-linux-gnu;/lib] | 447 | + implicit objs: [/usr/lib/x86_64-linux-gnu/Scrt1.o;/usr/lib/x86_64-linux-gnu/crti.o;/usr/lib/gcc/x86_64-linux-gnu/11/crtbeginS.o;/usr/lib/gcc/x86_64-linux-gnu/11/crtendS.o;/usr/lib/x86_64-linux-gnu/crtn.o] |
| 448 | + implicit dirs: [/usr/lib/gcc/x86_64-linux-gnu/11;/usr/lib/x86_64-linux-gnu;/usr/lib;/lib/x86_64-linux-gnu;/lib] | ||
| 423 | implicit fwks: [] | 449 | implicit fwks: [] |
| 424 | 450 | ||
| 425 | 451 |
| @@ -30,6 +30,7 @@ set(CMAKE_DEPENDS_DEPENDENCY_FILES | @@ -30,6 +30,7 @@ set(CMAKE_DEPENDS_DEPENDENCY_FILES | ||
| 30 | "/mnt/hgfs/share/展架程序/JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.c" "CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.c.o" "gcc" "CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.c.o.d" | 30 | "/mnt/hgfs/share/展架程序/JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.c" "CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.c.o" "gcc" "CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.c.o.d" |
| 31 | "/mnt/hgfs/share/展架程序/JZsdk_Uart/JZsdk_Uart_UartDeal.c" "CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_UartDeal.c.o" "gcc" "CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_UartDeal.c.o.d" | 31 | "/mnt/hgfs/share/展架程序/JZsdk_Uart/JZsdk_Uart_UartDeal.c" "CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_UartDeal.c.o" "gcc" "CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_UartDeal.c.o.d" |
| 32 | "/mnt/hgfs/share/展架程序/JZsdk_Uart/UartConnection/UartConnection.c" "CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/UartConnection/UartConnection.c.o" "gcc" "CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/UartConnection/UartConnection.c.o.d" | 32 | "/mnt/hgfs/share/展架程序/JZsdk_Uart/UartConnection/UartConnection.c" "CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/UartConnection/UartConnection.c.o" "gcc" "CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/UartConnection/UartConnection.c.o.d" |
| 33 | + "/mnt/hgfs/share/展架程序/JZsdk_hal/JZsdk_network/JZsdk_network.c" "CMakeFiles/JZ_UART_APP.dir/JZsdk_hal/JZsdk_network/JZsdk_network.c.o" "gcc" "CMakeFiles/JZ_UART_APP.dir/JZsdk_hal/JZsdk_network/JZsdk_network.c.o.d" | ||
| 33 | "/mnt/hgfs/share/展架程序/Module/Camera/CameraFeatures/CameraFeatures.c" "CMakeFiles/JZ_UART_APP.dir/Module/Camera/CameraFeatures/CameraFeatures.c.o" "gcc" "CMakeFiles/JZ_UART_APP.dir/Module/Camera/CameraFeatures/CameraFeatures.c.o.d" | 34 | "/mnt/hgfs/share/展架程序/Module/Camera/CameraFeatures/CameraFeatures.c" "CMakeFiles/JZ_UART_APP.dir/Module/Camera/CameraFeatures/CameraFeatures.c.o" "gcc" "CMakeFiles/JZ_UART_APP.dir/Module/Camera/CameraFeatures/CameraFeatures.c.o.d" |
| 34 | "/mnt/hgfs/share/展架程序/Module/Camera/CameraFeatures/RecordVideo.c" "CMakeFiles/JZ_UART_APP.dir/Module/Camera/CameraFeatures/RecordVideo.c.o" "gcc" "CMakeFiles/JZ_UART_APP.dir/Module/Camera/CameraFeatures/RecordVideo.c.o.d" | 35 | "/mnt/hgfs/share/展架程序/Module/Camera/CameraFeatures/RecordVideo.c" "CMakeFiles/JZ_UART_APP.dir/Module/Camera/CameraFeatures/RecordVideo.c.o" "gcc" "CMakeFiles/JZ_UART_APP.dir/Module/Camera/CameraFeatures/RecordVideo.c.o.d" |
| 35 | "/mnt/hgfs/share/展架程序/Module/Camera/CameraFeatures/ShootPhoto.c" "CMakeFiles/JZ_UART_APP.dir/Module/Camera/CameraFeatures/ShootPhoto.c.o" "gcc" "CMakeFiles/JZ_UART_APP.dir/Module/Camera/CameraFeatures/ShootPhoto.c.o.d" | 36 | "/mnt/hgfs/share/展架程序/Module/Camera/CameraFeatures/ShootPhoto.c" "CMakeFiles/JZ_UART_APP.dir/Module/Camera/CameraFeatures/ShootPhoto.c.o" "gcc" "CMakeFiles/JZ_UART_APP.dir/Module/Camera/CameraFeatures/ShootPhoto.c.o.d" |
| @@ -18,6 +18,23 @@ CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_4G.c.o | @@ -18,6 +18,23 @@ CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_4G.c.o | ||
| 18 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sys_errlist.h \ | 18 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sys_errlist.h \ |
| 19 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/string.h \ | 19 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/string.h \ |
| 20 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/xlocale.h \ | 20 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/xlocale.h \ |
| 21 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/stdlib.h \ | ||
| 22 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/waitflags.h \ | ||
| 23 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/waitstatus.h \ | ||
| 24 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/endian.h \ | ||
| 25 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/endian.h \ | ||
| 26 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/byteswap.h \ | ||
| 27 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/byteswap-16.h \ | ||
| 28 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/types.h \ | ||
| 29 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/time.h \ | ||
| 30 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/select.h \ | ||
| 31 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/select.h \ | ||
| 32 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sigset.h \ | ||
| 33 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/time.h \ | ||
| 34 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/sysmacros.h \ | ||
| 35 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/pthreadtypes.h \ | ||
| 36 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/alloca.h \ | ||
| 37 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/stdlib-float.h \ | ||
| 21 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h \ | 38 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h \ |
| 22 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Aframe.h \ | 39 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Aframe.h \ |
| 23 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Bframe.h \ | 40 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Bframe.h \ |
| @@ -18,6 +18,23 @@ CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_DEV1.c | @@ -18,6 +18,23 @@ CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_DEV1.c | ||
| 18 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sys_errlist.h \ | 18 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sys_errlist.h \ |
| 19 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/string.h \ | 19 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/string.h \ |
| 20 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/xlocale.h \ | 20 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/xlocale.h \ |
| 21 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/stdlib.h \ | ||
| 22 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/waitflags.h \ | ||
| 23 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/waitstatus.h \ | ||
| 24 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/endian.h \ | ||
| 25 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/endian.h \ | ||
| 26 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/byteswap.h \ | ||
| 27 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/byteswap-16.h \ | ||
| 28 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/types.h \ | ||
| 29 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/time.h \ | ||
| 30 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/select.h \ | ||
| 31 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/select.h \ | ||
| 32 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sigset.h \ | ||
| 33 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/time.h \ | ||
| 34 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/sysmacros.h \ | ||
| 35 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/pthreadtypes.h \ | ||
| 36 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/alloca.h \ | ||
| 37 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/stdlib-float.h \ | ||
| 21 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h \ | 38 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h \ |
| 22 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Aframe.h \ | 39 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Aframe.h \ |
| 23 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Bframe.h \ | 40 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Bframe.h \ |
| @@ -18,6 +18,23 @@ CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_DEV2.c | @@ -18,6 +18,23 @@ CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_Recv/JZsdk_Uart_RecvDeal_DEV2.c | ||
| 18 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sys_errlist.h \ | 18 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sys_errlist.h \ |
| 19 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/string.h \ | 19 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/string.h \ |
| 20 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/xlocale.h \ | 20 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/xlocale.h \ |
| 21 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/stdlib.h \ | ||
| 22 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/waitflags.h \ | ||
| 23 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/waitstatus.h \ | ||
| 24 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/endian.h \ | ||
| 25 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/endian.h \ | ||
| 26 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/byteswap.h \ | ||
| 27 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/byteswap-16.h \ | ||
| 28 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/types.h \ | ||
| 29 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/time.h \ | ||
| 30 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/select.h \ | ||
| 31 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/select.h \ | ||
| 32 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sigset.h \ | ||
| 33 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/time.h \ | ||
| 34 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/sysmacros.h \ | ||
| 35 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/pthreadtypes.h \ | ||
| 36 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/alloca.h \ | ||
| 37 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/stdlib-float.h \ | ||
| 21 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h \ | 38 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h \ |
| 22 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Aframe.h \ | 39 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Aframe.h \ |
| 23 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Bframe.h \ | 40 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Bframe.h \ |
| @@ -18,6 +18,23 @@ CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.c.o: \ | @@ -18,6 +18,23 @@ CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.c.o: \ | ||
| 18 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sys_errlist.h \ | 18 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sys_errlist.h \ |
| 19 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/string.h \ | 19 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/string.h \ |
| 20 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/xlocale.h \ | 20 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/xlocale.h \ |
| 21 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/stdlib.h \ | ||
| 22 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/waitflags.h \ | ||
| 23 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/waitstatus.h \ | ||
| 24 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/endian.h \ | ||
| 25 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/endian.h \ | ||
| 26 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/byteswap.h \ | ||
| 27 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/byteswap-16.h \ | ||
| 28 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/types.h \ | ||
| 29 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/time.h \ | ||
| 30 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/select.h \ | ||
| 31 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/select.h \ | ||
| 32 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sigset.h \ | ||
| 33 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/time.h \ | ||
| 34 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/sysmacros.h \ | ||
| 35 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/pthreadtypes.h \ | ||
| 36 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/alloca.h \ | ||
| 37 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/stdlib-float.h \ | ||
| 21 | /mnt/hgfs/share/展架程序/./JZsdk_Uart/JZsdk_Uart_UartDeal.h \ | 38 | /mnt/hgfs/share/展架程序/./JZsdk_Uart/JZsdk_Uart_UartDeal.h \ |
| 22 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_Code.h \ | 39 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_Code.h \ |
| 23 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_InsCode.h \ | 40 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_InsCode.h \ |
| @@ -30,9 +47,11 @@ CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.c.o: \ | @@ -30,9 +47,11 @@ CMakeFiles/JZ_UART_APP.dir/JZsdk_Uart/JZsdk_Uart_Send/JZsdk_Uart_Send.c.o: \ | ||
| 30 | /mnt/hgfs/share/展架程序/./JZsdk_Uart/Uart_Config.h \ | 47 | /mnt/hgfs/share/展架程序/./JZsdk_Uart/Uart_Config.h \ |
| 31 | /mnt/hgfs/share/展架程序/./application/BaseConfig.h \ | 48 | /mnt/hgfs/share/展架程序/./application/BaseConfig.h \ |
| 32 | /mnt/hgfs/share/展架程序/./application/version_choose.h \ | 49 | /mnt/hgfs/share/展架程序/./application/version_choose.h \ |
| 33 | - /mnt/hgfs/share/展架程序/./JZsdk/Jzsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h \ | ||
| 34 | - /mnt/hgfs/share/展架程序/./JZsdk/Jzsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Aframe.h \ | ||
| 35 | - /mnt/hgfs/share/展架程序/./JZsdk/Jzsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Bframe.h \ | ||
| 36 | - /mnt/hgfs/share/展架程序/./JZsdk/Jzsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_6Aframe.h \ | ||
| 37 | - /mnt/hgfs/share/展架程序/./JZsdk/Jzsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_6Bframe.h \ | ||
| 38 | - /mnt/hgfs/share/展架程序/./JZsdk/Jzsdk_Base/JZsdk_FrameComparsion/JZsdk_GetFrameTemplate.h | 50 | + /mnt/hgfs/share/展架程序/JZsdk_Uart/JZsdk_Uart_Send/./JZsdk_Uart_Send.h \ |
| 51 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_TaskManagement/TaskManagement.h \ | ||
| 52 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h \ | ||
| 53 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Aframe.h \ | ||
| 54 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_5Bframe.h \ | ||
| 55 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_6Aframe.h \ | ||
| 56 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion_6Bframe.h \ | ||
| 57 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_FrameComparsion/JZsdk_GetFrameTemplate.h |
不能预览此文件类型
| 1 | +CMakeFiles/JZ_UART_APP.dir/JZsdk_hal/JZsdk_network/JZsdk_network.c.o: \ | ||
| 2 | + /mnt/hgfs/share/展架程序/JZsdk_hal/JZsdk_network/JZsdk_network.c \ | ||
| 3 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/stdc-predef.h \ | ||
| 4 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/stdio.h \ | ||
| 5 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/features.h \ | ||
| 6 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/cdefs.h \ | ||
| 7 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/wordsize.h \ | ||
| 8 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/gnu/stubs.h \ | ||
| 9 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/gnu/stubs-hard.h \ | ||
| 10 | + /usr/local/arm/4.9.3/lib/gcc/arm-cortexa9-linux-gnueabihf/4.9.3/include/stddef.h \ | ||
| 11 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/types.h \ | ||
| 12 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/typesizes.h \ | ||
| 13 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/libio.h \ | ||
| 14 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/_G_config.h \ | ||
| 15 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/wchar.h \ | ||
| 16 | + /usr/local/arm/4.9.3/lib/gcc/arm-cortexa9-linux-gnueabihf/4.9.3/include/stdarg.h \ | ||
| 17 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/stdio_lim.h \ | ||
| 18 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sys_errlist.h \ | ||
| 19 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/string.h \ | ||
| 20 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/xlocale.h \ | ||
| 21 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/stdlib.h \ | ||
| 22 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/waitflags.h \ | ||
| 23 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/waitstatus.h \ | ||
| 24 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/endian.h \ | ||
| 25 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/endian.h \ | ||
| 26 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/byteswap.h \ | ||
| 27 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/byteswap-16.h \ | ||
| 28 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/types.h \ | ||
| 29 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/time.h \ | ||
| 30 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/select.h \ | ||
| 31 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/select.h \ | ||
| 32 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sigset.h \ | ||
| 33 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/time.h \ | ||
| 34 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/sysmacros.h \ | ||
| 35 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/pthreadtypes.h \ | ||
| 36 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/alloca.h \ | ||
| 37 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/stdlib-float.h \ | ||
| 38 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/termios.h \ | ||
| 39 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/termios.h \ | ||
| 40 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/ttydefaults.h \ | ||
| 41 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/socket.h \ | ||
| 42 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sys/uio.h \ | ||
| 43 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/uio.h \ | ||
| 44 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/socket.h \ | ||
| 45 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/socket_type.h \ | ||
| 46 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sockaddr.h \ | ||
| 47 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/asm/socket.h \ | ||
| 48 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/asm-generic/socket.h \ | ||
| 49 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/asm/sockios.h \ | ||
| 50 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/asm-generic/sockios.h \ | ||
| 51 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/netinet/in.h \ | ||
| 52 | + /usr/local/arm/4.9.3/lib/gcc/arm-cortexa9-linux-gnueabihf/4.9.3/include/stdint.h \ | ||
| 53 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/stdint.h \ | ||
| 54 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/wchar.h \ | ||
| 55 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/in.h \ | ||
| 56 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/arpa/inet.h \ | ||
| 57 | + /mnt/hgfs/share/展架程序/./application/BaseConfig.h \ | ||
| 58 | + /mnt/hgfs/share/展架程序/./application/version_choose.h \ | ||
| 59 | + /mnt/hgfs/share/展架程序/./application/version_choose.h \ | ||
| 60 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdkLib.h \ | ||
| 61 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdkBase.h \ | ||
| 62 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Logger/JZsdk_Logger.h \ | ||
| 63 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_Code.h \ | ||
| 64 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_InsCode.h \ | ||
| 65 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_FLagCode.h \ | ||
| 66 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_ReturnCode.h \ | ||
| 67 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_ErrorCode.h \ | ||
| 68 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Osal/JZsdk_FileSystm.h \ | ||
| 69 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Osal/../JZsdk_Code/JZsdk_Code.h \ | ||
| 70 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Delay/JZsdk_Delay.h \ | ||
| 71 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_FLagCode.h \ | ||
| 72 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_Code.h \ | ||
| 73 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_CommonFuntion/JZsdkCommonFuntion.h \ | ||
| 74 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_CommonFuntion/JZsdk_string/JZsdk_string.h \ | ||
| 75 | + /mnt/hgfs/share/展架程序/JZsdk_hal/JZsdk_network/./JZsdk_network.h |
| @@ -60,4 +60,5 @@ CMakeFiles/JZ_UART_APP.dir/Module/Camera/CameraFeatures/CameraFeatures.c.o: \ | @@ -60,4 +60,5 @@ CMakeFiles/JZ_UART_APP.dir/Module/Camera/CameraFeatures/CameraFeatures.c.o: \ | ||
| 60 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_Code.h \ | 60 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_Code.h \ |
| 61 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_CommonFuntion/JZsdkCommonFuntion.h \ | 61 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_CommonFuntion/JZsdkCommonFuntion.h \ |
| 62 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_CommonFuntion/JZsdk_string/JZsdk_string.h \ | 62 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_CommonFuntion/JZsdk_string/JZsdk_string.h \ |
| 63 | - /mnt/hgfs/share/展架程序/Module/Camera/CameraFeatures/./CameraFeatures.h | 63 | + /mnt/hgfs/share/展架程序/Module/Camera/CameraFeatures/./CameraFeatures.h \ |
| 64 | + /mnt/hgfs/share/展架程序/./JZsdk_hal/JZsdk_network/JZsdk_network.h |
不能预览此文件类型
| @@ -33,10 +33,11 @@ CMakeFiles/JZ_UART_APP.dir/Module/Gimbal/Gimbal_H3/Gimbal_H3_H150ST/Gimbal_H3_H1 | @@ -33,10 +33,11 @@ CMakeFiles/JZ_UART_APP.dir/Module/Gimbal/Gimbal_H3/Gimbal_H3_H150ST/Gimbal_H3_H1 | ||
| 33 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/pthreadtypes.h \ | 33 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/pthreadtypes.h \ |
| 34 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/alloca.h \ | 34 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/alloca.h \ |
| 35 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/stdlib-float.h \ | 35 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/stdlib-float.h \ |
| 36 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/string.h \ | ||
| 37 | + /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/xlocale.h \ | ||
| 36 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/pthread.h \ | 38 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/pthread.h \ |
| 37 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sched.h \ | 39 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/sched.h \ |
| 38 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sched.h \ | 40 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/sched.h \ |
| 39 | - /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/xlocale.h \ | ||
| 40 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/setjmp.h \ | 41 | /usr/local/arm/4.9.3/arm-cortexa9-linux-gnueabihf/sys-root/usr/include/bits/setjmp.h \ |
| 41 | /mnt/hgfs/share/展架程序/Module/Gimbal/Gimbal_H3/Gimbal_H3_H150ST/Gimbal_H3_H150ST_UartDeal.h \ | 42 | /mnt/hgfs/share/展架程序/Module/Gimbal/Gimbal_H3/Gimbal_H3_H150ST/Gimbal_H3_H150ST_UartDeal.h \ |
| 42 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_Code.h \ | 43 | /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_Base/JZsdk_Code/JZsdk_Code.h \ |
| @@ -50,4 +51,5 @@ CMakeFiles/JZ_UART_APP.dir/Module/Gimbal/Gimbal_H3/Gimbal_H3_H150ST/Gimbal_H3_H1 | @@ -50,4 +51,5 @@ CMakeFiles/JZ_UART_APP.dir/Module/Gimbal/Gimbal_H3/Gimbal_H3_H150ST/Gimbal_H3_H1 | ||
| 50 | /mnt/hgfs/share/展架程序/Module/Gimbal/Gimbal_H3/Gimbal_H3_H150ST/Gimbal_H3_H150ST.h \ | 51 | /mnt/hgfs/share/展架程序/Module/Gimbal/Gimbal_H3/Gimbal_H3_H150ST/Gimbal_H3_H150ST.h \ |
| 51 | /mnt/hgfs/share/展架程序/./application/BaseConfig.h \ | 52 | /mnt/hgfs/share/展架程序/./application/BaseConfig.h \ |
| 52 | /mnt/hgfs/share/展架程序/./application/version_choose.h \ | 53 | /mnt/hgfs/share/展架程序/./application/version_choose.h \ |
| 53 | - /mnt/hgfs/share/展架程序/./JZsdk_Uart/UartConnection/UartConnection.h | 54 | + /mnt/hgfs/share/展架程序/./JZsdk_Uart/UartConnection/UartConnection.h \ |
| 55 | + /mnt/hgfs/share/展架程序/./JZsdk/JZsdk_TaskManagement/TaskManagement.h |
不能预览此文件类型
-
请 注册 或 登录 后发表评论