潘浩彬 / SerialPorject · 提交

转到一个项目

作者 潘浩彬
提交者 ookk303
提交 f53f64f1cd0b6940baacac9463b30c011bb2be72 1 个父辈 cbf54548

00 00 01 06更新

内嵌 并排对比
正在显示 28 个修改的文件 包含 2196 行增加 和 469 行删除

要显示太多修改。
重新载入完整差异 差异文件 邮件补丁

为保证性能只显示 28 of 28+ 个文件。

@@ -27,6 +27,25 @@ @@ -27,6 +27,25 @@
27 "gimbal_v3s_tfa1.h": "c", 27 "gimbal_v3s_tfa1.h": "c",
28 "searchlight_v3s_h1t.h": "c", 28 "searchlight_v3s_h1t.h": "c",
29 "megaphone_recordvoice.h": "c", 29 "megaphone_recordvoice.h": "c",
30 - "gimbal_inandout.h": "c" 30 + "gimbal_inandout.h": "c",
  31 + "jzsdk_uart_send.h": "c",
  32 + "jzsdk_framecomparsion.h": "c",
  33 + "jzsdk_deviceactivation.h": "c",
  34 + "jzsdkcommonfuntion.h": "c",
  35 + "jzsdkbase.h": "c",
  36 + "jzsdk_logger.h": "c",
  37 + "megaphone_opus.h": "c",
  38 + "memoryadapter.h": "c",
  39 + "vdecoder.h": "c",
  40 + "vencoder.h": "c",
  41 + "cedarx_vdec.h": "c",
  42 + "sc_interface.h": "c",
  43 + "veinterface.h": "c",
  44 + "camera_inandout.h": "c",
  45 + "jzsdk_returncode.h": "c",
  46 + "jzsdk_smt_code.h": "c",
  47 + "serialmat_inandout.h": "c",
  48 + "activatemat_usedfuntion.h": "c",
  49 + "activatemat.h": "c"
31 } 50 }
32 } 51 }
1 -# cmake 最低版本要求 1 +# cmake 最低版本要求 第三行名字不能动
2 cmake_minimum_required(VERSION 2.8) 2 cmake_minimum_required(VERSION 2.8)
  3 +project(JZ_UART_APP)
3 4
4 -# 编译标志  
5 set(CMAKE_C_FLAGS "-pthread -std=gnu99 -lm -ldl -lstdc++") 5 set(CMAKE_C_FLAGS "-pthread -std=gnu99 -lm -ldl -lstdc++")
6 #"-pthread":指定在编译时链接POSIX线程库,以支持多线程程序。 6 #"-pthread":指定在编译时链接POSIX线程库,以支持多线程程序。
7 #"-std=gnu99":指定C语言标准为GNU C99(也就是C99加上GNU的扩展特性),该标准对于一些特性和库的使用是必须的。 7 #"-std=gnu99":指定C语言标准为GNU C99(也就是C99加上GNU的扩展特性),该标准对于一些特性和库的使用是必须的。
@@ -9,35 +9,52 @@ set(CMAKE_C_FLAGS "-pthread -std=gnu99 -lm -ldl -lstdc++") @@ -9,35 +9,52 @@ set(CMAKE_C_FLAGS "-pthread -std=gnu99 -lm -ldl -lstdc++")
9 #"-ldl"：指定在编译时链接动态库加载库，以使用动态加载。 9 #"-ldl"：指定在编译时链接动态库加载库，以使用动态加载。
10 #"-lstdc++":指定在编译时链接C++标准库,以使用C++的一些特性和函数。 10 #"-lstdc++":指定在编译时链接C++标准库,以使用C++的一些特性和函数。
11 11
12 -# 配置编译器  
13 -# 交叉编译链①  
14 -set(CMAKE_C_COMPILER "/usr/local/arm/4.9.3/bin/arm-cortexa9-linux-gnueabihf-gcc")  
15 -set(CMAKE_CXX_COMPILER "/usr/local/arm/4.9.3/bin/arm-cortexa9-linux-gnueabihf-g++") 12 +set(CMAKE_EXE_LINKER_FLAGS "-pthread")
16 13
17 -# 本地测试编译链  
18 -# set(CMAKE_C_COMPILER /usr/bin/gcc)  
19 -# set(CMAKE_CXX_COMPILER /usr/bin/g++) 14 +#预留行
  15 +#预留行
  16 +#预留行
  17 +#预留行
  18 +#预留行
  19 +#预留行
  20 +#预留行
  21 +#预留行
20 22
21 -# 工程名 JZ_UART_APP  
22 -project(JZ_UART_APP)  
23 # 设置滤波方式 24行不能被改动，因为会被sh修改滤波方式 23 # 设置滤波方式 24行不能被改动，因为会被sh修改滤波方式
24 set(filtering_type high_pass_filtering) 24 set(filtering_type high_pass_filtering)
25 25
26 # 海外版本 27行不能改动 26 # 海外版本 27行不能改动
27 set(firewarm_origin DOMESTIC_VERSION) 27 set(firewarm_origin DOMESTIC_VERSION)
28 28
  29 +# 添加Cedar库 30行不能改动
  30 +set(CedarxLib VERSION_SWITCH_OFF)
  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++")
  35 +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++")
  39 +endif()
29 40
30 # 指定源文件 41 # 指定源文件
31 -file(GLOB_RECURSE APPLICATION_SRC application/*.c) 42 +file(GLOB_RECURSE APPLICATION_SRC application/*.c) #main MODULE_APP_SRC
32 file(GLOB_RECURSE JZSDK_SRC JZsdk/*.c) 43 file(GLOB_RECURSE JZSDK_SRC JZsdk/*.c)
33 file(GLOB_RECURSE JZSDK_UART_DEAL_SRC JZsdk_Uart/*.c) 44 file(GLOB_RECURSE JZSDK_UART_DEAL_SRC JZsdk_Uart/*.c)
34 file(GLOB_RECURSE GIMBAL_SRC Module/Gimbal/*.c) 45 file(GLOB_RECURSE GIMBAL_SRC Module/Gimbal/*.c)
35 file(GLOB_RECURSE MEGAPHONE_SRC Module/Megaphone/*.c) 46 file(GLOB_RECURSE MEGAPHONE_SRC Module/Megaphone/*.c)
36 file(GLOB_RECURSE LIGHTING_SRC Module/Lighting/*.c) 47 file(GLOB_RECURSE LIGHTING_SRC Module/Lighting/*.c)
  48 +file(GLOB_RECURSE CAMERA_SRC Module/Camera/*.c)
  49 +file(GLOB_RECURSE POWERMANAGER_SRC Module/PowerManager/*.c)
  50 +file(GLOB_RECURSE TESTAPP_SRC Module/TestAPP/*.c)
  51 +file(GLOB_RECURSE SERIALMAT_SRC Module/SerialManagement/*.c)
37 52
38 file(GLOB_RECURSE MODULE_IRCUT_SRC Module/Ircut/*.c) 53 file(GLOB_RECURSE MODULE_IRCUT_SRC Module/Ircut/*.c)
39 file(GLOB_RECURSE MODULE_UICONTROL_SRC Module/UI_control/*.c) 54 file(GLOB_RECURSE MODULE_UICONTROL_SRC Module/UI_control/*.c)
40 55
  56 +file(GLOB_RECURSE MODULE_IMAGEPROCESSING_SRC Module/ImageProcessing/*.c)
  57 +file(GLOB_RECURSE MODULE_IMAGEPROCESSING_cpp_SRC Module/ImageProcessing/*.cpp)
41 58
42 59
43 # 生成可执行文件 60 # 生成可执行文件
@@ -51,6 +68,12 @@ add_executable( @@ -51,6 +68,12 @@ add_executable(
51 ${GIMBAL_SRC} 68 ${GIMBAL_SRC}
52 ${MODULE_UICONTROL_SRC} 69 ${MODULE_UICONTROL_SRC}
53 ${LIGHTING_SRC} 70 ${LIGHTING_SRC}
  71 + ${POWERMANAGER_SRC}
  72 + ${CAMERA_SRC}
  73 + ${TESTAPP_SRC}
  74 + ${SERIALMAT_SRC}
  75 + ${MODULE_IMAGEPROCESSING_SRC}
  76 + ${MODULE_IMAGEPROCESSING_cpp_SRC}
54 ) 77 )
55 78
56 # 头文件路径 79 # 头文件路径
@@ -64,14 +87,25 @@ include_directories(./Module/Ircut/H3_ircut/wiringPi) @@ -64,14 +87,25 @@ include_directories(./Module/Ircut/H3_ircut/wiringPi)
64 include_directories(./Module/Gimbal) 87 include_directories(./Module/Gimbal)
65 include_directories(./Module/Lighting) 88 include_directories(./Module/Lighting)
66 include_directories(./Module/UI_control) 89 include_directories(./Module/UI_control)
  90 +include_directories(./Module/PowerManager)
  91 +include_directories(./Module/Camera)
  92 +include_directories(./Module/TestAPP)
  93 +include_directories(./Module/ImageProcessing)
  94 +include_directories(./Module/SerialManagement)
67 95
68 # 库文件路径 96 # 库文件路径
69 if(${filtering_type} STREQUAL "directed_stopband_filtering") 97 if(${filtering_type} STREQUAL "directed_stopband_filtering")
70 - message("\n滤波库:高通滤波\n") 98 + message("\n滤波库:带阻滤波\n")
71 target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/directed_stopband_filtering/libAudioPlayer.so) 99 target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/directed_stopband_filtering/libAudioPlayer.so)
72 elseif(${filtering_type} STREQUAL "high_pass_filtering") 100 elseif(${filtering_type} STREQUAL "high_pass_filtering")
73 - message("\n滤波库:带阻滤波\n")  
74 - target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/high_pass_filtering/libAudioPlayer.so) 101 + message("\n滤波库:高通滤波\n")
  102 + if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON")
  103 + 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)
  105 + else()
  106 + target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/music/high_pass_filtering/libAudioPlayer.so)
  107 + endif()
  108 +
75 else() 109 else()
76 message(FATAL_ERROR "Invalid filtering type") 110 message(FATAL_ERROR "Invalid filtering type")
77 endif() 111 endif()
@@ -85,9 +119,58 @@ else() @@ -85,9 +119,58 @@ else()
85 message("\n固件版本为国内版\n") 119 message("\n固件版本为国内版\n")
86 endif() 120 endif()
87 121
  122 +if(${CedarxLib} STREQUAL "VERSION_SWITCH_ON")
  123 + message("\nCedarX已加载\n")
  124 + target_link_libraries(${PROJECT_NAME}
  125 + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/Camera/CedarX/libawh264.so
  126 + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/Camera/CedarX/libMemAdapter.so
  127 + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/Camera/CedarX/libVE.so
  128 + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/Camera/CedarX/libvencoder.so
  129 + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/Camera/CedarX/libvideoengine.so
  130 + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/Camera/CedarX/libvdecoder.so
  131 + )
  132 +
  133 + message("\n OpenCV已加载\n")
  134 + 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 #动态库
  152 + )
  153 +
  154 + message("\n ffmpeg已加载\n")
  155 + target_link_libraries(${PROJECT_NAME}
  156 + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/ffmpeg/libavcodec.so
  157 + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/ffmpeg/libavdevice.so
  158 + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/ffmpeg/libavfilter.so
  159 + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/ffmpeg/libavformat.so
  160 + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/ffmpeg/libavutil.so
  161 + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/ffmpeg/libswresample.so
  162 + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/ffmpeg/libswscale.so
  163 + )
  164 +
  165 + message("\n SearchLightCenter已加载\n")
  166 + target_link_libraries(${PROJECT_NAME}
  167 + ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/SearchLightCenter/libcenter.so
  168 + )
  169 +
  170 +endif()
  171 +
88 target_link_libraries(${PROJECT_NAME} 172 target_link_libraries(${PROJECT_NAME}
89 173
90 ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/libmsc.so 174 ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/TTS/libmsc.so
91 ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/opus/libopus.so 175 ${CMAKE_CURRENT_LIST_DIR}/ModuleLib/opus/libopus.so
92 ) 176 )
93 -  
@@ -19,10 +19,9 @@ extern "C" { @@ -19,10 +19,9 @@ extern "C" {
19 /* Exported constants --------------------------------------------------------*/ 19 /* Exported constants --------------------------------------------------------*/
20 /* 常亮定义*/ 20 /* 常亮定义*/
21 #include "JZsdk_Base/JZsdkBase.h" 21 #include "JZsdk_Base/JZsdkBase.h"
22 -#include "JZsdk_CommonFuntion/JZsdkCommonFuntion.h"  
23 -//#include "JZsdk_Normal_Module/JZsdk_normal_module.h"  
24 #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h" 22 #include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
25 23
  24 +#include "JZsdk_CommonFuntion/JZsdkCommonFuntion.h"
26 /* Exported types ------------------------------------------------------------*/ 25 /* Exported types ------------------------------------------------------------*/
27 26
28 /* Exported functions --------------------------------------------------------*/ 27 /* Exported functions --------------------------------------------------------*/
@@ -22,6 +22,7 @@ extern "C" { @@ -22,6 +22,7 @@ extern "C" {
22 #include "JZsdk_Osal/JZsdk_FileSystm.h" 22 #include "JZsdk_Osal/JZsdk_FileSystm.h"
23 #include "JZsdk_Delay/JZsdk_Delay.h" 23 #include "JZsdk_Delay/JZsdk_Delay.h"
24 #include "JZsdk_Code/JZsdk_FLagCode.h" 24 #include "JZsdk_Code/JZsdk_FLagCode.h"
  25 +
25 /* Exported types ------------------------------------------------------------*/ 26 /* Exported types ------------------------------------------------------------*/
26 27
27 28
@@ -26,6 +26,8 @@ typedef enum { @@ -26,6 +26,8 @@ typedef enum {
26 26
27 JZ_INSCODE_5AFRAME_ASKFORCONNECT = 0x10000100, //申请连接 27 JZ_INSCODE_5AFRAME_ASKFORCONNECT = 0x10000100, //申请连接
28 28
  29 + JZ_INSCODE_5AFRAME_FRAME_POWER_STATUS = 0x10000110, //电源状态设置
  30 +
29 JZ_INSCODE_5AFRAME_REALTIMEMP2_START = 0x10000200, //开启实时MP2 31 JZ_INSCODE_5AFRAME_REALTIMEMP2_START = 0x10000200, //开启实时MP2
30 JZ_INSCODE_5AFRAME_REALTIMEMP2_UNLIMIT_TRANSMISSION = 0x10000201, //无限制传输实时MP2 32 JZ_INSCODE_5AFRAME_REALTIMEMP2_UNLIMIT_TRANSMISSION = 0x10000201, //无限制传输实时MP2
31 JZ_INSCODE_5AFRAME_REALTIMEMP2_STOP = 0x10000202, //结束实时MP2 33 JZ_INSCODE_5AFRAME_REALTIMEMP2_STOP = 0x10000202, //结束实时MP2
@@ -91,9 +93,10 @@ typedef enum { @@ -91,9 +93,10 @@ typedef enum {
91 93
92 JZ_INSCODE_5AFRAME_OPUS_TRANS_START = 0x10000900, //opus传输开始 94 JZ_INSCODE_5AFRAME_OPUS_TRANS_START = 0x10000900, //opus传输开始
93 JZ_INSCODE_5AFRAME_OPUS_TRAN_UNLIMIT_TRANSMISSION = 0x10000901, //opus 无限制传输中 95 JZ_INSCODE_5AFRAME_OPUS_TRAN_UNLIMIT_TRANSMISSION = 0x10000901, //opus 无限制传输中
94 - JZ_INSCODE_5AFRAME_OPUS_TRANS_STOP = 0x10000902, //opus传输结束  
95 JZ_INSCODE_5AFRAME_OPUS_TRANS_LIMIT_TRANSMISSION = 0x10000903, //opus传输中 96 JZ_INSCODE_5AFRAME_OPUS_TRANS_LIMIT_TRANSMISSION = 0x10000903, //opus传输中
96 97
  98 + JZ_INSCODE_5AFRAME_OPUS_TRANS_STOP = 0x10000902, //opus传输结束
  99 +
97 JZ_INSCODE_5AFRAME_OPUS_PLAY = 0x10000910, //opus播放 100 JZ_INSCODE_5AFRAME_OPUS_PLAY = 0x10000910, //opus播放
98 101
99 JZ_INSCODE_5AFRAME_OPUS_REALTIMEVOICE_START = 0x10000A00, //开启opus实时语音 102 JZ_INSCODE_5AFRAME_OPUS_REALTIMEVOICE_START = 0x10000A00, //开启opus实时语音
@@ -167,6 +170,9 @@ typedef enum { @@ -167,6 +170,9 @@ typedef enum {
167 170
168 JZ_INSCODE_5BFRAME_CHECKSTATUS_OUTPUTPOWER = 0x10004900, //对外供电查询 171 JZ_INSCODE_5BFRAME_CHECKSTATUS_OUTPUTPOWER = 0x10004900, //对外供电查询
169 172
  173 + JZ_INSCODE_5BFRAME_OPUS_DECODE_STATUS = 0x10005000, //opus解码状态
  174 +
  175 +
170 //6A类 176 //6A类
171 JZ_INSCODE_6AFRAME_FRAME = 0x10008000, //发送帧 177 JZ_INSCODE_6AFRAME_FRAME = 0x10008000, //发送帧
172 178
  1 +/**
  2 + ********************************************************************
  3 + * @file JZsdk_SMT_Code.h
  4 + * 用于序列号管理的表
  5 + *
  6 + *********************************************************************
  7 + */
  8 +
  9 +/* Define to prevent recursive inclusion 避免重定义 -------------------------------------*/
  10 +#ifndef JZSDK_SMT_CODE_H
  11 +#define JZSDK_SMT_CODE_H
  12 +
  13 +/* Includes ------------------------------------------------------------------*/
  14 +
  15 +#ifdef __cplusplus
  16 +extern "C" {
  17 +#endif
  18 +
  19 +/* Exported constants --------------------------------------------------------*/
  20 +/* 常亮定义*/
  21 +
  22 +typedef enum
  23 +{
  24 + // 设备序列号类型
  25 + UNDEFINED_SNM = 0x0000, //未定义类型序列号
  26 + STANDARD_DJI_SNM = 0x0001, // 大疆转接环序列号类型
  27 + STANDARD_JZ_1_SNM = 0x0002, // JZ-1型序列号
  28 + STANDARD_JZ_2_SNM = 0x0003, // JZ-2型序列号 2023.12.14 制定
  29 +} JZSDK_SNM_TPYE;
  30 +
  31 +typedef enum
  32 +{
  33 + // 设备激活码状态 0 未存在序列号 1 旧版序列号 2新版序列号未激活 3新版序列号已激活
  34 + SNM_NOT_EXISTS = 0x0000, // （未存在序列号）
  35 + SNM_HAVE_ACTIVATED = 0x0001, // 已激活
  36 + SNM_NOT_ACTIVATED = 0x0002, // 未激活
  37 + SNM_ERROR_ACTIVATED = 0x0003, //激活错误状态
  38 +} JZSDK_SNM_STATUS;
  39 +
  40 +typedef enum
  41 +{
  42 + STANDARD_DJI_SNM_LENGTH = 14, //dji序列号默认长度14
  43 + STANDARD_JZ_1_SUM_LENGTH = 14, //极至标准1长度太多种拉 喊话器最长是14
  44 + STANDARD_JZ_2_SUM_LENGTH = 16, //极至标准2 16长度
  45 +}JZSDK_SNM_STANDARD_LENGTH;
  46 +
  47 +typedef enum
  48 +{
  49 + STANDARD_JZ_2_CN = 0x0001, //极至标准2通用码
  50 + STANDARD_JZ_2_EN = 0x0002, //极至标准2海外码
  51 +}JZSDK_FIREWARM_CODE;
  52 +
  53 +typedef enum
  54 +{
  55 + STANDARD_JZ_2_F1 = 0x0001, //通用版本固件
  56 +
  57 +}JZSKD_SPECIAL_VERSION;
  58 +
  59 +
  60 +#ifdef __cplusplus
  61 +}
  62 +#endif
  63 +
  64 +#endif
@@ -49,13 +49,6 @@ int JZsdk_FrameComparsion(char *getdata, int len) @@ -49,13 +49,6 @@ int JZsdk_FrameComparsion(char *getdata, int len)
49 return JZsdk_6BFrameComparsion(getdata, len); 49 return JZsdk_6BFrameComparsion(getdata, len);
50 } 50 }
51 51
52 - //判断帧头帧尾  
53 - if (  
54 - ( (getdata[0]!= 0x5a) && (getdata[1] != 0x5a) && (getdata[2]!=0x77) )  
55 - || ( (getdata[len -2]!= 0x00) && (getdata[ len -1] != 0x23) )  
56 - )  
57 - {  
58 - printf("接受到的帧,没有帧头或者帧尾,退出recv帧判断函数\n");  
59 - return JZ_ERROR_SYSTEM_FRAME_ERROR;  
60 - } 52 + printf("接受到的帧,没有帧头或者帧尾,退出recv帧判断函数\n");
  53 + return JZ_ERROR_SYSTEM_FRAME_ERROR;
61 } 54 }
@@ -17,6 +17,11 @@ static int Comparison_5AFRAME_FirstLevelCode_0x50(char *getdata) @@ -17,6 +17,11 @@ static int Comparison_5AFRAME_FirstLevelCode_0x50(char *getdata)
17 return JZ_INSCODE_5AFRAME_ASKFORCONNECT; 17 return JZ_INSCODE_5AFRAME_ASKFORCONNECT;
18 break; 18 break;
19 19
  20 + //设备电源状态
  21 + case 0x52:
  22 + return JZ_INSCODE_5AFRAME_FRAME_POWER_STATUS;
  23 + break;
  24 +
20 default: 25 default:
21 return JZ_ERROR_SYSTEM_FRAME_ERROR; 26 return JZ_ERROR_SYSTEM_FRAME_ERROR;
22 break; 27 break;
@@ -124,6 +124,23 @@ static int Comparison_5BFRAME_FirstLevelCode_0x58(char *getdata) @@ -124,6 +124,23 @@ static int Comparison_5BFRAME_FirstLevelCode_0x58(char *getdata)
124 } 124 }
125 } 125 }
126 126
  127 +//一级功能码是opus功能
  128 +static int Comparison_5BFRAME_FirstLevelCode_0x59(char *getdata)
  129 +{
  130 + //二级功能位
  131 + switch (getdata[8])
  132 + {
  133 + //opus解码状态
  134 + case 0xF2:
  135 + return JZ_INSCODE_5BFRAME_OPUS_DECODE_STATUS;
  136 + break;
  137 +
  138 + default:
  139 + return JZ_ERROR_SYSTEM_FRAME_ERROR;
  140 + break;
  141 + }
  142 +}
  143 +
127 //一级功能码是硬件引脚控制 144 //一级功能码是硬件引脚控制
128 static int Comparison_5BFRAME_FirstLevelCode_0x5A(char *getdata) 145 static int Comparison_5BFRAME_FirstLevelCode_0x5A(char *getdata)
129 { 146 {
@@ -337,6 +354,10 @@ int JZsdk_5BFrameComparsion(char *getdata, int len) @@ -337,6 +354,10 @@ int JZsdk_5BFrameComparsion(char *getdata, int len)
337 return Comparison_5BFRAME_FirstLevelCode_0x58(getdata); 354 return Comparison_5BFRAME_FirstLevelCode_0x58(getdata);
338 break; 355 break;
339 356
  357 + case 0x59:
  358 + return Comparison_5BFRAME_FirstLevelCode_0x58(getdata);
  359 + break;
  360 +
340 case 0x5A: 361 case 0x5A:
341 return Comparison_5BFRAME_FirstLevelCode_0x5A(getdata); 362 return Comparison_5BFRAME_FirstLevelCode_0x5A(getdata);
342 break; 363 break;
@@ -17,6 +17,78 @@ int JZsdk_GetFrameTemplate(int InsCode ,char *str, int *str_len) @@ -17,6 +17,78 @@ int JZsdk_GetFrameTemplate(int InsCode ,char *str, int *str_len)
17 * 5A帧 17 * 5A帧
18 * 18 *
19 ********************************************************************************************************************************************************/ 19 ********************************************************************************************************************************************************/
  20 + case JZ_INSCODE_5AFRAME_ASKFORCONNECT:
  21 + {
  22 + char sendbuf[12] = {0x5A ,0x5A ,0x77 ,0x00 ,0x0C ,0x00 ,0x00 ,0x50 ,0x51 ,0x00 ,0x00 ,0x23};
  23 + memcpy(str, sendbuf, 12);
  24 + *str_len = 12;
  25 + }
  26 + break;
  27 +
  28 +
  29 + case JZ_INSCODE_5AFRAME_AUDIO_STOP:
  30 + {
  31 + char sendbuf[12] = {0x5A ,0x5A ,0x77 ,0x00 ,0x0C ,0x00 ,0x00 ,0x52 ,0x06 ,0x00 ,0x00 ,0x23};
  32 + memcpy(str, sendbuf, 12);
  33 + *str_len = 12;
  34 + }
  35 + break;
  36 +
  37 + case JZ_INSCODE_5AFRAME_AUDIO_LASTSONG:
  38 + {
  39 + char sendbuf[12] = {0x5A ,0x5A ,0x77 ,0x00 ,0x0C ,0x00 ,0x00 ,0x52 ,0x07 ,0x00 ,0x00 ,0x23};
  40 + memcpy(str, sendbuf, 12);
  41 + *str_len = 12;
  42 + }
  43 + break;
  44 +
  45 + case JZ_INSCODE_5AFRAME_AUDIO_NEXTSONG:
  46 + {
  47 + char sendbuf[12] = {0x5A ,0x5A ,0x77 ,0x00 ,0x0C ,0x00 ,0x00 ,0x52 ,0x08 ,0x00 ,0x00 ,0x23};
  48 + memcpy(str, sendbuf, 12);
  49 + *str_len = 12;
  50 + }
  51 + break;
  52 +
  53 + case JZ_INSCODE_5AFRAME_VOLUME:
  54 + {
  55 + char sendbuf[12] = {0x5A ,0x5A ,0x77 ,0x00 ,0x0C ,0x00 ,0x00 ,0x52 ,0x10 ,0x00 ,0x00 ,0x23};
  56 + memcpy(str, sendbuf, 12);
  57 + *str_len = 12;
  58 + }
  59 + break;
  60 +
  61 + case JZ_INSCODE_5AFRAME_PLAY_LOOP:
  62 + {
  63 + char sendbuf[12] = {0x5A ,0x5A ,0x77 ,0x00 ,0x0C ,0x00 ,0x00 ,0x55 ,0x00 ,0x00 ,0x00 ,0x23};
  64 + memcpy(str, sendbuf, 12);
  65 + *str_len = 12;
  66 + }
  67 + break;
  68 +
  69 + case JZ_INSCODE_5AFRAME_TTS_SET_TONE:
  70 + {
  71 + char sendbuf[12] = {0x5A ,0x5A ,0x77 ,0x00 ,0x0C ,0x00 ,0x00 ,0x57 ,0x01 ,0x00 ,0x00 ,0x23};
  72 + memcpy(str, sendbuf, 12);
  73 + *str_len = 12;
  74 + }
  75 + break;
  76 +
  77 + case JZ_INSCODE_5AFRAME_TTS_TRANS_START:
  78 + {
  79 + char sendbuf[12] = {0x5A ,0x5A ,0x77 ,0x00 ,0x0C ,0x00 ,0x00 ,0x57 ,0x03 ,0x00 ,0x00 ,0x23};
  80 + memcpy(str, sendbuf, 12);
  81 + *str_len = 12;
  82 + }
  83 + break;
  84 +
  85 + case JZ_INSCODE_5AFRAME_TTS_TRANS_STOP:
  86 + {
  87 + char sendbuf[12] = {0x5A ,0x5A ,0x77 ,0x00 ,0x0C ,0x00 ,0x00 ,0x57 ,0x04 ,0x00 ,0x00 ,0x23};
  88 + memcpy(str, sendbuf, 12);
  89 + *str_len = 12;
  90 + }
  91 + break;
20 92
21 case JZ_INSCODE_5AFRAME_SEARCHLIGHT_SET_FREQUENCY: 93 case JZ_INSCODE_5AFRAME_SEARCHLIGHT_SET_FREQUENCY:
22 { 94 {
@@ -257,6 +329,14 @@ int JZsdk_GetFrameTemplate(int InsCode ,char *str, int *str_len) @@ -257,6 +329,14 @@ int JZsdk_GetFrameTemplate(int InsCode ,char *str, int *str_len)
257 } 329 }
258 break; 330 break;
259 331
  332 + case JZ_INSCODE_5BFRAME_OPUS_DECODE_STATUS:
  333 + {
  334 + char sendbuf[12] = { 0x5b, 0x5b, 0x77, 0x00, 0x0c, 0x00, 0x00, 0x59, 0xf2, 0x00, 0x00, 0x23};
  335 + memcpy(str, sendbuf, 12);
  336 + *str_len = 12;
  337 + }
  338 + break;
  339 +
260 case JZ_INSCODE_5BFRAME_CHECKSTATUS_OUTPUTPOWER: 340 case JZ_INSCODE_5BFRAME_CHECKSTATUS_OUTPUTPOWER:
261 { 341 {
262 char sendbuf[12] = { 0x5b, 0x5b, 0x77, 0x00, 0x0C, 0x00, 0x00, 0x5A, 0x02, 0x00, 0x00, 0x23}; 342 char sendbuf[12] = { 0x5b, 0x5b, 0x77, 0x00, 0x0C, 0x00, 0x00, 0x5A, 0x02, 0x00, 0x00, 0x23};
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 #include <stdbool.h> 4 #include <stdbool.h>
5 #include <string.h> 5 #include <string.h>
6 6
  7 +#include "JZsdkLib.h"
7 8
8 /* 9 /*
9 * 用于运行指令 10 * 用于运行指令
@@ -86,18 +87,19 @@ T_JZsdkReturnCode GetSerialNumber(char *SerialNumber) @@ -86,18 +87,19 @@ T_JZsdkReturnCode GetSerialNumber(char *SerialNumber)
86 printf("Seek log count file error, ret: %d.\r\n", ret); 87 printf("Seek log count file error, ret: %d.\r\n", ret);
87 } 88 }
88 89
89 - ret = fread((char *) &num_char,14, sizeof(char), num_file);  
90 - if (ret != sizeof(char)) 90 + ret = fread((char *) &num_char,1, 16, num_file);
  91 + if (ret == 0)
91 { 92 {
92 - printf("Read num file error.\r\n"); 93 + JZSDK_LOG_ERROR("读取序列号失败");
93 //无序列号 94 //无序列号
94 memcpy(SerialNumber, "无", sizeof("无")); 95 memcpy(SerialNumber, "无", sizeof("无"));
95 fclose(num_file); 96 fclose(num_file);
96 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 97 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
97 } 98 }
98 else{ 99 else{
99 - printf("Read num file=%s\n",&num_char);  
100 - } 100 + JZSDK_LOG_INFO("Read num file=%s\n",&num_char);
  101 + }
  102 +
101 } 103 }
102 104
103 105
@@ -109,4 +111,63 @@ T_JZsdkReturnCode GetSerialNumber(char *SerialNumber) @@ -109,4 +111,63 @@ T_JZsdkReturnCode GetSerialNumber(char *SerialNumber)
109 111
110 fclose(num_file); 112 fclose(num_file);
111 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 113 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
112 -}  
  114 +}
  115 +
  116 +/**********************************
  117 + *
  118 + * 文件是否存在判断函数
  119 +* 判断文件是否存在
  120 + 函数名：JZsdk_check_file_exists
  121 + 参数：文件路径
  122 + 返回值：JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS表示文件存在，
  123 + JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE表示文件不存在
  124 + * *******************************/
  125 +T_JZsdkReturnCode JZsdk_check_file_exists(const char* file_path)
  126 +{
  127 + FILE* file = fopen(file_path, "r");
  128 + if (file != NULL)
  129 + {
  130 + fclose(file);
  131 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  132 + }
  133 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  134 +}
  135 +
  136 +/**********************************
  137 + *
  138 + * 创建新的文件
  139 + 函数名：JZsdk_check_file_exists
  140 + 参数：文件路径
  141 + 返回值：JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS表示文件存在，
  142 + JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE表示文件不存在
  143 + * *******************************/
  144 +T_JZsdkReturnCode JZsdk_create_file(const char* file_path)
  145 +{
  146 + FILE* file = fopen(file_path, "w");
  147 + if (file != NULL)
  148 + {
  149 + fclose(file);
  150 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  151 + }
  152 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  153 +}
  154 +
  155 +/**********************************
  156 + *
  157 + * 删除文件
  158 + 函数名：JZsdk_delete_file
  159 + 参数：文件路径
  160 + 返回值：JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS表示文件已经不存在
  161 + JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE表示文件仍然存在
  162 + * *******************************/
  163 +T_JZsdkReturnCode JZsdk_delete_file(const char* file_path)
  164 +{
  165 + remove(file_path);
  166 + T_JZsdkReturnCode ret = JZsdk_check_file_exists(file_path);
  167 + if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
  168 + {
  169 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  170 + }
  171 +
  172 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
  173 +}
@@ -28,6 +28,9 @@ extern "C" { @@ -28,6 +28,9 @@ extern "C" {
28 int JZsdk_RunSystemCmd(char *systemCmd); 28 int JZsdk_RunSystemCmd(char *systemCmd);
29 //FILE* JZsdk_RunSystemCmd_ReturnFilePointer(char *systemCmd); 29 //FILE* JZsdk_RunSystemCmd_ReturnFilePointer(char *systemCmd);
30 T_JZsdkReturnCode GetSerialNumber(char *SerialNumber); 30 T_JZsdkReturnCode GetSerialNumber(char *SerialNumber);
  31 +T_JZsdkReturnCode JZsdk_check_file_exists(const char* file_path) ;
  32 +T_JZsdkReturnCode JZsdk_create_file(const char* file_path) ;
  33 +T_JZsdkReturnCode JZsdk_delete_file(const char* file_path) ;
31 34
32 #ifdef __cplusplus 35 #ifdef __cplusplus
33 } 36 }
1 #include <stdio.h> 1 #include <stdio.h>
2 #include "JZsdk_string.h" 2 #include "JZsdk_string.h"
  3 +#include "../../JZsdkLib.h"
3 4
4 /* 5 /*
5 * 用于字符串转int型 6 * 用于字符串转int型
@@ -101,4 +102,20 @@ size_t JZsdk_String_longlong_to_str(char *s, long long value,int radix) @@ -101,4 +102,20 @@ size_t JZsdk_String_longlong_to_str(char *s, long long value,int radix)
101 p--; 102 p--;
102 } 103 }
103 return l; 104 return l;
  105 +}
  106 +
  107 +/****************
  108 + *
  109 + * 用于判断数组是否为空
  110 + * 不为空 JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE
  111 + * 空 JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS
  112 + * ***********/
  113 +T_JZsdkReturnCode JZsdk_Array_isEmpty(unsigned char array[], int size)
  114 +{
  115 + for (int i = 0; i < size; i++) {
  116 + if (array[i] != 0) {
  117 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; // 数组不为空
  118 + }
  119 + }
  120 + return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; // 数组为空
104 } 121 }
@@ -11,6 +11,8 @@ @@ -11,6 +11,8 @@
11 #define JZSDK_STRING_H 11 #define JZSDK_STRING_H
12 12
13 /* Includes ------------------------------------------------------------------*/ 13 /* Includes ------------------------------------------------------------------*/
  14 +#include <stddef.h>
  15 +#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
14 16
15 #ifdef __cplusplus 17 #ifdef __cplusplus
16 extern "C" { 18 extern "C" {
@@ -27,6 +29,7 @@ extern "C" { @@ -27,6 +29,7 @@ extern "C" {
27 int JZsdk_String_str_to_int(const char *str); 29 int JZsdk_String_str_to_int(const char *str);
28 void JZsdk_String_int_to_str(int n, char *str); 30 void JZsdk_String_int_to_str(int n, char *str);
29 size_t JZsdk_String_longlong_to_str(char *s, long long value,int radix); 31 size_t JZsdk_String_longlong_to_str(char *s, long long value,int radix);
  32 +T_JZsdkReturnCode JZsdk_Array_isEmpty(unsigned char array[], int size);
30 33
31 34
32 #ifdef __cplusplus 35 #ifdef __cplusplus
@@ -119,7 +119,7 @@ int JZsdk_Uart_SecondInit(int UART_DEV_NAME, int BitRate) @@ -119,7 +119,7 @@ int JZsdk_Uart_SecondInit(int UART_DEV_NAME, int BitRate)
119 { 119 {
120 int Uart_fd = 0; 120 int Uart_fd = 0;
121 121
122 - printf("初始化串口%d\n",UART_DEV_NAME); 122 + printf("初始化串口%x\n",UART_DEV_NAME);
123 123
124 //初始化的是一号设备 124 //初始化的是一号设备
125 if (UART_DEV_NAME == UART_DEV_1) 125 if (UART_DEV_NAME == UART_DEV_1)
@@ -158,6 +158,27 @@ int JZsdk_Uart_SecondInit(int UART_DEV_NAME, int BitRate) @@ -158,6 +158,27 @@ int JZsdk_Uart_SecondInit(int UART_DEV_NAME, int BitRate)
158 UartDevUseFlag.UartDev_4G = JZ_FLAGCODE_ON; 158 UartDevUseFlag.UartDev_4G = JZ_FLAGCODE_ON;
159 } 159 }
160 } 160 }
  161 +
  162 +/*******************************
  163 + *
  164 + * 自由帧发送
  165 + *
  166 + * ******************/
  167 +int JZsdk_Uart_Send_CustomOrder(int UartPort, char *frame, int frame_len)
  168 +{
  169 + JZsdk_Uart_SendDeal_SendOreder(UartPort, frame, frame_len);
  170 +}
  171 +
  172 +/*****************
  173 + *
  174 + * 发送主动连接帧
  175 + *
  176 + * ******************/
  177 +int JZsdk_Uart_Send_ConnectFrame(int PortNum)
  178 +{
  179 + JZsdk_Uart_SendDeal_ConnectFrame(PortNum);
  180 +}
  181 +
161 /* 182 /*
162 * 183 *
163 * 发送播放结束状态帧 184 * 发送播放结束状态帧
@@ -448,6 +469,17 @@ int JZsdk_Uart_Send_Set_WarningLight_Color(int Uartport,int color1, int color2) @@ -448,6 +469,17 @@ int JZsdk_Uart_Send_Set_WarningLight_Color(int Uartport,int color1, int color2)
448 * *******************************************************************************************************************************/ 469 * *******************************************************************************************************************************/
449 /************* 470 /*************
450 * 471 *
  472 + * 发送opus解码状态
  473 + *
  474 + * **************/
  475 +int JZsdk_Uart_Send_OpusDecodeStatus(int Uartport,int value)
  476 +{
  477 + JZsdk_Uart_SendDeal_OpusDecodeStatus(Uartport, value);
  478 +}
  479 +
  480 +
  481 +/*************
  482 + *
451 * 发送探照灯爆闪频率 483 * 发送探照灯爆闪频率
452 * 484 *
453 * **************/ 485 * **************/
@@ -32,7 +32,10 @@ int JZsdk_Uart_Reply_Volume(int Uartport,int volume); @@ -32,7 +32,10 @@ int JZsdk_Uart_Reply_Volume(int Uartport,int volume);
32 int JZsdk_Uart_Reply_TTS_tone(int Uartport,int tone); 32 int JZsdk_Uart_Reply_TTS_tone(int Uartport,int tone);
33 int JZsdk_Uart_Reply_TTS_speed(int Uartport,int speed); 33 int JZsdk_Uart_Reply_TTS_speed(int Uartport,int speed);
34 int JZsdk_Uart_Reply_AudioPlayLoopStatus(int Uartport,int speed); 34 int JZsdk_Uart_Reply_AudioPlayLoopStatus(int Uartport,int speed);
  35 +int JZsdk_Uart_Send_OpusDecodeStatus(int Uartport,int value);
35 36
  37 +int JZsdk_Uart_Send_CustomOrder(int UartPort, char *frame, int frame_len);
  38 +int JZsdk_Uart_Send_ConnectFrame(int PortNum);
36 39
37 int JZsdk_Uart_Reply_GimbalPitchAngle(int Uartport,int angle); 40 int JZsdk_Uart_Reply_GimbalPitchAngle(int Uartport,int angle);
38 int JZsdk_Uart_Send_SetGimbalPitch(int Uartport,int angle); 41 int JZsdk_Uart_Send_SetGimbalPitch(int Uartport,int angle);
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 4
5 #include "UartConnection/UartConnection.h" 5 #include "UartConnection/UartConnection.h"
6 #include "Megaphone_InputAndOutput.h" 6 #include "Megaphone_InputAndOutput.h"
  7 +#include "TestAPP_InAndOut.h"
7 #include "BaseConfig.h" 8 #include "BaseConfig.h"
8 #include "version_choose.h" 9 #include "version_choose.h"
9 10
@@ -17,6 +18,16 @@ @@ -17,6 +18,16 @@
17 18
18 static int SecondaryDeviceName = 0x00; // 从设备名，用于多设备相连时通知控制端 从机设备名 19 static int SecondaryDeviceName = 0x00; // 从设备名，用于多设备相连时通知控制端 从机设备名
19 20
  21 +/**********
  22 + *
  23 + * 电源状态设置
  24 + *
  25 + * *********/
  26 +T_JZsdkReturnCode JZsdk_Uart_Set_PowerStatus(int DeviceName, int status)
  27 +{
  28 + UIcontrol_Set_PowerStatus(DeviceName,status);
  29 +}
  30 +
20 /****** 31 /******
21 * 32 *
22 * 开关功放 33 * 开关功放
@@ -728,6 +739,21 @@ T_JZsdkReturnCode JZsdk_Uart_Checkstatus_OutPutPower(int DeviceName, int FrameSe @@ -728,6 +739,21 @@ T_JZsdkReturnCode JZsdk_Uart_Checkstatus_OutPutPower(int DeviceName, int FrameSe
728 ********* ********| 739 ********* ********|
729 ********* ********| 740 ********* ********|
730 *********************************************************************************************************/ 741 *********************************************************************************************************/
  742 +/*******************************************************************************************************************************
  743 + *
  744 + * 设备相关
  745 + *
  746 + * *******************************************************************************************************************************/
  747 +/*********
  748 + *
  749 + * 收到连接回复
  750 + *
  751 + **********/
  752 +T_JZsdkReturnCode JZsdl_Uart_ObtainConnectFrame(char *getbuf, int value)
  753 +{
  754 + TestAPP_Connect(value);
  755 +}
  756 +
731 757
732 /******************************************************************************************************************************* 758 /*******************************************************************************************************************************
733 * 759 *
@@ -29,6 +29,10 @@ extern "C" { @@ -29,6 +29,10 @@ extern "C" {
29 int JZsdk_Uart_Init(int UART_DEV_NAME); 29 int JZsdk_Uart_Init(int UART_DEV_NAME);
30 int JZsdk_Get_UartDev_UseFlag(int UART_DEV_NAME); 30 int JZsdk_Get_UartDev_UseFlag(int UART_DEV_NAME);
31 31
  32 +T_JZsdkReturnCode JZsdk_Uart_Set_PowerStatus(int DeviceName, int status);
  33 +T_JZsdkReturnCode JZsdl_Uart_ObtainConnectFrame(char *getbuf, int value);
  34 +
  35 +
32 int JZsdk_Uart_Set_Amplifier(int status); 36 int JZsdk_Uart_Set_Amplifier(int status);
33 T_JZsdkReturnCode JZsdk_Uart_Set_Volume(int DeviceName, int value); 37 T_JZsdkReturnCode JZsdk_Uart_Set_Volume(int DeviceName, int value);
34 38
@@ -41,7 +41,7 @@ static T_JZsdkReturnCode JZsdk_Uart_RecvDeal_UART_4G_TransmodeDecide(); @@ -41,7 +41,7 @@ static T_JZsdkReturnCode JZsdk_Uart_RecvDeal_UART_4G_TransmodeDecide();
41 **********/ 41 **********/
42 static int Uart_4G_RecvDeal_AskForConnect(char *getbuf) 42 static int Uart_4G_RecvDeal_AskForConnect(char *getbuf)
43 { 43 {
44 - JZSDK_LOG_INFO("串口设备4g,连接成功"); 44 + JZSDK_LOG_INFO("串口设备4G,连接成功");
45 //获取帧的序列号 45 //获取帧的序列号
46 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 46 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
47 47
@@ -49,10 +49,27 @@ static int Uart_4G_RecvDeal_AskForConnect(char *getbuf) @@ -49,10 +49,27 @@ static int Uart_4G_RecvDeal_AskForConnect(char *getbuf)
49 int Device_name = JZsdk_Uart_GetVersionReplay(); 49 int Device_name = JZsdk_Uart_GetVersionReplay();
50 50
51 //3、回复连接成功 51 //3、回复连接成功
52 - JZsdk_Uart_SendDeal_Send_Connect(UART_DEV_1, Device_name); 52 + JZsdk_Uart_SendDeal_Send_Connect(UART_4G, Device_name);
  53 +}
  54 +
  55 +/*********
  56 + *
  57 + * 电源状态设置
  58 + *
  59 +**********/
  60 +static int Uart_4G_RecvDeal_PowerStatus(char *getbuf)
  61 +{
  62 + JZSDK_LOG_INFO("电源状态设置");
  63 + //获取帧的序列号
  64 + int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
  65 +
  66 + int status = getbuf[9];
  67 +
  68 + //回复操作成功
  69 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
53 70
54 - //1、将串口程序设置为连接模式  
55 - //JZsdk_Uart_SetMainWorkMode(JZ_FLAGCODE_ON); 71 + //1、电源状态设置
  72 + JZsdk_Uart_Set_PowerStatus(UART_4G, status);
56 } 73 }
57 74
58 /******************************************************************************************************************************* 75 /*******************************************************************************************************************************
@@ -79,7 +96,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_RealTimeMP2_start(char *getbuf) @@ -79,7 +96,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_RealTimeMP2_start(char *getbuf)
79 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 96 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
80 { 97 {
81 //回复操作失败 98 //回复操作失败
82 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 99 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
83 JZSDK_LOG_ERROR("开启MP2实时喊话功能失败\n"); 100 JZSDK_LOG_ERROR("开启MP2实时喊话功能失败\n");
84 101
85 return ret; 102 return ret;
@@ -106,12 +123,12 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_RealTimeMP2_start(char *getbuf) @@ -106,12 +123,12 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_RealTimeMP2_start(char *getbuf)
106 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 123 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
107 { 124 {
108 //4、回复操作成功 125 //4、回复操作成功
109 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 126 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
110 } 127 }
111 else 128 else
112 { 129 {
113 //4、回复操作失败 130 //4、回复操作失败
114 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 131 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
115 } 132 }
116 } 133 }
117 134
@@ -172,7 +189,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_RealTimeMP2_stop(char *getbuf) @@ -172,7 +189,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_RealTimeMP2_stop(char *getbuf)
172 if ((UART_4G_Receive_mode != JZ_INSCODE_5AFRAME_REALTIMEMP2_UNLIMIT_TRANSMISSION) ) 189 if ((UART_4G_Receive_mode != JZ_INSCODE_5AFRAME_REALTIMEMP2_UNLIMIT_TRANSMISSION) )
173 { 190 {
174 //回复操作失败 191 //回复操作失败
175 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 192 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
176 JZSDK_LOG_ERROR("操作失败,mp2传输未开始,无法关闭"); 193 JZSDK_LOG_ERROR("操作失败,mp2传输未开始,无法关闭");
177 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 194 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
178 } 195 }
@@ -186,12 +203,12 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_RealTimeMP2_stop(char *getbuf) @@ -186,12 +203,12 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_RealTimeMP2_stop(char *getbuf)
186 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 203 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
187 { 204 {
188 //4、回复操作成功 205 //4、回复操作成功
189 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 206 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
190 } 207 }
191 else 208 else
192 { 209 {
193 //4、回复操作失败 210 //4、回复操作失败
194 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 211 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
195 } 212 }
196 } 213 }
197 214
@@ -211,7 +228,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_SaveAudioFileTrans_start(char *getbuf, @@ -211,7 +228,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_SaveAudioFileTrans_start(char *getbuf,
211 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 228 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
212 { 229 {
213 //回复操作失败 230 //回复操作失败
214 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 231 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
215 JZSDK_LOG_ERROR("开始传输的音频文件保存失败"); 232 JZSDK_LOG_ERROR("开始传输的音频文件保存失败");
216 return ret; 233 return ret;
217 } 234 }
@@ -228,7 +245,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_SaveAudioFileTrans_start(char *getbuf, @@ -228,7 +245,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_SaveAudioFileTrans_start(char *getbuf,
228 ret = JZsdk_Uart_SaveAudioFileStart(FileName); 245 ret = JZsdk_Uart_SaveAudioFileStart(FileName);
229 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 246 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
230 { 247 {
231 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 248 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
232 return -1; 249 return -1;
233 } 250 }
234 251
@@ -236,7 +253,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_SaveAudioFileTrans_start(char *getbuf, @@ -236,7 +253,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_SaveAudioFileTrans_start(char *getbuf,
236 JZsdk_Uart_RecvDeal_Set_UART_4G_ReceiveMode(JZ_INSCODE_5AFRAME_AUDIOFILE_TRANS_UNLIMIT_TRANSMISSION); 253 JZsdk_Uart_RecvDeal_Set_UART_4G_ReceiveMode(JZ_INSCODE_5AFRAME_AUDIOFILE_TRANS_UNLIMIT_TRANSMISSION);
237 254
238 //4、回复操作成功 255 //4、回复操作成功
239 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 256 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
240 257
241 } 258 }
242 /********* 259 /*********
@@ -265,9 +282,9 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_SaveAudioFileTrans_LimitTransmission(c @@ -265,9 +282,9 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_SaveAudioFileTrans_LimitTransmission(c
265 282
266 //提取出数据 283 //提取出数据
267 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9; 284 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9;
268 - if (DataLen > 128) 285 + if (DataLen > 400)
269 { 286 {
270 - JZSDK_LOG_ERROR("传输得到的定长音频文帧长度超出128上限"); 287 + JZSDK_LOG_ERROR("传输得到的定长音频文帧长度超出400上限");
271 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 288 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
272 } 289 }
273 290
@@ -290,7 +307,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_SaveAudioFileTrans_stop(char *getbuf) @@ -290,7 +307,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_SaveAudioFileTrans_stop(char *getbuf)
290 if (UART_4G_Receive_mode != JZ_INSCODE_5AFRAME_AUDIOFILE_TRANS_UNLIMIT_TRANSMISSION) 307 if (UART_4G_Receive_mode != JZ_INSCODE_5AFRAME_AUDIOFILE_TRANS_UNLIMIT_TRANSMISSION)
291 { 308 {
292 //回复操作失败 309 //回复操作失败
293 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 310 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
294 JZSDK_LOG_ERROR("关闭音频文件上传失败,音频文件上传未开始,无法关闭"); 311 JZSDK_LOG_ERROR("关闭音频文件上传失败,音频文件上传未开始,无法关闭");
295 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 312 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
296 } 313 }
@@ -302,7 +319,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_SaveAudioFileTrans_stop(char *getbuf) @@ -302,7 +319,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_SaveAudioFileTrans_stop(char *getbuf)
302 JZsdk_Uart_RecvDeal_Set_UART_4G_ReceiveMode(JZ_INSCODE_5AFRAME_AUDIOFILE_TRANS_STOP); 319 JZsdk_Uart_RecvDeal_Set_UART_4G_ReceiveMode(JZ_INSCODE_5AFRAME_AUDIOFILE_TRANS_STOP);
303 320
304 //2、回复操作成功 321 //2、回复操作成功
305 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 322 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
306 } 323 }
307 324
308 /********* 325 /*********
@@ -331,16 +348,16 @@ static int Uart_4G_RecvDeal_audio_PlayFile(char *getbuf) @@ -331,16 +348,16 @@ static int Uart_4G_RecvDeal_audio_PlayFile(char *getbuf)
331 348
332 JZSDK_LOG_INFO("播放指定音频:%s\n",music_name); 349 JZSDK_LOG_INFO("播放指定音频:%s\n",music_name);
333 350
334 - ret = JZsdk_Uart_PlayMusic(UART_DEV_1, music_name, datasize); 351 + ret = JZsdk_Uart_PlayMusic(UART_4G, music_name, datasize);
335 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 352 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
336 { 353 {
337 //4、回复操作成功 354 //4、回复操作成功
338 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 355 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
339 } 356 }
340 else 357 else
341 { 358 {
342 //4、回复操作失败 359 //4、回复操作失败
343 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 360 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
344 } 361 }
345 } 362 }
346 /********* 363 /*********
@@ -355,10 +372,10 @@ static int Uart_4G_RecvDeal_audio_PlayContinue(char *getbuf) @@ -355,10 +372,10 @@ static int Uart_4G_RecvDeal_audio_PlayContinue(char *getbuf)
355 //获取帧的序列号 372 //获取帧的序列号
356 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 373 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
357 374
358 - JZsdk_Uart_audio_PlayContinue(UART_DEV_1); 375 + JZsdk_Uart_audio_PlayContinue(UART_4G);
359 376
360 //回复操作成功 377 //回复操作成功
361 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 378 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
362 } 379 }
363 /********* 380 /*********
364 * 381 *
@@ -372,10 +389,10 @@ static int Uart_4G_RecvDeal_audio_PlayPause(char *getbuf) @@ -372,10 +389,10 @@ static int Uart_4G_RecvDeal_audio_PlayPause(char *getbuf)
372 //获取帧的序列号 389 //获取帧的序列号
373 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 390 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
374 391
375 - JZsdk_Uart_audio_PlayPause(UART_DEV_1); 392 + JZsdk_Uart_audio_PlayPause(UART_4G);
376 393
377 //回复操作成功 394 //回复操作成功
378 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 395 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
379 } 396 }
380 /********* 397 /*********
381 * 398 *
@@ -389,10 +406,10 @@ static int Uart_4G_RecvDeal_audio_PlayStop(char *getbuf) @@ -389,10 +406,10 @@ static int Uart_4G_RecvDeal_audio_PlayStop(char *getbuf)
389 //获取帧的序列号 406 //获取帧的序列号
390 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 407 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
391 408
392 - JZsdk_Uart_audio_PlayStop(UART_DEV_1); 409 + JZsdk_Uart_audio_PlayStop(UART_4G);
393 410
394 //回复操作成功 411 //回复操作成功
395 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 412 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
396 } 413 }
397 414
398 /********* 415 /*********
@@ -407,10 +424,10 @@ static int Uart_4G_RecvDeal_audio_LastSong(char *getbuf) @@ -407,10 +424,10 @@ static int Uart_4G_RecvDeal_audio_LastSong(char *getbuf)
407 //获取帧的序列号 424 //获取帧的序列号
408 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 425 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
409 426
410 - JZsdk_Uart_audio_LastSong(UART_DEV_1); 427 + JZsdk_Uart_audio_LastSong(UART_4G);
411 428
412 //回复操作成功 429 //回复操作成功
413 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 430 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
414 } 431 }
415 432
416 /********* 433 /*********
@@ -425,10 +442,10 @@ static int Uart_4G_RecvDeal_audio_NextSong(char *getbuf) @@ -425,10 +442,10 @@ static int Uart_4G_RecvDeal_audio_NextSong(char *getbuf)
425 //获取帧的序列号 442 //获取帧的序列号
426 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 443 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
427 444
428 - JZsdk_Uart_audio_NextSong(UART_DEV_1); 445 + JZsdk_Uart_audio_NextSong(UART_4G);
429 446
430 //回复操作成功 447 //回复操作成功
431 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 448 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
432 } 449 }
433 450
434 /********* 451 /*********
@@ -444,7 +461,7 @@ static int Uart_4G_RecvDeal_audio_GetMusicList(char *getbuf) @@ -444,7 +461,7 @@ static int Uart_4G_RecvDeal_audio_GetMusicList(char *getbuf)
444 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 461 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
445 462
446 //回复操作成功 463 //回复操作成功
447 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 464 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
448 465
449 //0、刷新歌曲列表 466 //0、刷新歌曲列表
450 JZsdk_Uart_Flush_MusicList(); 467 JZsdk_Uart_Flush_MusicList();
@@ -461,16 +478,16 @@ static int Uart_4G_RecvDeal_audio_GetMusicList(char *getbuf) @@ -461,16 +478,16 @@ static int Uart_4G_RecvDeal_audio_GetMusicList(char *getbuf)
461 } 478 }
462 479
463 //3、发送开始帧 480 //3、发送开始帧
464 - JZsdk_Uart_SendDeal_Reply_Musiclist_start(UART_DEV_1, music_sum); 481 + JZsdk_Uart_SendDeal_Reply_Musiclist_start(UART_4G, music_sum);
465 482
466 //4、逐一调用发送函数将歌曲名发出 483 //4、逐一调用发送函数将歌曲名发出
467 for (int i = 0; i < music_sum; i++) 484 for (int i = 0; i < music_sum; i++)
468 { 485 {
469 - JZsdk_Uart_SendDeal_Reply_Musiclist(UART_DEV_1, MusicName[i], MusicNameLength[i]); 486 + JZsdk_Uart_SendDeal_Reply_Musiclist(UART_4G, MusicName[i], MusicNameLength[i]);
470 } 487 }
471 488
472 //5、发送结束帧 489 //5、发送结束帧
473 - JZsdk_Uart_SendDeal_Reply_Musiclist_end(UART_DEV_1); 490 + JZsdk_Uart_SendDeal_Reply_Musiclist_end(UART_4G);
474 } 491 }
475 492
476 /********* 493 /*********
@@ -488,7 +505,7 @@ static int Uart_4G_RecvDeal_Amplifier_stop(char *getbuf) @@ -488,7 +505,7 @@ static int Uart_4G_RecvDeal_Amplifier_stop(char *getbuf)
488 JZsdk_Uart_Set_Amplifier(JZ_FLAGCODE_OFF); 505 JZsdk_Uart_Set_Amplifier(JZ_FLAGCODE_OFF);
489 506
490 //回复操作成功 507 //回复操作成功
491 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 508 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
492 509
493 } 510 }
494 /********* 511 /*********
@@ -506,7 +523,7 @@ static int Uart_4G_RecvDeal_Amplifier_open(char *getbuf) @@ -506,7 +523,7 @@ static int Uart_4G_RecvDeal_Amplifier_open(char *getbuf)
506 JZsdk_Uart_Set_Amplifier(JZ_FLAGCODE_ON); 523 JZsdk_Uart_Set_Amplifier(JZ_FLAGCODE_ON);
507 524
508 //回复操作成功 525 //回复操作成功
509 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 526 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
510 527
511 } 528 }
512 /********* 529 /*********
@@ -533,10 +550,10 @@ static int Uart_4G_RecvDeal_SetVolume(char *getbuf) @@ -533,10 +550,10 @@ static int Uart_4G_RecvDeal_SetVolume(char *getbuf)
533 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 550 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
534 551
535 int value = (int)getbuf[9]; 552 int value = (int)getbuf[9];
536 - JZsdk_Uart_Set_Volume(UART_DEV_1, value); 553 + JZsdk_Uart_Set_Volume(UART_4G, value);
537 554
538 //回复操作成功 555 //回复操作成功
539 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 556 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
540 } 557 }
541 558
542 /********* 559 /*********
@@ -555,10 +572,10 @@ static int Uart_4G_RecvDeal_CheckStatus_volume(char *getbuf) @@ -555,10 +572,10 @@ static int Uart_4G_RecvDeal_CheckStatus_volume(char *getbuf)
555 int volume = JZsdk_Uart_CheckStatus_volume(); 572 int volume = JZsdk_Uart_CheckStatus_volume();
556 573
557 //回复操作成功 574 //回复操作成功
558 - //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 575 + //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
559 576
560 //2、发送音量 577 //2、发送音量
561 - JZsdk_Uart_SendDeal_Reply_Volume(UART_DEV_1, volume); 578 + JZsdk_Uart_SendDeal_Reply_Volume(UART_4G, volume);
562 579
563 } 580 }
564 /********* 581 /*********
@@ -580,10 +597,10 @@ static int Uart_4G_RecvDeal_CheckStatus_play(char *getbuf) @@ -580,10 +597,10 @@ static int Uart_4G_RecvDeal_CheckStatus_play(char *getbuf)
580 ret = JZsdk_Uart_CheckStatus_play(); 597 ret = JZsdk_Uart_CheckStatus_play();
581 598
582 //回复操作成功 599 //回复操作成功
583 - //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 600 + //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
584 601
585 //2、发送播放状态 602 //2、发送播放状态
586 - JZsdk_Uart_SendDeal_Send_PlayStatus(UART_DEV_1, ret); 603 + JZsdk_Uart_SendDeal_Send_PlayStatus(UART_4G, ret);
587 604
588 } 605 }
589 /********* 606 /*********
@@ -606,7 +623,7 @@ static int Uart_4G_RecvDeal_CheckStatus_gimbal(char *getbuf) @@ -606,7 +623,7 @@ static int Uart_4G_RecvDeal_CheckStatus_gimbal(char *getbuf)
606 JZsdk_Uart_CheckStatus_gimbal(&PitchAngle, &YawAngle); 623 JZsdk_Uart_CheckStatus_gimbal(&PitchAngle, &YawAngle);
607 624
608 //2、发送本地云台值 625 //2、发送本地云台值
609 - JZsdk_Uart_SendDeal_Reply_GimbalPitchAngle(UART_DEV_1, PitchAngle); 626 + JZsdk_Uart_SendDeal_Reply_GimbalPitchAngle(UART_4G, PitchAngle);
610 } 627 }
611 /********* 628 /*********
612 * 629 *
@@ -619,7 +636,7 @@ static int Uart_4G_RecvDeal_CheckStatus_GimbalFineTuning(char *getbuf) @@ -619,7 +636,7 @@ static int Uart_4G_RecvDeal_CheckStatus_GimbalFineTuning(char *getbuf)
619 //获取帧的序列号 636 //获取帧的序列号
620 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 637 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
621 638
622 - JZsdk_Uart_CheckStatus_GimbalFineTuning(UART_DEV_1, FrameSequence); 639 + JZsdk_Uart_CheckStatus_GimbalFineTuning(UART_4G, FrameSequence);
623 } 640 }
624 641
625 /********* 642 /*********
@@ -643,10 +660,10 @@ static int Uart_4G_RecvDeal_CheckStatus_PLayFileName(char *getbuf) @@ -643,10 +660,10 @@ static int Uart_4G_RecvDeal_CheckStatus_PLayFileName(char *getbuf)
643 JZSDK_LOG_INFO("当前播放的是%s %d\n",MusicName, MusicName_Len); 660 JZSDK_LOG_INFO("当前播放的是%s %d\n",MusicName, MusicName_Len);
644 661
645 //回复操作成功 662 //回复操作成功
646 - //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 663 + //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
647 664
648 //2、发送名字 665 //2、发送名字
649 - JZsdk_Uart_SendDeal_Reply_MusicName(UART_DEV_1, MusicName,MusicName_Len); 666 + JZsdk_Uart_SendDeal_Reply_MusicName(UART_4G, MusicName,MusicName_Len);
650 } 667 }
651 /********* 668 /*********
652 * 669 *
@@ -671,10 +688,10 @@ static int Uart_4G_RecvDeal_CheckStatus_SoftwareVersion(char *getbuf) @@ -671,10 +688,10 @@ static int Uart_4G_RecvDeal_CheckStatus_SoftwareVersion(char *getbuf)
671 JZSDK_LOG_INFO("当前的软件版本号为:%2x, %2x, %2x, %2x",majorVersion, minorVersion, modifyVersion, debugVersion); 688 JZSDK_LOG_INFO("当前的软件版本号为:%2x, %2x, %2x, %2x",majorVersion, minorVersion, modifyVersion, debugVersion);
672 689
673 //回复操作成功 690 //回复操作成功
674 - //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 691 + //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
675 692
676 //2、发送版本号 693 //2、发送版本号
677 - JZsdk_Uart_SendDeal_Reply_SoftVersion(UART_DEV_1, majorVersion, minorVersion, modifyVersion, debugVersion); 694 + JZsdk_Uart_SendDeal_Reply_SoftVersion(UART_4G, majorVersion, minorVersion, modifyVersion, debugVersion);
678 } 695 }
679 /********* 696 /*********
680 * 697 *
@@ -698,10 +715,10 @@ static int Uart_4G_RecvDeal_CheckStatus_LoopPlay(char *getbuf) @@ -698,10 +715,10 @@ static int Uart_4G_RecvDeal_CheckStatus_LoopPlay(char *getbuf)
698 } 715 }
699 716
700 //回复操作成功 717 //回复操作成功
701 - //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 718 + //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
702 719
703 //2、发送循环状态 720 //2、发送循环状态
704 - JZsdk_Uart_SendDeal_Reply_LoopPlayStatus(UART_DEV_1 ,LoopStatus); 721 + JZsdk_Uart_SendDeal_Reply_LoopPlayStatus(UART_4G ,LoopStatus);
705 } 722 }
706 /********* 723 /*********
707 * 724 *
@@ -725,10 +742,10 @@ static int Uart_4G_RecvDeal_CheckStatus_TTS_tone(char *getbuf) @@ -725,10 +742,10 @@ static int Uart_4G_RecvDeal_CheckStatus_TTS_tone(char *getbuf)
725 } 742 }
726 743
727 //回复操作成功 744 //回复操作成功
728 - //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 745 + //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
729 746
730 //2、发送音色 747 //2、发送音色
731 - JZsdk_Uart_SendDeal_Reply_TTS_tone(UART_DEV_1 ,TTS_tone); 748 + JZsdk_Uart_SendDeal_Reply_TTS_tone(UART_4G ,TTS_tone);
732 749
733 } 750 }
734 /********* 751 /*********
@@ -753,10 +770,10 @@ static int Uart_4G_RecvDeal_CheckStatus_TTS_speed(char *getbuf) @@ -753,10 +770,10 @@ static int Uart_4G_RecvDeal_CheckStatus_TTS_speed(char *getbuf)
753 } 770 }
754 771
755 //回复操作成功 772 //回复操作成功
756 - //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 773 + //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
757 774
758 //2、发送语速 775 //2、发送语速
759 - JZsdk_Uart_SendDeal_Reply_TTS_speed(UART_DEV_1 ,TTS_speed); 776 + JZsdk_Uart_SendDeal_Reply_TTS_speed(UART_4G ,TTS_speed);
760 777
761 } 778 }
762 779
@@ -784,10 +801,10 @@ static int Uart_4G_RecvDeal_PlayLoop(char *getbuf) @@ -784,10 +801,10 @@ static int Uart_4G_RecvDeal_PlayLoop(char *getbuf)
784 mode = JZ_FLAGCODE_OFF; 801 mode = JZ_FLAGCODE_OFF;
785 } 802 }
786 803
787 - JZsdk_Uart_audio_PlayLoop(UART_DEV_1, mode); 804 + JZsdk_Uart_audio_PlayLoop(UART_4G, mode);
788 805
789 //回复操作成功 806 //回复操作成功
790 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 807 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
791 } 808 }
792 809
793 810
@@ -822,7 +839,7 @@ static int Uart_4G_RecvDeal_Delete_Audio(char *getbuf) @@ -822,7 +839,7 @@ static int Uart_4G_RecvDeal_Delete_Audio(char *getbuf)
822 JZsdk_Uart_Flush_MusicList(); 839 JZsdk_Uart_Flush_MusicList();
823 840
824 //回复操作成功 841 //回复操作成功
825 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 842 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
826 } 843 }
827 /********* 844 /*********
828 * 845 *
@@ -855,7 +872,7 @@ static int Uart_4G_RecvDeal_Delete_VoiceRecord(char *getbuf) @@ -855,7 +872,7 @@ static int Uart_4G_RecvDeal_Delete_VoiceRecord(char *getbuf)
855 JZsdk_Uart_Flush_MusicList(); 872 JZsdk_Uart_Flush_MusicList();
856 873
857 //回复操作成功 874 //回复操作成功
858 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 875 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
859 } 876 }
860 /********* 877 /*********
861 * 878 *
@@ -882,16 +899,16 @@ static int Uart_4G_RecvDeal_TTS_SetTone(char *getbuf) @@ -882,16 +899,16 @@ static int Uart_4G_RecvDeal_TTS_SetTone(char *getbuf)
882 int tone = (int)getbuf[9]; 899 int tone = (int)getbuf[9];
883 900
884 //2、设置音色 901 //2、设置音色
885 - T_JZsdkReturnCode ret = JZsdk_Uart_TTS_SetTone(UART_DEV_1, tone); 902 + T_JZsdkReturnCode ret = JZsdk_Uart_TTS_SetTone(UART_4G, tone);
886 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 903 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
887 { 904 {
888 //回复操作成功 905 //回复操作成功
889 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 906 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
890 } 907 }
891 else 908 else
892 { 909 {
893 //回复操作失败 910 //回复操作失败
894 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 911 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
895 } 912 }
896 } 913 }
897 /********* 914 /*********
@@ -914,21 +931,21 @@ static int Uart_4G_RecvDeal_TTS_SetSpeed(char *getbuf) @@ -914,21 +931,21 @@ static int Uart_4G_RecvDeal_TTS_SetSpeed(char *getbuf)
914 JZSDK_LOG_INFO("语速超出范围\n"); 931 JZSDK_LOG_INFO("语速超出范围\n");
915 932
916 //回复操作失败 933 //回复操作失败
917 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 934 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
918 return -1 ; 935 return -1 ;
919 } 936 }
920 937
921 //2、设置语速 938 //2、设置语速
922 - T_JZsdkReturnCode ret = JZsdk_Uart_TTS_SetSpeed(UART_DEV_1, speed); 939 + T_JZsdkReturnCode ret = JZsdk_Uart_TTS_SetSpeed(UART_4G, speed);
923 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 940 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
924 { 941 {
925 //回复操作成功 942 //回复操作成功
926 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 943 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
927 } 944 }
928 else 945 else
929 { 946 {
930 //回复操作失败 947 //回复操作失败
931 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 948 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
932 } 949 }
933 } 950 }
934 /********* 951 /*********
@@ -950,7 +967,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_TTS_Trans_start(char *getbuf) @@ -950,7 +967,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_TTS_Trans_start(char *getbuf)
950 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 967 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
951 { 968 {
952 //回复操作失败 969 //回复操作失败
953 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 970 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
954 JZSDK_LOG_ERROR("tts开始传输失败"); 971 JZSDK_LOG_ERROR("tts开始传输失败");
955 return ret; 972 return ret;
956 } 973 }
@@ -965,7 +982,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_TTS_Trans_start(char *getbuf) @@ -965,7 +982,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_TTS_Trans_start(char *getbuf)
965 JZsdk_Uart_RecvDeal_Set_UART_4G_ReceiveMode(JZ_INSCODE_5AFRAME_TTS_TRANS_UNLIMIT_TRANSMISSION); 982 JZsdk_Uart_RecvDeal_Set_UART_4G_ReceiveMode(JZ_INSCODE_5AFRAME_TTS_TRANS_UNLIMIT_TRANSMISSION);
966 983
967 //回复操作成功 984 //回复操作成功
968 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 985 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
969 } 986 }
970 /********* 987 /*********
971 * 988 *
@@ -1003,9 +1020,9 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_TTS_Trans_LimitTransmission(char *getd @@ -1003,9 +1020,9 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_TTS_Trans_LimitTransmission(char *getd
1003 1020
1004 //提取出数据 1021 //提取出数据
1005 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9; 1022 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9;
1006 - if (DataLen > 128) 1023 + if (DataLen > 400)
1007 { 1024 {
1008 - JZSDK_LOG_ERROR("tts定长帧,单帧数据长度超出128上限"); 1025 + JZSDK_LOG_ERROR("tts定长帧,单帧数据长度超出400上限");
1009 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1026 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1010 } 1027 }
1011 1028
@@ -1040,10 +1057,10 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_TTS_Trans_stop(char *getbuf) @@ -1040,10 +1057,10 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_TTS_Trans_stop(char *getbuf)
1040 JZSDK_LOG_INFO("未刷新文本,TTS播放%s",TTS_Recv_buffer); 1057 JZSDK_LOG_INFO("未刷新文本,TTS播放%s",TTS_Recv_buffer);
1041 1058
1042 //3、播放TTS 1059 //3、播放TTS
1043 - JZsdk_Uart_TTS_Play(UART_DEV_1, TTS_Recv_buffer, TTS_Recv_buffer_length); 1060 + JZsdk_Uart_TTS_Play(UART_4G, TTS_Recv_buffer, TTS_Recv_buffer_length);
1044 1061
1045 //回复操作成功 1062 //回复操作成功
1046 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1063 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
1047 1064
1048 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 1065 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
1049 } 1066 }
@@ -1055,10 +1072,10 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_TTS_Trans_stop(char *getbuf) @@ -1055,10 +1072,10 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_TTS_Trans_stop(char *getbuf)
1055 JZsdk_Uart_RecvDeal_Set_UART_4G_ReceiveMode(JZ_INSCODE_5AFRAME_TTS_TRANS_STOP); 1072 JZsdk_Uart_RecvDeal_Set_UART_4G_ReceiveMode(JZ_INSCODE_5AFRAME_TTS_TRANS_STOP);
1056 1073
1057 //3、播放TTS 1074 //3、播放TTS
1058 - JZsdk_Uart_TTS_Play(UART_DEV_1, TTS_Recv_buffer, TTS_Recv_buffer_length); 1075 + JZsdk_Uart_TTS_Play(UART_4G, TTS_Recv_buffer, TTS_Recv_buffer_length);
1059 1076
1060 //回复操作成功 1077 //回复操作成功
1061 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1078 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
1062 } 1079 }
1063 1080
1064 1081
@@ -1078,7 +1095,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_OpusTrans_start(char *getbuf) @@ -1078,7 +1095,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_OpusTrans_start(char *getbuf)
1078 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1095 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1079 { 1096 {
1080 //回复操作失败 1097 //回复操作失败
1081 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1098 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
1082 JZSDK_LOG_ERROR("打开opus传输失败"); 1099 JZSDK_LOG_ERROR("打开opus传输失败");
1083 return ret; 1100 return ret;
1084 } 1101 }
@@ -1099,7 +1116,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_OpusTrans_start(char *getbuf) @@ -1099,7 +1116,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_OpusTrans_start(char *getbuf)
1099 JZSDK_LOG_INFO("已完成打开opus传输处理\n"); 1116 JZSDK_LOG_INFO("已完成打开opus传输处理\n");
1100 1117
1101 //回复操作成功 1118 //回复操作成功
1102 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1119 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
1103 } 1120 }
1104 /********* 1121 /*********
1105 * 1122 *
@@ -1128,9 +1145,9 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_OpusTrans_LimitTransmission(char *getd @@ -1128,9 +1145,9 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_OpusTrans_LimitTransmission(char *getd
1128 1145
1129 //提取出数据 1146 //提取出数据
1130 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9; 1147 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9;
1131 - if (DataLen > 128) 1148 + if (DataLen > 400)
1132 { 1149 {
1133 - JZSDK_LOG_ERROR("传输得到的opus定长音频文件帧长度超出128上限"); 1150 + JZSDK_LOG_ERROR("传输得到的opus定长音频文件帧长度超出400上限");
1134 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1151 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1135 } 1152 }
1136 1153
@@ -1154,7 +1171,7 @@ static int Uart_4G_RecvDeal_OpusTrans_stop(char *getbuf) @@ -1154,7 +1171,7 @@ static int Uart_4G_RecvDeal_OpusTrans_stop(char *getbuf)
1154 if (UART_4G_Receive_mode != JZ_INSCODE_5AFRAME_OPUS_TRAN_UNLIMIT_TRANSMISSION) 1171 if (UART_4G_Receive_mode != JZ_INSCODE_5AFRAME_OPUS_TRAN_UNLIMIT_TRANSMISSION)
1155 { 1172 {
1156 //回复操作失败 1173 //回复操作失败
1157 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1174 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
1158 JZSDK_LOG_ERROR("关闭opus结束传输失败,opus结束传输未开始,无法关闭"); 1175 JZSDK_LOG_ERROR("关闭opus结束传输失败,opus结束传输未开始,无法关闭");
1159 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1176 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1160 } 1177 }
@@ -1167,7 +1184,7 @@ static int Uart_4G_RecvDeal_OpusTrans_stop(char *getbuf) @@ -1167,7 +1184,7 @@ static int Uart_4G_RecvDeal_OpusTrans_stop(char *getbuf)
1167 JZSDK_LOG_INFO("结束opus传输处理\n"); 1184 JZSDK_LOG_INFO("结束opus传输处理\n");
1168 1185
1169 //回复操作成功 1186 //回复操作成功
1170 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1187 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
1171 } 1188 }
1172 /********* 1189 /*********
1173 * 1190 *
@@ -1185,15 +1202,15 @@ static int Uart_4G_RecvDeal_OpusPlay(char *getbuf) @@ -1185,15 +1202,15 @@ static int Uart_4G_RecvDeal_OpusPlay(char *getbuf)
1185 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1202 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1186 { 1203 {
1187 //回复操作失败 1204 //回复操作失败
1188 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1205 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
1189 JZSDK_LOG_ERROR("opus播放失败,存在传输模式打开中"); 1206 JZSDK_LOG_ERROR("opus播放失败,存在传输模式打开中");
1190 return ret; 1207 return ret;
1191 } 1208 }
1192 1209
1193 - JZsdk_Uart_Opus_PlayFixedFile(UART_DEV_1); 1210 + JZsdk_Uart_Opus_PlayFixedFile(UART_4G);
1194 1211
1195 //回复操作成功 1212 //回复操作成功
1196 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1213 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
1197 } 1214 }
1198 1215
1199 1216
@@ -1214,7 +1231,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_Opus_RealTimeVoice_start(char *getbuf) @@ -1214,7 +1231,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_Opus_RealTimeVoice_start(char *getbuf)
1214 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1231 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1215 { 1232 {
1216 //回复操作失败 1233 //回复操作失败
1217 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1234 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
1218 JZSDK_LOG_ERROR("开启opus实时喊话失败"); 1235 JZSDK_LOG_ERROR("开启opus实时喊话失败");
1219 return ret; 1236 return ret;
1220 } 1237 }
@@ -1239,7 +1256,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_Opus_RealTimeVoice_start(char *getbuf) @@ -1239,7 +1256,7 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_Opus_RealTimeVoice_start(char *getbuf)
1239 JZsdk_Uart_RealTimeVoiceStart(Rate); 1256 JZsdk_Uart_RealTimeVoiceStart(Rate);
1240 1257
1241 //4、通知成功打开语音发送模式 1258 //4、通知成功打开语音发送模式
1242 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1259 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
1243 } 1260 }
1244 1261
1245 /********* 1262 /*********
@@ -1252,7 +1269,6 @@ static int Uart_4G_RecvDeal_Opus_RealTimeVoice_UnlimitTransmission(char *getdata @@ -1252,7 +1269,6 @@ static int Uart_4G_RecvDeal_Opus_RealTimeVoice_UnlimitTransmission(char *getdata
1252 { 1269 {
1253 JZSDK_LOG_INFO("opus语音传输中\n"); 1270 JZSDK_LOG_INFO("opus语音传输中\n");
1254 JZsdk_Uart_RealTimeVoiceTrans(getdata, len); 1271 JZsdk_Uart_RealTimeVoiceTrans(getdata, len);
1255 -  
1256 } 1272 }
1257 1273
1258 /********* 1274 /*********
@@ -1269,9 +1285,9 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_Opus_RealTimeVoice_LimitTransmission(c @@ -1269,9 +1285,9 @@ static T_JZsdkReturnCode Uart_4G_RecvDeal_Opus_RealTimeVoice_LimitTransmission(c
1269 1285
1270 //提取出数据 1286 //提取出数据
1271 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9; 1287 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9;
1272 - if (DataLen > 80) 1288 + if (DataLen > 400)
1273 { 1289 {
1274 - JZSDK_LOG_ERROR("opus实时语音定长传输帧数据长度超出80上限"); 1290 + JZSDK_LOG_ERROR("opus实时语音定长传输帧数据长度超出400上限");
1275 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1291 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1276 } 1292 }
1277 1293
@@ -1295,7 +1311,7 @@ static int Uart_4G_RecvDeal_Opus_RealTimeVoice_stop(char *getbuf) @@ -1295,7 +1311,7 @@ static int Uart_4G_RecvDeal_Opus_RealTimeVoice_stop(char *getbuf)
1295 if (UART_4G_Receive_mode != JZ_INSCODE_5AFRAME_OPUS_REALTIMEVOICE_UNLIMIT_TRANSMISSION) 1311 if (UART_4G_Receive_mode != JZ_INSCODE_5AFRAME_OPUS_REALTIMEVOICE_UNLIMIT_TRANSMISSION)
1296 { 1312 {
1297 //回复操作失败 1313 //回复操作失败
1298 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1314 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
1299 JZSDK_LOG_ERROR("关闭opus实时语音发送功能失败,opus实时语音发送功能未开始,无法关闭"); 1315 JZSDK_LOG_ERROR("关闭opus实时语音发送功能失败,opus实时语音发送功能未开始,无法关闭");
1300 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1316 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1301 } 1317 }
@@ -1307,7 +1323,7 @@ static int Uart_4G_RecvDeal_Opus_RealTimeVoice_stop(char *getbuf) @@ -1307,7 +1323,7 @@ static int Uart_4G_RecvDeal_Opus_RealTimeVoice_stop(char *getbuf)
1307 JZsdk_Uart_RealTimeVoiceClose(); 1323 JZsdk_Uart_RealTimeVoiceClose();
1308 1324
1309 //3、通知成功关闭语音发送模式 1325 //3、通知成功关闭语音发送模式
1310 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1326 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
1311 } 1327 }
1312 1328
1313 1329
@@ -1349,22 +1365,22 @@ static int Uart_4G_RecvDeal_Gimbal_PitchControl(char *getbuf) @@ -1349,22 +1365,22 @@ static int Uart_4G_RecvDeal_Gimbal_PitchControl(char *getbuf)
1349 { 1365 {
1350 JZSDK_LOG_INFO("云台输入角度符号错误，无法正常控制"); 1366 JZSDK_LOG_INFO("云台输入角度符号错误，无法正常控制");
1351 //回复操作失败 1367 //回复操作失败
1352 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1368 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
1353 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1369 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1354 } 1370 }
1355 1371
1356 JZSDK_LOG_INFO("处理得到的角度是%d",Gimbal_angle); 1372 JZSDK_LOG_INFO("处理得到的角度是%d",Gimbal_angle);
1357 1373
1358 - T_JZsdkReturnCode ret = JZsdk_Uart_Gimbal_PitchControl(UART_DEV_1, Gimbal_angle); 1374 + T_JZsdkReturnCode ret = JZsdk_Uart_Gimbal_PitchControl(UART_4G, Gimbal_angle);
1359 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1375 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1360 { 1376 {
1361 //回复操作成功 1377 //回复操作成功
1362 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1378 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
1363 } 1379 }
1364 else 1380 else
1365 { 1381 {
1366 //回复操作失败 1382 //回复操作失败
1367 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1383 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
1368 } 1384 }
1369 } 1385 }
1370 1386
@@ -1399,13 +1415,13 @@ static int Uart_4G_RecvDeal_Gimbal_PitchFineTuningControl(char *getbuf) @@ -1399,13 +1415,13 @@ static int Uart_4G_RecvDeal_Gimbal_PitchFineTuningControl(char *getbuf)
1399 { 1415 {
1400 JZSDK_LOG_INFO("云台俯仰微调角度符号错误，无法正常控制"); 1416 JZSDK_LOG_INFO("云台俯仰微调角度符号错误，无法正常控制");
1401 //回复操作失败 1417 //回复操作失败
1402 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1418 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
1403 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1419 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1404 } 1420 }
1405 1421
1406 JZSDK_LOG_INFO("处理得到云台俯仰微调角度是%d",Gimbal_angle); 1422 JZSDK_LOG_INFO("处理得到云台俯仰微调角度是%d",Gimbal_angle);
1407 1423
1408 - JZsdk_Uart_Gimbal_PitchFineTuningControl(UART_DEV_1, FrameSequence ,Gimbal_angle); 1424 + JZsdk_Uart_Gimbal_PitchFineTuningControl(UART_4G, FrameSequence ,Gimbal_angle);
1409 1425
1410 } 1426 }
1411 1427
@@ -1431,16 +1447,16 @@ static int Uart_4G_RecvDeal_SearchLight_SetFrequency(char *getbuf) @@ -1431,16 +1447,16 @@ static int Uart_4G_RecvDeal_SearchLight_SetFrequency(char *getbuf)
1431 //1、通过数据帧2，获取爆闪频率 1447 //1、通过数据帧2，获取爆闪频率
1432 int Frequency = getbuf[10]; 1448 int Frequency = getbuf[10];
1433 1449
1434 - T_JZsdkReturnCode ret = JZsdk_Uart_Lighting_SetSearchLightFrequency(UART_DEV_1, Frequency); 1450 + T_JZsdkReturnCode ret = JZsdk_Uart_Lighting_SetSearchLightFrequency(UART_4G, Frequency);
1435 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1451 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1436 { 1452 {
1437 //回复操作成功 1453 //回复操作成功
1438 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1454 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
1439 } 1455 }
1440 else 1456 else
1441 { 1457 {
1442 //回复操作失败 1458 //回复操作失败
1443 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1459 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
1444 } 1460 }
1445 } 1461 }
1446 1462
@@ -1458,16 +1474,16 @@ static int Uart_4G_RecvDeal_SearchLight_Control(char *getbuf) @@ -1458,16 +1474,16 @@ static int Uart_4G_RecvDeal_SearchLight_Control(char *getbuf)
1458 //1、通过数据帧2，获取灯光控制模式 1474 //1、通过数据帧2，获取灯光控制模式
1459 int value = getbuf[10]; 1475 int value = getbuf[10];
1460 1476
1461 - T_JZsdkReturnCode ret = JZsdk_Uart_SearchLight_Control(UART_DEV_1, value); 1477 + T_JZsdkReturnCode ret = JZsdk_Uart_SearchLight_Control(UART_4G, value);
1462 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1478 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1463 { 1479 {
1464 //回复操作成功 1480 //回复操作成功
1465 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1481 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
1466 } 1482 }
1467 else 1483 else
1468 { 1484 {
1469 //回复操作失败 1485 //回复操作失败
1470 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1486 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
1471 } 1487 }
1472 } 1488 }
1473 1489
@@ -1486,16 +1502,16 @@ static int Uart_4G_RecvDeal_SearchLight_Lumen(char *getbuf) @@ -1486,16 +1502,16 @@ static int Uart_4G_RecvDeal_SearchLight_Lumen(char *getbuf)
1486 int LeftLumen = getbuf[9]; //左灯亮度 1502 int LeftLumen = getbuf[9]; //左灯亮度
1487 int RightLumen = getbuf[10]; //右灯亮度 1503 int RightLumen = getbuf[10]; //右灯亮度
1488 1504
1489 - T_JZsdkReturnCode ret = JZsdk_Uart_SearchLight_Lumen(UART_DEV_1, LeftLumen, RightLumen); 1505 + T_JZsdkReturnCode ret = JZsdk_Uart_SearchLight_Lumen(UART_4G, LeftLumen, RightLumen);
1490 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1506 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1491 { 1507 {
1492 //回复操作成功 1508 //回复操作成功
1493 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1509 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
1494 } 1510 }
1495 else 1511 else
1496 { 1512 {
1497 //回复操作失败 1513 //回复操作失败
1498 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1514 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
1499 } 1515 }
1500 } 1516 }
1501 1517
@@ -1511,7 +1527,7 @@ static int Uart_4G_RecvDeal_CheckStatus_SearchLightLightAttribute(char *getbuf) @@ -1511,7 +1527,7 @@ static int Uart_4G_RecvDeal_CheckStatus_SearchLightLightAttribute(char *getbuf)
1511 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 1527 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
1512 1528
1513 //2、查询灯光属性 1529 //2、查询灯光属性
1514 - T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_SearchLightLightAttribute(UART_DEV_1, FrameSequence); 1530 + T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_SearchLightLightAttribute(UART_4G, FrameSequence);
1515 1531
1516 } 1532 }
1517 1533
@@ -1527,7 +1543,7 @@ static int Uart_4G_RecvDeal_CheckStatus_SearchLightTemperture(char *getbuf) @@ -1527,7 +1543,7 @@ static int Uart_4G_RecvDeal_CheckStatus_SearchLightTemperture(char *getbuf)
1527 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 1543 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
1528 1544
1529 //2、查询探照灯温度 1545 //2、查询探照灯温度
1530 - T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_SearchLightTemperture(UART_DEV_1, FrameSequence); 1546 + T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_SearchLightTemperture(UART_4G, FrameSequence);
1531 } 1547 }
1532 1548
1533 /********* 1549 /*********
@@ -1544,16 +1560,16 @@ static int Uart_4G_RecvDeal_SearchLight_SubscriptionControl(char *getbuf) @@ -1544,16 +1560,16 @@ static int Uart_4G_RecvDeal_SearchLight_SubscriptionControl(char *getbuf)
1544 //1、通过数据帧2，获取控制值 1560 //1、通过数据帧2，获取控制值
1545 int value = getbuf[10]; 1561 int value = getbuf[10];
1546 1562
1547 - T_JZsdkReturnCode ret = JZsdk_Uart_SearchLight_SubscriptionControl(UART_DEV_1, value); 1563 + T_JZsdkReturnCode ret = JZsdk_Uart_SearchLight_SubscriptionControl(UART_4G, value);
1548 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1564 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1549 { 1565 {
1550 //回复操作成功 1566 //回复操作成功
1551 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1567 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
1552 } 1568 }
1553 else 1569 else
1554 { 1570 {
1555 //回复操作失败 1571 //回复操作失败
1556 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1572 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
1557 } 1573 }
1558 } 1574 }
1559 1575
@@ -1568,7 +1584,7 @@ static int Uart_4G_RecvDeal_CheckStatus_SerialNumber(char *getbuf) @@ -1568,7 +1584,7 @@ static int Uart_4G_RecvDeal_CheckStatus_SerialNumber(char *getbuf)
1568 //获取帧的序列号 1584 //获取帧的序列号
1569 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 1585 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
1570 1586
1571 - JZsdk_Uart_CheckStatus_SerialNumber(UART_DEV_1, FrameSequence); 1587 + JZsdk_Uart_CheckStatus_SerialNumber(UART_4G, FrameSequence);
1572 1588
1573 } 1589 }
1574 1590
@@ -1587,7 +1603,7 @@ static int Uart_4G_RecvDeal_OutPutPower_Control(char *getbuf) @@ -1587,7 +1603,7 @@ static int Uart_4G_RecvDeal_OutPutPower_Control(char *getbuf)
1587 int Value = getbuf[9]; 1603 int Value = getbuf[9];
1588 1604
1589 //控制 1605 //控制
1590 - JZsdk_Uart_OutPutPower_Control(UART_DEV_1, FrameSequence, Value); 1606 + JZsdk_Uart_OutPutPower_Control(UART_4G, FrameSequence, Value);
1591 } 1607 }
1592 1608
1593 /********* 1609 /*********
@@ -1603,7 +1619,7 @@ static int Uart_4G_RecvDeal_Checkstatus_OutPutPower(char *getbuf) @@ -1603,7 +1619,7 @@ static int Uart_4G_RecvDeal_Checkstatus_OutPutPower(char *getbuf)
1603 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 1619 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
1604 1620
1605 //获取本地数值 1621 //获取本地数值
1606 - JZsdk_Uart_Checkstatus_OutPutPower(UART_DEV_1, FrameSequence); 1622 + JZsdk_Uart_Checkstatus_OutPutPower(UART_4G, FrameSequence);
1607 } 1623 }
1608 1624
1609 /******************************************************************************************************************************* 1625 /*******************************************************************************************************************************
@@ -1626,16 +1642,16 @@ static int Uart_4G_RecvDeal_WarningLight_ModeControl(char *getbuf) @@ -1626,16 +1642,16 @@ static int Uart_4G_RecvDeal_WarningLight_ModeControl(char *getbuf)
1626 int value1 = getbuf[9]; 1642 int value1 = getbuf[9];
1627 int value2 = getbuf[10]; 1643 int value2 = getbuf[10];
1628 1644
1629 - T_JZsdkReturnCode ret = JZsdk_Uart_WarningLight_ModeControl(UART_DEV_1, value1, value2); 1645 + T_JZsdkReturnCode ret = JZsdk_Uart_WarningLight_ModeControl(UART_4G, value1, value2);
1630 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1646 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1631 { 1647 {
1632 //回复操作成功 1648 //回复操作成功
1633 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1649 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
1634 } 1650 }
1635 else 1651 else
1636 { 1652 {
1637 //回复操作失败 1653 //回复操作失败
1638 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1654 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
1639 } 1655 }
1640 } 1656 }
1641 1657
@@ -1654,16 +1670,16 @@ static int Uart_4G_RecvDeal_WarningLight_SetColor(char *getbuf) @@ -1654,16 +1670,16 @@ static int Uart_4G_RecvDeal_WarningLight_SetColor(char *getbuf)
1654 int value1 = getbuf[9]; 1670 int value1 = getbuf[9];
1655 int value2 = getbuf[10]; 1671 int value2 = getbuf[10];
1656 1672
1657 - T_JZsdkReturnCode ret = JZsdk_Uart_WarningLight_SetColor(UART_DEV_1, value1, value2); 1673 + T_JZsdkReturnCode ret = JZsdk_Uart_WarningLight_SetColor(UART_4G, value1, value2);
1658 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1674 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1659 { 1675 {
1660 //回复操作成功 1676 //回复操作成功
1661 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1677 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
1662 } 1678 }
1663 else 1679 else
1664 { 1680 {
1665 //回复操作失败 1681 //回复操作失败
1666 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1682 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
1667 } 1683 }
1668 } 1684 }
1669 1685
@@ -1679,7 +1695,7 @@ static int Uart_4G_RecvDeal_CheckStatus_WarningLightStatus(char *getbuf) @@ -1679,7 +1695,7 @@ static int Uart_4G_RecvDeal_CheckStatus_WarningLightStatus(char *getbuf)
1679 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 1695 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
1680 1696
1681 //2、查询灯光属性 1697 //2、查询灯光属性
1682 - T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_WarningLightStatus(UART_DEV_1, FrameSequence); 1698 + T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_WarningLightStatus(UART_4G, FrameSequence);
1683 } 1699 }
1684 1700
1685 1701
@@ -1695,7 +1711,7 @@ static int Uart_4G_RecvDeal_CheckStatus_WarningLightColor(char *getbuf) @@ -1695,7 +1711,7 @@ static int Uart_4G_RecvDeal_CheckStatus_WarningLightColor(char *getbuf)
1695 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 1711 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
1696 1712
1697 //2、查询灯光属性 1713 //2、查询灯光属性
1698 - T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_WarningLightColor(UART_DEV_1, FrameSequence); 1714 + T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_WarningLightColor(UART_4G, FrameSequence);
1699 } 1715 }
1700 1716
1701 /******************************************************************************************************** 1717 /********************************************************************************************************
@@ -1737,7 +1753,7 @@ static int Uart_4G_RecvDeal_ObtainSearchLight_Frequency(char *getbuf) @@ -1737,7 +1753,7 @@ static int Uart_4G_RecvDeal_ObtainSearchLight_Frequency(char *getbuf)
1737 int value = getbuf[10]; 1753 int value = getbuf[10];
1738 1754
1739 //2、发送到本地处理 1755 //2、发送到本地处理
1740 - JZsdl_Uart_ObtainSearchLight_Frequency(UART_DEV_1, value); 1756 + JZsdl_Uart_ObtainSearchLight_Frequency(UART_4G, value);
1741 } 1757 }
1742 1758
1743 /********* 1759 /*********
@@ -1755,7 +1771,7 @@ static int Uart_4G_RecvDeal_ObtainSearchLight_Mode(char *getbuf) @@ -1755,7 +1771,7 @@ static int Uart_4G_RecvDeal_ObtainSearchLight_Mode(char *getbuf)
1755 int value = getbuf[10]; 1771 int value = getbuf[10];
1756 1772
1757 //2、发送到本地处理 1773 //2、发送到本地处理
1758 - JZsdl_Uart_ObtainSearchLight_Mode(UART_DEV_1, value); 1774 + JZsdl_Uart_ObtainSearchLight_Mode(UART_4G, value);
1759 } 1775 }
1760 1776
1761 /********* 1777 /*********
@@ -1774,7 +1790,7 @@ static int Uart_4G_RecvDeal_ObtainSearchLight_Lumen(char *getbuf) @@ -1774,7 +1790,7 @@ static int Uart_4G_RecvDeal_ObtainSearchLight_Lumen(char *getbuf)
1774 int value2 = getbuf[10]; 1790 int value2 = getbuf[10];
1775 1791
1776 //2、发送到本地处理 1792 //2、发送到本地处理
1777 - JZsdl_Uart_ObtainSearchLight_Lumen(UART_DEV_1, value1, value2); 1793 + JZsdl_Uart_ObtainSearchLight_Lumen(UART_4G, value1, value2);
1778 } 1794 }
1779 1795
1780 /********* 1796 /*********
@@ -1793,7 +1809,7 @@ static int Uart_4G_RecvDeal_ObtainSearchLight_Temperature(char *getbuf) @@ -1793,7 +1809,7 @@ static int Uart_4G_RecvDeal_ObtainSearchLight_Temperature(char *getbuf)
1793 int value2 = getbuf[10]; 1809 int value2 = getbuf[10];
1794 1810
1795 //2、发送到本地处理 1811 //2、发送到本地处理
1796 - JZsdl_Uart_ObtainSearchLight_Temperature(UART_DEV_1, value1, value2); 1812 + JZsdl_Uart_ObtainSearchLight_Temperature(UART_4G, value1, value2);
1797 } 1813 }
1798 1814
1799 /********* 1815 /*********
@@ -1824,7 +1840,7 @@ static int Uart_4G_RecvDeal_ObtainGimbal_Pitch(char *getbuf) @@ -1824,7 +1840,7 @@ static int Uart_4G_RecvDeal_ObtainGimbal_Pitch(char *getbuf)
1824 } 1840 }
1825 1841
1826 //2、发送到本地处理 1842 //2、发送到本地处理
1827 - JZsdl_Uart_RecvDeal_ObtainGimbal_Pitch(UART_DEV_1, Gimbal_angle); 1843 + JZsdl_Uart_RecvDeal_ObtainGimbal_Pitch(UART_4G, Gimbal_angle);
1828 } 1844 }
1829 1845
1830 /********* 1846 /*********
@@ -1855,7 +1871,7 @@ static int Uart_4G_RecvDeal_ObtainGimbal_Yaw(char *getbuf) @@ -1855,7 +1871,7 @@ static int Uart_4G_RecvDeal_ObtainGimbal_Yaw(char *getbuf)
1855 } 1871 }
1856 1872
1857 //2、发送到本地处理 1873 //2、发送到本地处理
1858 - JZsdl_Uart_RecvDeal_ObtainGimbal_Yaw(UART_DEV_1, Gimbal_angle); 1874 + JZsdl_Uart_RecvDeal_ObtainGimbal_Yaw(UART_4G, Gimbal_angle);
1859 } 1875 }
1860 1876
1861 /********* 1877 /*********
@@ -1884,7 +1900,7 @@ static int Uart_4G_RecvDeal_ObtainGimbalPitchFineTuning(char *getbuf) @@ -1884,7 +1900,7 @@ static int Uart_4G_RecvDeal_ObtainGimbalPitchFineTuning(char *getbuf)
1884 pitch = -pitch; 1900 pitch = -pitch;
1885 } 1901 }
1886 1902
1887 - JZsdl_Uart_ObtainGimbalPitchFineTuning(UART_DEV_1, FrameSequence, pitch); 1903 + JZsdl_Uart_ObtainGimbalPitchFineTuning(UART_4G, FrameSequence, pitch);
1888 } 1904 }
1889 1905
1890 /********* 1906 /*********
@@ -1903,7 +1919,7 @@ static int Uart_4G_RecvDeal_ObtainWaringlight_Status(char *getbuf) @@ -1903,7 +1919,7 @@ static int Uart_4G_RecvDeal_ObtainWaringlight_Status(char *getbuf)
1903 int value2 = getbuf[10]; 1919 int value2 = getbuf[10];
1904 1920
1905 //2、发送到本地处理 1921 //2、发送到本地处理
1906 - JZsdl_Uart_RecvDeal_ObtainWaringlight_Status(UART_DEV_1, value1, value2); 1922 + JZsdl_Uart_RecvDeal_ObtainWaringlight_Status(UART_4G, value1, value2);
1907 } 1923 }
1908 1924
1909 /********* 1925 /*********
@@ -1922,7 +1938,7 @@ static int Uart_4G_RecvDeal_ObtainWaringlight_Color(char *getbuf) @@ -1922,7 +1938,7 @@ static int Uart_4G_RecvDeal_ObtainWaringlight_Color(char *getbuf)
1922 int value2 = getbuf[10]; 1938 int value2 = getbuf[10];
1923 1939
1924 //2、发送到本地处理 1940 //2、发送到本地处理
1925 - JZsdl_Uart_RecvDeal_ObtainWaringlight_Color(UART_DEV_1, value1, value2); 1941 + JZsdl_Uart_RecvDeal_ObtainWaringlight_Color(UART_4G, value1, value2);
1926 } 1942 }
1927 1943
1928 /********* 1944 /*********
@@ -1977,7 +1993,7 @@ static int Uart_4G_RecvDeal_QuerySecondaryDeviceName(char *getbuf) @@ -1977,7 +1993,7 @@ static int Uart_4G_RecvDeal_QuerySecondaryDeviceName(char *getbuf)
1977 int SecondaryName = JZsdk_Uart_GetSecondaryDeviceName(); 1993 int SecondaryName = JZsdk_Uart_GetSecondaryDeviceName();
1978 1994
1979 //3、回复当前从设备名 1995 //3、回复当前从设备名
1980 - JZsdk_Uart_SendDeal_Reply_SecondaryDeviceName(UART_DEV_1 ,SecondaryName, FrameSequence); 1996 + JZsdk_Uart_SendDeal_Reply_SecondaryDeviceName(UART_4G ,SecondaryName, FrameSequence);
1981 } 1997 }
1982 1998
1983 /******************************************************************************************************************************* 1999 /*******************************************************************************************************************************
@@ -1999,16 +2015,16 @@ static int Uart_4G_RecvDeal_SetGimbalRange(char *getbuf) @@ -1999,16 +2015,16 @@ static int Uart_4G_RecvDeal_SetGimbalRange(char *getbuf)
1999 //1、通过数据帧2，获取设置的大小值 2015 //1、通过数据帧2，获取设置的大小值
2000 int value = getbuf[10] ; 2016 int value = getbuf[10] ;
2001 2017
2002 - T_JZsdkReturnCode ret = JZsdk_Uart_SetGimbalRange(UART_DEV_1, value); 2018 + T_JZsdkReturnCode ret = JZsdk_Uart_SetGimbalRange(UART_4G, value);
2003 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 2019 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
2004 { 2020 {
2005 //回复操作成功 2021 //回复操作成功
2006 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 2022 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
2007 } 2023 }
2008 else 2024 else
2009 { 2025 {
2010 //回复操作失败 2026 //回复操作失败
2011 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 2027 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
2012 } 2028 }
2013 } 2029 }
2014 2030
@@ -2028,7 +2044,7 @@ static int Uart_4G_RecvDeal_GimbalLinkageControl(char *getbuf) @@ -2028,7 +2044,7 @@ static int Uart_4G_RecvDeal_GimbalLinkageControl(char *getbuf)
2028 int value = getbuf[10] ; 2044 int value = getbuf[10] ;
2029 2045
2030 //2、设置 2046 //2、设置
2031 - JZsdk_Uart_GimbalLinkageControl(UART_DEV_1, FrameSequence, value); 2047 + JZsdk_Uart_GimbalLinkageControl(UART_4G, FrameSequence, value);
2032 2048
2033 } 2049 }
2034 2050
@@ -2045,7 +2061,7 @@ static int Uart_4G_RecvDeal_Checkstatus_GimbalLinkage(char *getbuf) @@ -2045,7 +2061,7 @@ static int Uart_4G_RecvDeal_Checkstatus_GimbalLinkage(char *getbuf)
2045 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 2061 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
2046 2062
2047 //查询是否开启云台联动 2063 //查询是否开启云台联动
2048 - JZsdk_Uart_Checkstatus_GimbalLinkage(UART_DEV_1, FrameSequence); 2064 + JZsdk_Uart_Checkstatus_GimbalLinkage(UART_4G, FrameSequence);
2049 } 2065 }
2050 2066
2051 static int Uart_4G_RecvDeal_UartBitrateChange(char *getbuf) 2067 static int Uart_4G_RecvDeal_UartBitrateChange(char *getbuf)
@@ -2086,7 +2102,7 @@ static int Uart_4G_RecvDeal_UartBitrateChange(char *getbuf) @@ -2086,7 +2102,7 @@ static int Uart_4G_RecvDeal_UartBitrateChange(char *getbuf)
2086 break; 2102 break;
2087 } 2103 }
2088 2104
2089 - JZsdk_Uart_BitRateChange(UART_DEV_1, BitRate); 2105 + JZsdk_Uart_BitRateChange(UART_4G, BitRate);
2090 } 2106 }
2091 2107
2092 /******************************************************************************************************** 2108 /********************************************************************************************************
@@ -2125,12 +2141,12 @@ static int Uart_4G_RecvDeal_ObtainSecondaryDeviceName(char *getbuf) @@ -2125,12 +2141,12 @@ static int Uart_4G_RecvDeal_ObtainSecondaryDeviceName(char *getbuf)
2125 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 2141 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
2126 { 2142 {
2127 //回复操作成功 2143 //回复操作成功
2128 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 2144 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_4G, FrameSequence);
2129 } 2145 }
2130 else 2146 else
2131 { 2147 {
2132 //回复操作失败 2148 //回复操作失败
2133 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 2149 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, FrameSequence);
2134 } 2150 }
2135 } 2151 }
2136 2152
@@ -2154,7 +2170,7 @@ static int Uart_4G_RecvDeal_ObtainGimbalLinkage(char *getbuf) @@ -2154,7 +2170,7 @@ static int Uart_4G_RecvDeal_ObtainGimbalLinkage(char *getbuf)
2154 int value1 = getbuf[10]; 2170 int value1 = getbuf[10];
2155 2171
2156 //2、保存 2172 //2、保存
2157 - JZsdk_Uart_ObtainGimbalLinkage(UART_DEV_1,FrameSequence,value1); 2173 + JZsdk_Uart_ObtainGimbalLinkage(UART_4G,FrameSequence,value1);
2158 } 2174 }
2159 2175
2160 2176
@@ -2184,7 +2200,7 @@ static int Uart_4G_RecvDeal_FrameErrorReply(char *getbuf) @@ -2184,7 +2200,7 @@ static int Uart_4G_RecvDeal_FrameErrorReply(char *getbuf)
2184 JZSDK_LOG_ERROR("帧指令错误：帧错误或者是帧无对应操作\n"); 2200 JZSDK_LOG_ERROR("帧指令错误：帧错误或者是帧无对应操作\n");
2185 //无法正常获取帧的序列号 2201 //无法正常获取帧的序列号
2186 //回复操作失败 2202 //回复操作失败
2187 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, 0x00); 2203 + JZsdk_Uart_SendDeal_Reply_Failure(UART_4G, 0x00);
2188 2204
2189 } 2205 }
2190 2206
@@ -2224,7 +2240,7 @@ static int Uart_4G_RecvDeal_OperationFailed(char *getbuf) @@ -2224,7 +2240,7 @@ static int Uart_4G_RecvDeal_OperationFailed(char *getbuf)
2224 *********************************************************************************************************/ 2240 *********************************************************************************************************/
2225 int Uart_4G_RecvDeal_RecvDeal(int Receive_mode, unsigned char *getdata, int len) 2241 int Uart_4G_RecvDeal_RecvDeal(int Receive_mode, unsigned char *getdata, int len)
2226 { 2242 {
2227 - JZSDK_LOG_INFO("串口设备4g,接受到的模式为:%x",Receive_mode); 2243 + JZSDK_LOG_INFO("串口设备4G,接受到的模式为:%x",Receive_mode);
2228 switch (Receive_mode) 2244 switch (Receive_mode)
2229 { 2245 {
2230 /******************************************************************************************************************************* 2246 /*******************************************************************************************************************************
@@ -2238,6 +2254,12 @@ int Uart_4G_RecvDeal_RecvDeal(int Receive_mode, unsigned char *getdata, int len) @@ -2238,6 +2254,12 @@ int Uart_4G_RecvDeal_RecvDeal(int Receive_mode, unsigned char *getdata, int len)
2238 return 0; 2254 return 0;
2239 break; 2255 break;
2240 2256
  2257 + //电源状态设置
  2258 + case JZ_INSCODE_5AFRAME_FRAME_POWER_STATUS:
  2259 + Uart_4G_RecvDeal_PowerStatus(getdata);
  2260 + return 0;
  2261 + break;
  2262 +
2241 //开启语音 2263 //开启语音
2242 case JZ_INSCODE_5AFRAME_REALTIMEMP2_START: 2264 case JZ_INSCODE_5AFRAME_REALTIMEMP2_START:
2243 Uart_4G_RecvDeal_RealTimeMP2_start(getdata); 2265 Uart_4G_RecvDeal_RealTimeMP2_start(getdata);
@@ -2784,9 +2806,11 @@ int JZsdk_Uart_RecvDeal_CharmDeal_Uart_4G(unsigned char *getbuf, int len) @@ -2784,9 +2806,11 @@ int JZsdk_Uart_RecvDeal_CharmDeal_Uart_4G(unsigned char *getbuf, int len)
2784 { 2806 {
2785 Uart_4G_RecvDeal_RecvDeal(UART_4G_Receive_mode, getbuf, len); 2807 Uart_4G_RecvDeal_RecvDeal(UART_4G_Receive_mode, getbuf, len);
2786 } 2808 }
2787 -  
2788 - //否则直接丢弃  
2789 - return -1; 2809 + else
  2810 + {
  2811 + //否则直接丢弃
  2812 + Uart_4G_RecvDeal_RecvDeal(JZ_ERROR_SYSTEM_FRAME_ERROR, getbuf, len);
  2813 + }
2790 } 2814 }
2791 2815
2792 /******************* 2816 /*******************
@@ -2797,7 +2821,7 @@ int JZsdk_Uart_RecvDeal_CharmDeal_Uart_4G(unsigned char *getbuf, int len) @@ -2797,7 +2821,7 @@ int JZsdk_Uart_RecvDeal_CharmDeal_Uart_4G(unsigned char *getbuf, int len)
2797 * ****************/ 2821 * ****************/
2798 int JZsdk_Uart_RecvDeal_Set_UART_4G_ReceiveMode(int value) 2822 int JZsdk_Uart_RecvDeal_Set_UART_4G_ReceiveMode(int value)
2799 { 2823 {
2800 - JZSDK_LOG_INFO("串口设备4g,二次修改接收模式%x\n",value); 2824 + JZSDK_LOG_INFO("串口设备4G,二次修改接收模式%x\n",value);
2801 UART_4G_Receive_mode = value; 2825 UART_4G_Receive_mode = value;
2802 return 0; 2826 return 0;
2803 } 2827 }
@@ -55,6 +55,26 @@ static int Uart_DEV1_RecvDeal_AskForConnect(char *getbuf) @@ -55,6 +55,26 @@ static int Uart_DEV1_RecvDeal_AskForConnect(char *getbuf)
55 JZsdk_Uart_SetMainWorkMode(JZ_FLAGCODE_ON); 55 JZsdk_Uart_SetMainWorkMode(JZ_FLAGCODE_ON);
56 } 56 }
57 57
  58 +/*********
  59 + *
  60 + * 电源状态设置
  61 + *
  62 +**********/
  63 +static int Uart_DEV1_RecvDeal_PowerStatus(char *getbuf)
  64 +{
  65 + JZSDK_LOG_INFO("电源状态设置");
  66 + //获取帧的序列号
  67 + int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
  68 +
  69 + int status = getbuf[9];
  70 +
  71 + //回复操作成功
  72 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence);
  73 +
  74 + //1、电源状态设置
  75 + JZsdk_Uart_Set_PowerStatus(UART_DEV_1, status);
  76 +}
  77 +
58 /******************************************************************************************************************************* 78 /*******************************************************************************************************************************
59 * 79 *
60 * MP2实时喊话 80 * MP2实时喊话
@@ -134,13 +154,13 @@ static int Uart_DEV1_RecvDeal_RealTimeMP2_Unlimit_transmission(char *getdata, in @@ -134,13 +154,13 @@ static int Uart_DEV1_RecvDeal_RealTimeMP2_Unlimit_transmission(char *getdata, in
134 154
135 /********* 155 /*********
136 * 156 *
137 - * 语音MP2实时喊话有限传输中 157 + * 语音MP2实时喊话定长传输中
138 * 158 *
139 * 159 *
140 **********/ 160 **********/
141 static int Uart_DEV1_RecvDeal_RealTimeMP2_Limit_transmission(char *getdata, int len) 161 static int Uart_DEV1_RecvDeal_RealTimeMP2_Limit_transmission(char *getdata, int len)
142 { 162 {
143 - JZSDK_LOG_INFO("MP2实时喊话有限制传输中\n"); 163 + JZSDK_LOG_INFO("MP2实时喊话定长制传输中\n");
144 T_JZsdkReturnCode ret; 164 T_JZsdkReturnCode ret;
145 165
146 //提取出数据 166 //提取出数据
@@ -265,9 +285,9 @@ static T_JZsdkReturnCode Uart_DEV1_RecvDeal_SaveAudioFileTrans_LimitTransmission @@ -265,9 +285,9 @@ static T_JZsdkReturnCode Uart_DEV1_RecvDeal_SaveAudioFileTrans_LimitTransmission
265 285
266 //提取出数据 286 //提取出数据
267 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9; 287 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9;
268 - if (DataLen > 128) 288 + if (DataLen > 400)
269 { 289 {
270 - JZSDK_LOG_ERROR("传输得到的定长音频文帧长度超出128上限"); 290 + JZSDK_LOG_ERROR("传输得到的定长音频文帧长度超出400上限");
271 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 291 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
272 } 292 }
273 293
@@ -1003,9 +1023,9 @@ static T_JZsdkReturnCode Uart_DEV1_RecvDeal_TTS_Trans_LimitTransmission(char *ge @@ -1003,9 +1023,9 @@ static T_JZsdkReturnCode Uart_DEV1_RecvDeal_TTS_Trans_LimitTransmission(char *ge
1003 1023
1004 //提取出数据 1024 //提取出数据
1005 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9; 1025 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9;
1006 - if (DataLen > 128) 1026 + if (DataLen > 400)
1007 { 1027 {
1008 - JZSDK_LOG_ERROR("tts定长帧,单帧数据长度超出128上限"); 1028 + JZSDK_LOG_ERROR("tts定长帧,单帧数据长度超出400上限");
1009 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1029 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1010 } 1030 }
1011 1031
@@ -1101,6 +1121,7 @@ static T_JZsdkReturnCode Uart_DEV1_RecvDeal_OpusTrans_start(char *getbuf) @@ -1101,6 +1121,7 @@ static T_JZsdkReturnCode Uart_DEV1_RecvDeal_OpusTrans_start(char *getbuf)
1101 //回复操作成功 1121 //回复操作成功
1102 JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1122 JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence);
1103 } 1123 }
  1124 +
1104 /********* 1125 /*********
1105 * 1126 *
1106 * opus不定长传输 1127 * opus不定长传输
@@ -1252,7 +1273,6 @@ static int Uart_DEV1_RecvDeal_Opus_RealTimeVoice_UnlimitTransmission(char *getda @@ -1252,7 +1273,6 @@ static int Uart_DEV1_RecvDeal_Opus_RealTimeVoice_UnlimitTransmission(char *getda
1252 { 1273 {
1253 JZSDK_LOG_INFO("opus语音传输中\n"); 1274 JZSDK_LOG_INFO("opus语音传输中\n");
1254 JZsdk_Uart_RealTimeVoiceTrans(getdata, len); 1275 JZsdk_Uart_RealTimeVoiceTrans(getdata, len);
1255 -  
1256 } 1276 }
1257 1277
1258 /********* 1278 /*********
@@ -1269,9 +1289,9 @@ static T_JZsdkReturnCode Uart_DEV1_RecvDeal_Opus_RealTimeVoice_LimitTransmission @@ -1269,9 +1289,9 @@ static T_JZsdkReturnCode Uart_DEV1_RecvDeal_Opus_RealTimeVoice_LimitTransmission
1269 1289
1270 //提取出数据 1290 //提取出数据
1271 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9; 1291 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9;
1272 - if (DataLen > 80) 1292 + if (DataLen > 400)
1273 { 1293 {
1274 - JZSDK_LOG_ERROR("opus实时语音定长传输帧数据长度超出80上限"); 1294 + JZSDK_LOG_ERROR("opus实时语音定长传输帧数据长度超出400上限");
1275 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1295 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1276 } 1296 }
1277 1297
@@ -1716,6 +1736,18 @@ static int Uart_DEV1_RecvDeal_CheckStatus_WarningLightColor(char *getbuf) @@ -1716,6 +1736,18 @@ static int Uart_DEV1_RecvDeal_CheckStatus_WarningLightColor(char *getbuf)
1716 * 设备相关 1736 * 设备相关
1717 * 1737 *
1718 * *******************************************************************************************************************************/ 1738 * *******************************************************************************************************************************/
  1739 +static int Uart_DEV1_RecvDeal_ObtainConnectFrame(char *getbuf)
  1740 +{
  1741 + JZSDK_LOG_INFO("收到连接回复帧\n");
  1742 + //获取帧的序列号
  1743 + int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
  1744 +
  1745 + //1、通过数据帧2，获取值
  1746 + int value = getbuf[10];
  1747 +
  1748 + //2、发送到本地处理
  1749 + JZsdl_Uart_ObtainConnectFrame(getbuf, value);
  1750 +}
1719 1751
1720 /******************************************************************************************************************************* 1752 /*******************************************************************************************************************************
1721 * 1753 *
@@ -2238,6 +2270,12 @@ int Uart_DEV1_RecvDeal_RecvDeal(int Receive_mode, unsigned char *getdata, int le @@ -2238,6 +2270,12 @@ int Uart_DEV1_RecvDeal_RecvDeal(int Receive_mode, unsigned char *getdata, int le
2238 return 0; 2270 return 0;
2239 break; 2271 break;
2240 2272
  2273 + //电源状态设置
  2274 + case JZ_INSCODE_5AFRAME_FRAME_POWER_STATUS:
  2275 + Uart_DEV1_RecvDeal_PowerStatus(getdata);
  2276 + return 0;
  2277 + break;
  2278 +
2241 //开启语音 2279 //开启语音
2242 case JZ_INSCODE_5AFRAME_REALTIMEMP2_START: 2280 case JZ_INSCODE_5AFRAME_REALTIMEMP2_START:
2243 Uart_DEV1_RecvDeal_RealTimeMP2_start(getdata); 2281 Uart_DEV1_RecvDeal_RealTimeMP2_start(getdata);
@@ -2586,6 +2624,11 @@ int Uart_DEV1_RecvDeal_RecvDeal(int Receive_mode, unsigned char *getdata, int le @@ -2586,6 +2624,11 @@ int Uart_DEV1_RecvDeal_RecvDeal(int Receive_mode, unsigned char *getdata, int le
2586 * 5B类部分 2624 * 5B类部分
2587 * 2625 *
2588 * *******************************************************************************************************************************/ 2626 * *******************************************************************************************************************************/
  2627 + //收到连接回复帧
  2628 + case JZ_INSCODE_5BFRAME_INITIATECONNECT:
  2629 + Uart_DEV1_RecvDeal_ObtainConnectFrame(getdata);
  2630 + break;
  2631 +
2589 //回复灯光频率 2632 //回复灯光频率
2590 case JZ_INSCODE_5BFRAME_CHECKSTATUS_SEARCHLIGHT_FREQUENCY: 2633 case JZ_INSCODE_5BFRAME_CHECKSTATUS_SEARCHLIGHT_FREQUENCY:
2591 Uart_DEV1_RecvDeal_ObtainSearchLight_Frequency(getdata); 2634 Uart_DEV1_RecvDeal_ObtainSearchLight_Frequency(getdata);
@@ -2784,9 +2827,11 @@ int JZsdk_Uart_RecvDeal_CharmDeal_Uart_DEV1(unsigned char *getbuf, int len) @@ -2784,9 +2827,11 @@ int JZsdk_Uart_RecvDeal_CharmDeal_Uart_DEV1(unsigned char *getbuf, int len)
2784 { 2827 {
2785 Uart_DEV1_RecvDeal_RecvDeal(UART_DEV1_Receive_mode, getbuf, len); 2828 Uart_DEV1_RecvDeal_RecvDeal(UART_DEV1_Receive_mode, getbuf, len);
2786 } 2829 }
2787 -  
2788 - //否则直接丢弃  
2789 - return -1; 2830 + else
  2831 + {
  2832 + //否则直接丢弃
  2833 + Uart_DEV1_RecvDeal_RecvDeal(JZ_ERROR_SYSTEM_FRAME_ERROR, getbuf, len);
  2834 + }
2790 } 2835 }
2791 2836
2792 /******************* 2837 /*******************
@@ -41,7 +41,7 @@ static T_JZsdkReturnCode JZsdk_Uart_RecvDeal_UART_DEV2_TransmodeDecide(); @@ -41,7 +41,7 @@ static T_JZsdkReturnCode JZsdk_Uart_RecvDeal_UART_DEV2_TransmodeDecide();
41 **********/ 41 **********/
42 static int Uart_DEV2_RecvDeal_AskForConnect(char *getbuf) 42 static int Uart_DEV2_RecvDeal_AskForConnect(char *getbuf)
43 { 43 {
44 - JZSDK_LOG_INFO("串口设备4g,连接成功"); 44 + JZSDK_LOG_INFO("串口设备2号,连接成功");
45 //获取帧的序列号 45 //获取帧的序列号
46 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 46 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
47 47
@@ -49,10 +49,27 @@ static int Uart_DEV2_RecvDeal_AskForConnect(char *getbuf) @@ -49,10 +49,27 @@ static int Uart_DEV2_RecvDeal_AskForConnect(char *getbuf)
49 int Device_name = JZsdk_Uart_GetVersionReplay(); 49 int Device_name = JZsdk_Uart_GetVersionReplay();
50 50
51 //3、回复连接成功 51 //3、回复连接成功
52 - JZsdk_Uart_SendDeal_Send_Connect(UART_DEV_1, Device_name); 52 + JZsdk_Uart_SendDeal_Send_Connect(UART_DEV_2, Device_name);
  53 +}
  54 +
  55 +/*********
  56 + *
  57 + * 电源状态设置
  58 + *
  59 +**********/
  60 +static int Uart_DEV2_RecvDeal_PowerStatus(char *getbuf)
  61 +{
  62 + JZSDK_LOG_INFO("电源状态设置");
  63 + //获取帧的序列号
  64 + int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
  65 +
  66 + int status = getbuf[9];
  67 +
  68 + //回复操作成功
  69 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
53 70
54 - //1、将串口程序设置为连接模式  
55 - JZsdk_Uart_SetMainWorkMode(JZ_FLAGCODE_ON); 71 + //1、电源状态设置
  72 + JZsdk_Uart_Set_PowerStatus(UART_DEV_2, status);
56 } 73 }
57 74
58 /******************************************************************************************************************************* 75 /*******************************************************************************************************************************
@@ -79,7 +96,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_RealTimeMP2_start(char *getbuf) @@ -79,7 +96,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_RealTimeMP2_start(char *getbuf)
79 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 96 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
80 { 97 {
81 //回复操作失败 98 //回复操作失败
82 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 99 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
83 JZSDK_LOG_ERROR("开启MP2实时喊话功能失败\n"); 100 JZSDK_LOG_ERROR("开启MP2实时喊话功能失败\n");
84 101
85 return ret; 102 return ret;
@@ -106,12 +123,12 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_RealTimeMP2_start(char *getbuf) @@ -106,12 +123,12 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_RealTimeMP2_start(char *getbuf)
106 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 123 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
107 { 124 {
108 //4、回复操作成功 125 //4、回复操作成功
109 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 126 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
110 } 127 }
111 else 128 else
112 { 129 {
113 //4、回复操作失败 130 //4、回复操作失败
114 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 131 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
115 } 132 }
116 } 133 }
117 134
@@ -172,7 +189,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_RealTimeMP2_stop(char *getbuf) @@ -172,7 +189,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_RealTimeMP2_stop(char *getbuf)
172 if ((UART_DEV2_Receive_mode != JZ_INSCODE_5AFRAME_REALTIMEMP2_UNLIMIT_TRANSMISSION) ) 189 if ((UART_DEV2_Receive_mode != JZ_INSCODE_5AFRAME_REALTIMEMP2_UNLIMIT_TRANSMISSION) )
173 { 190 {
174 //回复操作失败 191 //回复操作失败
175 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 192 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
176 JZSDK_LOG_ERROR("操作失败,mp2传输未开始,无法关闭"); 193 JZSDK_LOG_ERROR("操作失败,mp2传输未开始,无法关闭");
177 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 194 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
178 } 195 }
@@ -186,12 +203,12 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_RealTimeMP2_stop(char *getbuf) @@ -186,12 +203,12 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_RealTimeMP2_stop(char *getbuf)
186 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 203 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
187 { 204 {
188 //4、回复操作成功 205 //4、回复操作成功
189 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 206 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
190 } 207 }
191 else 208 else
192 { 209 {
193 //4、回复操作失败 210 //4、回复操作失败
194 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 211 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
195 } 212 }
196 } 213 }
197 214
@@ -211,7 +228,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_SaveAudioFileTrans_start(char *getbu @@ -211,7 +228,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_SaveAudioFileTrans_start(char *getbu
211 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 228 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
212 { 229 {
213 //回复操作失败 230 //回复操作失败
214 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 231 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
215 JZSDK_LOG_ERROR("开始传输的音频文件保存失败"); 232 JZSDK_LOG_ERROR("开始传输的音频文件保存失败");
216 return ret; 233 return ret;
217 } 234 }
@@ -228,7 +245,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_SaveAudioFileTrans_start(char *getbu @@ -228,7 +245,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_SaveAudioFileTrans_start(char *getbu
228 ret = JZsdk_Uart_SaveAudioFileStart(FileName); 245 ret = JZsdk_Uart_SaveAudioFileStart(FileName);
229 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 246 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
230 { 247 {
231 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 248 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
232 return -1; 249 return -1;
233 } 250 }
234 251
@@ -236,7 +253,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_SaveAudioFileTrans_start(char *getbu @@ -236,7 +253,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_SaveAudioFileTrans_start(char *getbu
236 JZsdk_Uart_RecvDeal_Set_UART_DEV2_ReceiveMode(JZ_INSCODE_5AFRAME_AUDIOFILE_TRANS_UNLIMIT_TRANSMISSION); 253 JZsdk_Uart_RecvDeal_Set_UART_DEV2_ReceiveMode(JZ_INSCODE_5AFRAME_AUDIOFILE_TRANS_UNLIMIT_TRANSMISSION);
237 254
238 //4、回复操作成功 255 //4、回复操作成功
239 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 256 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
240 257
241 } 258 }
242 /********* 259 /*********
@@ -265,9 +282,9 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_SaveAudioFileTrans_LimitTransmission @@ -265,9 +282,9 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_SaveAudioFileTrans_LimitTransmission
265 282
266 //提取出数据 283 //提取出数据
267 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9; 284 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9;
268 - if (DataLen > 128) 285 + if (DataLen > 400)
269 { 286 {
270 - JZSDK_LOG_ERROR("传输得到的定长音频文帧长度超出128上限"); 287 + JZSDK_LOG_ERROR("传输得到的定长音频文帧长度超出400上限");
271 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 288 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
272 } 289 }
273 290
@@ -290,7 +307,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_SaveAudioFileTrans_stop(char *getbuf @@ -290,7 +307,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_SaveAudioFileTrans_stop(char *getbuf
290 if (UART_DEV2_Receive_mode != JZ_INSCODE_5AFRAME_AUDIOFILE_TRANS_UNLIMIT_TRANSMISSION) 307 if (UART_DEV2_Receive_mode != JZ_INSCODE_5AFRAME_AUDIOFILE_TRANS_UNLIMIT_TRANSMISSION)
291 { 308 {
292 //回复操作失败 309 //回复操作失败
293 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 310 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
294 JZSDK_LOG_ERROR("关闭音频文件上传失败,音频文件上传未开始,无法关闭"); 311 JZSDK_LOG_ERROR("关闭音频文件上传失败,音频文件上传未开始,无法关闭");
295 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 312 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
296 } 313 }
@@ -302,7 +319,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_SaveAudioFileTrans_stop(char *getbuf @@ -302,7 +319,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_SaveAudioFileTrans_stop(char *getbuf
302 JZsdk_Uart_RecvDeal_Set_UART_DEV2_ReceiveMode(JZ_INSCODE_5AFRAME_AUDIOFILE_TRANS_STOP); 319 JZsdk_Uart_RecvDeal_Set_UART_DEV2_ReceiveMode(JZ_INSCODE_5AFRAME_AUDIOFILE_TRANS_STOP);
303 320
304 //2、回复操作成功 321 //2、回复操作成功
305 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 322 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
306 } 323 }
307 324
308 /********* 325 /*********
@@ -331,16 +348,16 @@ static int Uart_DEV2_RecvDeal_audio_PlayFile(char *getbuf) @@ -331,16 +348,16 @@ static int Uart_DEV2_RecvDeal_audio_PlayFile(char *getbuf)
331 348
332 JZSDK_LOG_INFO("播放指定音频:%s\n",music_name); 349 JZSDK_LOG_INFO("播放指定音频:%s\n",music_name);
333 350
334 - ret = JZsdk_Uart_PlayMusic(UART_DEV_1, music_name, datasize); 351 + ret = JZsdk_Uart_PlayMusic(UART_DEV_2, music_name, datasize);
335 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 352 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
336 { 353 {
337 //4、回复操作成功 354 //4、回复操作成功
338 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 355 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
339 } 356 }
340 else 357 else
341 { 358 {
342 //4、回复操作失败 359 //4、回复操作失败
343 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 360 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
344 } 361 }
345 } 362 }
346 /********* 363 /*********
@@ -355,10 +372,10 @@ static int Uart_DEV2_RecvDeal_audio_PlayContinue(char *getbuf) @@ -355,10 +372,10 @@ static int Uart_DEV2_RecvDeal_audio_PlayContinue(char *getbuf)
355 //获取帧的序列号 372 //获取帧的序列号
356 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 373 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
357 374
358 - JZsdk_Uart_audio_PlayContinue(UART_DEV_1); 375 + JZsdk_Uart_audio_PlayContinue(UART_DEV_2);
359 376
360 //回复操作成功 377 //回复操作成功
361 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 378 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
362 } 379 }
363 /********* 380 /*********
364 * 381 *
@@ -372,10 +389,10 @@ static int Uart_DEV2_RecvDeal_audio_PlayPause(char *getbuf) @@ -372,10 +389,10 @@ static int Uart_DEV2_RecvDeal_audio_PlayPause(char *getbuf)
372 //获取帧的序列号 389 //获取帧的序列号
373 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 390 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
374 391
375 - JZsdk_Uart_audio_PlayPause(UART_DEV_1); 392 + JZsdk_Uart_audio_PlayPause(UART_DEV_2);
376 393
377 //回复操作成功 394 //回复操作成功
378 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 395 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
379 } 396 }
380 /********* 397 /*********
381 * 398 *
@@ -389,10 +406,10 @@ static int Uart_DEV2_RecvDeal_audio_PlayStop(char *getbuf) @@ -389,10 +406,10 @@ static int Uart_DEV2_RecvDeal_audio_PlayStop(char *getbuf)
389 //获取帧的序列号 406 //获取帧的序列号
390 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 407 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
391 408
392 - JZsdk_Uart_audio_PlayStop(UART_DEV_1); 409 + JZsdk_Uart_audio_PlayStop(UART_DEV_2);
393 410
394 //回复操作成功 411 //回复操作成功
395 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 412 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
396 } 413 }
397 414
398 /********* 415 /*********
@@ -407,10 +424,10 @@ static int Uart_DEV2_RecvDeal_audio_LastSong(char *getbuf) @@ -407,10 +424,10 @@ static int Uart_DEV2_RecvDeal_audio_LastSong(char *getbuf)
407 //获取帧的序列号 424 //获取帧的序列号
408 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 425 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
409 426
410 - JZsdk_Uart_audio_LastSong(UART_DEV_1); 427 + JZsdk_Uart_audio_LastSong(UART_DEV_2);
411 428
412 //回复操作成功 429 //回复操作成功
413 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 430 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
414 } 431 }
415 432
416 /********* 433 /*********
@@ -425,10 +442,10 @@ static int Uart_DEV2_RecvDeal_audio_NextSong(char *getbuf) @@ -425,10 +442,10 @@ static int Uart_DEV2_RecvDeal_audio_NextSong(char *getbuf)
425 //获取帧的序列号 442 //获取帧的序列号
426 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 443 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
427 444
428 - JZsdk_Uart_audio_NextSong(UART_DEV_1); 445 + JZsdk_Uart_audio_NextSong(UART_DEV_2);
429 446
430 //回复操作成功 447 //回复操作成功
431 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 448 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
432 } 449 }
433 450
434 /********* 451 /*********
@@ -444,7 +461,7 @@ static int Uart_DEV2_RecvDeal_audio_GetMusicList(char *getbuf) @@ -444,7 +461,7 @@ static int Uart_DEV2_RecvDeal_audio_GetMusicList(char *getbuf)
444 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 461 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
445 462
446 //回复操作成功 463 //回复操作成功
447 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 464 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
448 465
449 //0、刷新歌曲列表 466 //0、刷新歌曲列表
450 JZsdk_Uart_Flush_MusicList(); 467 JZsdk_Uart_Flush_MusicList();
@@ -461,16 +478,16 @@ static int Uart_DEV2_RecvDeal_audio_GetMusicList(char *getbuf) @@ -461,16 +478,16 @@ static int Uart_DEV2_RecvDeal_audio_GetMusicList(char *getbuf)
461 } 478 }
462 479
463 //3、发送开始帧 480 //3、发送开始帧
464 - JZsdk_Uart_SendDeal_Reply_Musiclist_start(UART_DEV_1, music_sum); 481 + JZsdk_Uart_SendDeal_Reply_Musiclist_start(UART_DEV_2, music_sum);
465 482
466 //4、逐一调用发送函数将歌曲名发出 483 //4、逐一调用发送函数将歌曲名发出
467 for (int i = 0; i < music_sum; i++) 484 for (int i = 0; i < music_sum; i++)
468 { 485 {
469 - JZsdk_Uart_SendDeal_Reply_Musiclist(UART_DEV_1, MusicName[i], MusicNameLength[i]); 486 + JZsdk_Uart_SendDeal_Reply_Musiclist(UART_DEV_2, MusicName[i], MusicNameLength[i]);
470 } 487 }
471 488
472 //5、发送结束帧 489 //5、发送结束帧
473 - JZsdk_Uart_SendDeal_Reply_Musiclist_end(UART_DEV_1); 490 + JZsdk_Uart_SendDeal_Reply_Musiclist_end(UART_DEV_2);
474 } 491 }
475 492
476 /********* 493 /*********
@@ -488,7 +505,7 @@ static int Uart_DEV2_RecvDeal_Amplifier_stop(char *getbuf) @@ -488,7 +505,7 @@ static int Uart_DEV2_RecvDeal_Amplifier_stop(char *getbuf)
488 JZsdk_Uart_Set_Amplifier(JZ_FLAGCODE_OFF); 505 JZsdk_Uart_Set_Amplifier(JZ_FLAGCODE_OFF);
489 506
490 //回复操作成功 507 //回复操作成功
491 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 508 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
492 509
493 } 510 }
494 /********* 511 /*********
@@ -506,7 +523,7 @@ static int Uart_DEV2_RecvDeal_Amplifier_open(char *getbuf) @@ -506,7 +523,7 @@ static int Uart_DEV2_RecvDeal_Amplifier_open(char *getbuf)
506 JZsdk_Uart_Set_Amplifier(JZ_FLAGCODE_ON); 523 JZsdk_Uart_Set_Amplifier(JZ_FLAGCODE_ON);
507 524
508 //回复操作成功 525 //回复操作成功
509 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 526 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
510 527
511 } 528 }
512 /********* 529 /*********
@@ -533,10 +550,10 @@ static int Uart_DEV2_RecvDeal_SetVolume(char *getbuf) @@ -533,10 +550,10 @@ static int Uart_DEV2_RecvDeal_SetVolume(char *getbuf)
533 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 550 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
534 551
535 int value = (int)getbuf[9]; 552 int value = (int)getbuf[9];
536 - JZsdk_Uart_Set_Volume(UART_DEV_1, value); 553 + JZsdk_Uart_Set_Volume(UART_DEV_2, value);
537 554
538 //回复操作成功 555 //回复操作成功
539 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 556 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
540 } 557 }
541 558
542 /********* 559 /*********
@@ -555,10 +572,10 @@ static int Uart_DEV2_RecvDeal_CheckStatus_volume(char *getbuf) @@ -555,10 +572,10 @@ static int Uart_DEV2_RecvDeal_CheckStatus_volume(char *getbuf)
555 int volume = JZsdk_Uart_CheckStatus_volume(); 572 int volume = JZsdk_Uart_CheckStatus_volume();
556 573
557 //回复操作成功 574 //回复操作成功
558 - //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 575 + //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
559 576
560 //2、发送音量 577 //2、发送音量
561 - JZsdk_Uart_SendDeal_Reply_Volume(UART_DEV_1, volume); 578 + JZsdk_Uart_SendDeal_Reply_Volume(UART_DEV_2, volume);
562 579
563 } 580 }
564 /********* 581 /*********
@@ -580,10 +597,10 @@ static int Uart_DEV2_RecvDeal_CheckStatus_play(char *getbuf) @@ -580,10 +597,10 @@ static int Uart_DEV2_RecvDeal_CheckStatus_play(char *getbuf)
580 ret = JZsdk_Uart_CheckStatus_play(); 597 ret = JZsdk_Uart_CheckStatus_play();
581 598
582 //回复操作成功 599 //回复操作成功
583 - //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 600 + //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
584 601
585 //2、发送播放状态 602 //2、发送播放状态
586 - JZsdk_Uart_SendDeal_Send_PlayStatus(UART_DEV_1, ret); 603 + JZsdk_Uart_SendDeal_Send_PlayStatus(UART_DEV_2, ret);
587 604
588 } 605 }
589 /********* 606 /*********
@@ -606,7 +623,7 @@ static int Uart_DEV2_RecvDeal_CheckStatus_gimbal(char *getbuf) @@ -606,7 +623,7 @@ static int Uart_DEV2_RecvDeal_CheckStatus_gimbal(char *getbuf)
606 JZsdk_Uart_CheckStatus_gimbal(&PitchAngle, &YawAngle); 623 JZsdk_Uart_CheckStatus_gimbal(&PitchAngle, &YawAngle);
607 624
608 //2、发送本地云台值 625 //2、发送本地云台值
609 - JZsdk_Uart_SendDeal_Reply_GimbalPitchAngle(UART_DEV_1, PitchAngle); 626 + JZsdk_Uart_SendDeal_Reply_GimbalPitchAngle(UART_DEV_2, PitchAngle);
610 } 627 }
611 /********* 628 /*********
612 * 629 *
@@ -619,7 +636,7 @@ static int Uart_DEV2_RecvDeal_CheckStatus_GimbalFineTuning(char *getbuf) @@ -619,7 +636,7 @@ static int Uart_DEV2_RecvDeal_CheckStatus_GimbalFineTuning(char *getbuf)
619 //获取帧的序列号 636 //获取帧的序列号
620 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 637 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
621 638
622 - JZsdk_Uart_CheckStatus_GimbalFineTuning(UART_DEV_1, FrameSequence); 639 + JZsdk_Uart_CheckStatus_GimbalFineTuning(UART_DEV_2, FrameSequence);
623 } 640 }
624 641
625 /********* 642 /*********
@@ -643,10 +660,10 @@ static int Uart_DEV2_RecvDeal_CheckStatus_PLayFileName(char *getbuf) @@ -643,10 +660,10 @@ static int Uart_DEV2_RecvDeal_CheckStatus_PLayFileName(char *getbuf)
643 JZSDK_LOG_INFO("当前播放的是%s %d\n",MusicName, MusicName_Len); 660 JZSDK_LOG_INFO("当前播放的是%s %d\n",MusicName, MusicName_Len);
644 661
645 //回复操作成功 662 //回复操作成功
646 - //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 663 + //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
647 664
648 //2、发送名字 665 //2、发送名字
649 - JZsdk_Uart_SendDeal_Reply_MusicName(UART_DEV_1, MusicName,MusicName_Len); 666 + JZsdk_Uart_SendDeal_Reply_MusicName(UART_DEV_2, MusicName,MusicName_Len);
650 } 667 }
651 /********* 668 /*********
652 * 669 *
@@ -671,10 +688,10 @@ static int Uart_DEV2_RecvDeal_CheckStatus_SoftwareVersion(char *getbuf) @@ -671,10 +688,10 @@ static int Uart_DEV2_RecvDeal_CheckStatus_SoftwareVersion(char *getbuf)
671 JZSDK_LOG_INFO("当前的软件版本号为:%2x, %2x, %2x, %2x",majorVersion, minorVersion, modifyVersion, debugVersion); 688 JZSDK_LOG_INFO("当前的软件版本号为:%2x, %2x, %2x, %2x",majorVersion, minorVersion, modifyVersion, debugVersion);
672 689
673 //回复操作成功 690 //回复操作成功
674 - //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 691 + //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
675 692
676 //2、发送版本号 693 //2、发送版本号
677 - JZsdk_Uart_SendDeal_Reply_SoftVersion(UART_DEV_1, majorVersion, minorVersion, modifyVersion, debugVersion); 694 + JZsdk_Uart_SendDeal_Reply_SoftVersion(UART_DEV_2, majorVersion, minorVersion, modifyVersion, debugVersion);
678 } 695 }
679 /********* 696 /*********
680 * 697 *
@@ -698,10 +715,10 @@ static int Uart_DEV2_RecvDeal_CheckStatus_LoopPlay(char *getbuf) @@ -698,10 +715,10 @@ static int Uart_DEV2_RecvDeal_CheckStatus_LoopPlay(char *getbuf)
698 } 715 }
699 716
700 //回复操作成功 717 //回复操作成功
701 - //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 718 + //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
702 719
703 //2、发送循环状态 720 //2、发送循环状态
704 - JZsdk_Uart_SendDeal_Reply_LoopPlayStatus(UART_DEV_1 ,LoopStatus); 721 + JZsdk_Uart_SendDeal_Reply_LoopPlayStatus(UART_DEV_2 ,LoopStatus);
705 } 722 }
706 /********* 723 /*********
707 * 724 *
@@ -725,10 +742,10 @@ static int Uart_DEV2_RecvDeal_CheckStatus_TTS_tone(char *getbuf) @@ -725,10 +742,10 @@ static int Uart_DEV2_RecvDeal_CheckStatus_TTS_tone(char *getbuf)
725 } 742 }
726 743
727 //回复操作成功 744 //回复操作成功
728 - //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 745 + //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
729 746
730 //2、发送音色 747 //2、发送音色
731 - JZsdk_Uart_SendDeal_Reply_TTS_tone(UART_DEV_1 ,TTS_tone); 748 + JZsdk_Uart_SendDeal_Reply_TTS_tone(UART_DEV_2 ,TTS_tone);
732 749
733 } 750 }
734 /********* 751 /*********
@@ -753,10 +770,10 @@ static int Uart_DEV2_RecvDeal_CheckStatus_TTS_speed(char *getbuf) @@ -753,10 +770,10 @@ static int Uart_DEV2_RecvDeal_CheckStatus_TTS_speed(char *getbuf)
753 } 770 }
754 771
755 //回复操作成功 772 //回复操作成功
756 - //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 773 + //JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
757 774
758 //2、发送语速 775 //2、发送语速
759 - JZsdk_Uart_SendDeal_Reply_TTS_speed(UART_DEV_1 ,TTS_speed); 776 + JZsdk_Uart_SendDeal_Reply_TTS_speed(UART_DEV_2 ,TTS_speed);
760 777
761 } 778 }
762 779
@@ -784,10 +801,10 @@ static int Uart_DEV2_RecvDeal_PlayLoop(char *getbuf) @@ -784,10 +801,10 @@ static int Uart_DEV2_RecvDeal_PlayLoop(char *getbuf)
784 mode = JZ_FLAGCODE_OFF; 801 mode = JZ_FLAGCODE_OFF;
785 } 802 }
786 803
787 - JZsdk_Uart_audio_PlayLoop(UART_DEV_1, mode); 804 + JZsdk_Uart_audio_PlayLoop(UART_DEV_2, mode);
788 805
789 //回复操作成功 806 //回复操作成功
790 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 807 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
791 } 808 }
792 809
793 810
@@ -822,7 +839,7 @@ static int Uart_DEV2_RecvDeal_Delete_Audio(char *getbuf) @@ -822,7 +839,7 @@ static int Uart_DEV2_RecvDeal_Delete_Audio(char *getbuf)
822 JZsdk_Uart_Flush_MusicList(); 839 JZsdk_Uart_Flush_MusicList();
823 840
824 //回复操作成功 841 //回复操作成功
825 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 842 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
826 } 843 }
827 /********* 844 /*********
828 * 845 *
@@ -855,7 +872,7 @@ static int Uart_DEV2_RecvDeal_Delete_VoiceRecord(char *getbuf) @@ -855,7 +872,7 @@ static int Uart_DEV2_RecvDeal_Delete_VoiceRecord(char *getbuf)
855 JZsdk_Uart_Flush_MusicList(); 872 JZsdk_Uart_Flush_MusicList();
856 873
857 //回复操作成功 874 //回复操作成功
858 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 875 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
859 } 876 }
860 /********* 877 /*********
861 * 878 *
@@ -882,16 +899,16 @@ static int Uart_DEV2_RecvDeal_TTS_SetTone(char *getbuf) @@ -882,16 +899,16 @@ static int Uart_DEV2_RecvDeal_TTS_SetTone(char *getbuf)
882 int tone = (int)getbuf[9]; 899 int tone = (int)getbuf[9];
883 900
884 //2、设置音色 901 //2、设置音色
885 - T_JZsdkReturnCode ret = JZsdk_Uart_TTS_SetTone(UART_DEV_1, tone); 902 + T_JZsdkReturnCode ret = JZsdk_Uart_TTS_SetTone(UART_DEV_2, tone);
886 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 903 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
887 { 904 {
888 //回复操作成功 905 //回复操作成功
889 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 906 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
890 } 907 }
891 else 908 else
892 { 909 {
893 //回复操作失败 910 //回复操作失败
894 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 911 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
895 } 912 }
896 } 913 }
897 /********* 914 /*********
@@ -914,21 +931,21 @@ static int Uart_DEV2_RecvDeal_TTS_SetSpeed(char *getbuf) @@ -914,21 +931,21 @@ static int Uart_DEV2_RecvDeal_TTS_SetSpeed(char *getbuf)
914 JZSDK_LOG_INFO("语速超出范围\n"); 931 JZSDK_LOG_INFO("语速超出范围\n");
915 932
916 //回复操作失败 933 //回复操作失败
917 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 934 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
918 return -1 ; 935 return -1 ;
919 } 936 }
920 937
921 //2、设置语速 938 //2、设置语速
922 - T_JZsdkReturnCode ret = JZsdk_Uart_TTS_SetSpeed(UART_DEV_1, speed); 939 + T_JZsdkReturnCode ret = JZsdk_Uart_TTS_SetSpeed(UART_DEV_2, speed);
923 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 940 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
924 { 941 {
925 //回复操作成功 942 //回复操作成功
926 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 943 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
927 } 944 }
928 else 945 else
929 { 946 {
930 //回复操作失败 947 //回复操作失败
931 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 948 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
932 } 949 }
933 } 950 }
934 /********* 951 /*********
@@ -950,7 +967,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_TTS_Trans_start(char *getbuf) @@ -950,7 +967,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_TTS_Trans_start(char *getbuf)
950 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 967 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
951 { 968 {
952 //回复操作失败 969 //回复操作失败
953 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 970 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
954 JZSDK_LOG_ERROR("tts开始传输失败"); 971 JZSDK_LOG_ERROR("tts开始传输失败");
955 return ret; 972 return ret;
956 } 973 }
@@ -965,7 +982,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_TTS_Trans_start(char *getbuf) @@ -965,7 +982,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_TTS_Trans_start(char *getbuf)
965 JZsdk_Uart_RecvDeal_Set_UART_DEV2_ReceiveMode(JZ_INSCODE_5AFRAME_TTS_TRANS_UNLIMIT_TRANSMISSION); 982 JZsdk_Uart_RecvDeal_Set_UART_DEV2_ReceiveMode(JZ_INSCODE_5AFRAME_TTS_TRANS_UNLIMIT_TRANSMISSION);
966 983
967 //回复操作成功 984 //回复操作成功
968 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 985 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
969 } 986 }
970 /********* 987 /*********
971 * 988 *
@@ -1003,9 +1020,9 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_TTS_Trans_LimitTransmission(char *ge @@ -1003,9 +1020,9 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_TTS_Trans_LimitTransmission(char *ge
1003 1020
1004 //提取出数据 1021 //提取出数据
1005 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9; 1022 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9;
1006 - if (DataLen > 128) 1023 + if (DataLen > 400)
1007 { 1024 {
1008 - JZSDK_LOG_ERROR("tts定长帧,单帧数据长度超出128上限"); 1025 + JZSDK_LOG_ERROR("tts定长帧,单帧数据长度超出400上限");
1009 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1026 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1010 } 1027 }
1011 1028
@@ -1040,10 +1057,10 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_TTS_Trans_stop(char *getbuf) @@ -1040,10 +1057,10 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_TTS_Trans_stop(char *getbuf)
1040 JZSDK_LOG_INFO("未刷新文本,TTS播放%s",TTS_Recv_buffer); 1057 JZSDK_LOG_INFO("未刷新文本,TTS播放%s",TTS_Recv_buffer);
1041 1058
1042 //3、播放TTS 1059 //3、播放TTS
1043 - JZsdk_Uart_TTS_Play(UART_DEV_1, TTS_Recv_buffer, TTS_Recv_buffer_length); 1060 + JZsdk_Uart_TTS_Play(UART_DEV_2, TTS_Recv_buffer, TTS_Recv_buffer_length);
1044 1061
1045 //回复操作成功 1062 //回复操作成功
1046 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1063 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
1047 1064
1048 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS; 1065 return JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
1049 } 1066 }
@@ -1055,10 +1072,10 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_TTS_Trans_stop(char *getbuf) @@ -1055,10 +1072,10 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_TTS_Trans_stop(char *getbuf)
1055 JZsdk_Uart_RecvDeal_Set_UART_DEV2_ReceiveMode(JZ_INSCODE_5AFRAME_TTS_TRANS_STOP); 1072 JZsdk_Uart_RecvDeal_Set_UART_DEV2_ReceiveMode(JZ_INSCODE_5AFRAME_TTS_TRANS_STOP);
1056 1073
1057 //3、播放TTS 1074 //3、播放TTS
1058 - JZsdk_Uart_TTS_Play(UART_DEV_1, TTS_Recv_buffer, TTS_Recv_buffer_length); 1075 + JZsdk_Uart_TTS_Play(UART_DEV_2, TTS_Recv_buffer, TTS_Recv_buffer_length);
1059 1076
1060 //回复操作成功 1077 //回复操作成功
1061 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1078 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
1062 } 1079 }
1063 1080
1064 1081
@@ -1078,7 +1095,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_OpusTrans_start(char *getbuf) @@ -1078,7 +1095,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_OpusTrans_start(char *getbuf)
1078 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1095 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1079 { 1096 {
1080 //回复操作失败 1097 //回复操作失败
1081 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1098 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
1082 JZSDK_LOG_ERROR("打开opus传输失败"); 1099 JZSDK_LOG_ERROR("打开opus传输失败");
1083 return ret; 1100 return ret;
1084 } 1101 }
@@ -1099,7 +1116,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_OpusTrans_start(char *getbuf) @@ -1099,7 +1116,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_OpusTrans_start(char *getbuf)
1099 JZSDK_LOG_INFO("已完成打开opus传输处理\n"); 1116 JZSDK_LOG_INFO("已完成打开opus传输处理\n");
1100 1117
1101 //回复操作成功 1118 //回复操作成功
1102 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1119 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
1103 } 1120 }
1104 /********* 1121 /*********
1105 * 1122 *
@@ -1128,9 +1145,9 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_OpusTrans_LimitTransmission(char *ge @@ -1128,9 +1145,9 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_OpusTrans_LimitTransmission(char *ge
1128 1145
1129 //提取出数据 1146 //提取出数据
1130 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9; 1147 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9;
1131 - if (DataLen > 128) 1148 + if (DataLen > 400)
1132 { 1149 {
1133 - JZSDK_LOG_ERROR("传输得到的opus定长音频文件帧长度超出128上限"); 1150 + JZSDK_LOG_ERROR("传输得到的opus定长音频文件帧长度超出400上限");
1134 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1151 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1135 } 1152 }
1136 1153
@@ -1154,7 +1171,7 @@ static int Uart_DEV2_RecvDeal_OpusTrans_stop(char *getbuf) @@ -1154,7 +1171,7 @@ static int Uart_DEV2_RecvDeal_OpusTrans_stop(char *getbuf)
1154 if (UART_DEV2_Receive_mode != JZ_INSCODE_5AFRAME_OPUS_TRAN_UNLIMIT_TRANSMISSION) 1171 if (UART_DEV2_Receive_mode != JZ_INSCODE_5AFRAME_OPUS_TRAN_UNLIMIT_TRANSMISSION)
1155 { 1172 {
1156 //回复操作失败 1173 //回复操作失败
1157 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1174 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
1158 JZSDK_LOG_ERROR("关闭opus结束传输失败,opus结束传输未开始,无法关闭"); 1175 JZSDK_LOG_ERROR("关闭opus结束传输失败,opus结束传输未开始,无法关闭");
1159 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1176 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1160 } 1177 }
@@ -1167,7 +1184,7 @@ static int Uart_DEV2_RecvDeal_OpusTrans_stop(char *getbuf) @@ -1167,7 +1184,7 @@ static int Uart_DEV2_RecvDeal_OpusTrans_stop(char *getbuf)
1167 JZSDK_LOG_INFO("结束opus传输处理\n"); 1184 JZSDK_LOG_INFO("结束opus传输处理\n");
1168 1185
1169 //回复操作成功 1186 //回复操作成功
1170 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1187 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
1171 } 1188 }
1172 /********* 1189 /*********
1173 * 1190 *
@@ -1185,15 +1202,15 @@ static int Uart_DEV2_RecvDeal_OpusPlay(char *getbuf) @@ -1185,15 +1202,15 @@ static int Uart_DEV2_RecvDeal_OpusPlay(char *getbuf)
1185 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1202 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1186 { 1203 {
1187 //回复操作失败 1204 //回复操作失败
1188 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1205 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
1189 JZSDK_LOG_ERROR("opus播放失败,存在传输模式打开中"); 1206 JZSDK_LOG_ERROR("opus播放失败,存在传输模式打开中");
1190 return ret; 1207 return ret;
1191 } 1208 }
1192 1209
1193 - JZsdk_Uart_Opus_PlayFixedFile(UART_DEV_1); 1210 + JZsdk_Uart_Opus_PlayFixedFile(UART_DEV_2);
1194 1211
1195 //回复操作成功 1212 //回复操作成功
1196 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1213 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
1197 } 1214 }
1198 1215
1199 1216
@@ -1214,7 +1231,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_Opus_RealTimeVoice_start(char *getbu @@ -1214,7 +1231,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_Opus_RealTimeVoice_start(char *getbu
1214 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1231 if (ret != JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1215 { 1232 {
1216 //回复操作失败 1233 //回复操作失败
1217 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1234 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
1218 JZSDK_LOG_ERROR("开启opus实时喊话失败"); 1235 JZSDK_LOG_ERROR("开启opus实时喊话失败");
1219 return ret; 1236 return ret;
1220 } 1237 }
@@ -1239,7 +1256,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_Opus_RealTimeVoice_start(char *getbu @@ -1239,7 +1256,7 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_Opus_RealTimeVoice_start(char *getbu
1239 JZsdk_Uart_RealTimeVoiceStart(Rate); 1256 JZsdk_Uart_RealTimeVoiceStart(Rate);
1240 1257
1241 //4、通知成功打开语音发送模式 1258 //4、通知成功打开语音发送模式
1242 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1259 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
1243 } 1260 }
1244 1261
1245 /********* 1262 /*********
@@ -1252,7 +1269,6 @@ static int Uart_DEV2_RecvDeal_Opus_RealTimeVoice_UnlimitTransmission(char *getda @@ -1252,7 +1269,6 @@ static int Uart_DEV2_RecvDeal_Opus_RealTimeVoice_UnlimitTransmission(char *getda
1252 { 1269 {
1253 JZSDK_LOG_INFO("opus语音传输中\n"); 1270 JZSDK_LOG_INFO("opus语音传输中\n");
1254 JZsdk_Uart_RealTimeVoiceTrans(getdata, len); 1271 JZsdk_Uart_RealTimeVoiceTrans(getdata, len);
1255 -  
1256 } 1272 }
1257 1273
1258 /********* 1274 /*********
@@ -1269,9 +1285,9 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_Opus_RealTimeVoice_LimitTransmission @@ -1269,9 +1285,9 @@ static T_JZsdkReturnCode Uart_DEV2_RecvDeal_Opus_RealTimeVoice_LimitTransmission
1269 1285
1270 //提取出数据 1286 //提取出数据
1271 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9; 1287 int DataLen = ((int)getdata[3] << 8 ) + (int)getdata[4] - 2 - 9;
1272 - if (DataLen > 80) 1288 + if (DataLen > 400)
1273 { 1289 {
1274 - JZSDK_LOG_ERROR("opus实时语音定长传输帧数据长度超出80上限"); 1290 + JZSDK_LOG_ERROR("opus实时语音定长传输帧数据长度超出400上限");
1275 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1291 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1276 } 1292 }
1277 1293
@@ -1295,7 +1311,7 @@ static int Uart_DEV2_RecvDeal_Opus_RealTimeVoice_stop(char *getbuf) @@ -1295,7 +1311,7 @@ static int Uart_DEV2_RecvDeal_Opus_RealTimeVoice_stop(char *getbuf)
1295 if (UART_DEV2_Receive_mode != JZ_INSCODE_5AFRAME_OPUS_REALTIMEVOICE_UNLIMIT_TRANSMISSION) 1311 if (UART_DEV2_Receive_mode != JZ_INSCODE_5AFRAME_OPUS_REALTIMEVOICE_UNLIMIT_TRANSMISSION)
1296 { 1312 {
1297 //回复操作失败 1313 //回复操作失败
1298 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1314 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
1299 JZSDK_LOG_ERROR("关闭opus实时语音发送功能失败,opus实时语音发送功能未开始,无法关闭"); 1315 JZSDK_LOG_ERROR("关闭opus实时语音发送功能失败,opus实时语音发送功能未开始,无法关闭");
1300 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1316 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1301 } 1317 }
@@ -1307,7 +1323,7 @@ static int Uart_DEV2_RecvDeal_Opus_RealTimeVoice_stop(char *getbuf) @@ -1307,7 +1323,7 @@ static int Uart_DEV2_RecvDeal_Opus_RealTimeVoice_stop(char *getbuf)
1307 JZsdk_Uart_RealTimeVoiceClose(); 1323 JZsdk_Uart_RealTimeVoiceClose();
1308 1324
1309 //3、通知成功关闭语音发送模式 1325 //3、通知成功关闭语音发送模式
1310 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1326 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
1311 } 1327 }
1312 1328
1313 1329
@@ -1349,22 +1365,22 @@ static int Uart_DEV2_RecvDeal_Gimbal_PitchControl(char *getbuf) @@ -1349,22 +1365,22 @@ static int Uart_DEV2_RecvDeal_Gimbal_PitchControl(char *getbuf)
1349 { 1365 {
1350 JZSDK_LOG_INFO("云台输入角度符号错误，无法正常控制"); 1366 JZSDK_LOG_INFO("云台输入角度符号错误，无法正常控制");
1351 //回复操作失败 1367 //回复操作失败
1352 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1368 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
1353 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1369 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1354 } 1370 }
1355 1371
1356 JZSDK_LOG_INFO("处理得到的角度是%d",Gimbal_angle); 1372 JZSDK_LOG_INFO("处理得到的角度是%d",Gimbal_angle);
1357 1373
1358 - T_JZsdkReturnCode ret = JZsdk_Uart_Gimbal_PitchControl(UART_DEV_1, Gimbal_angle); 1374 + T_JZsdkReturnCode ret = JZsdk_Uart_Gimbal_PitchControl(UART_DEV_2, Gimbal_angle);
1359 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1375 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1360 { 1376 {
1361 //回复操作成功 1377 //回复操作成功
1362 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1378 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
1363 } 1379 }
1364 else 1380 else
1365 { 1381 {
1366 //回复操作失败 1382 //回复操作失败
1367 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1383 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
1368 } 1384 }
1369 } 1385 }
1370 1386
@@ -1399,13 +1415,13 @@ static int Uart_DEV2_RecvDeal_Gimbal_PitchFineTuningControl(char *getbuf) @@ -1399,13 +1415,13 @@ static int Uart_DEV2_RecvDeal_Gimbal_PitchFineTuningControl(char *getbuf)
1399 { 1415 {
1400 JZSDK_LOG_INFO("云台俯仰微调角度符号错误，无法正常控制"); 1416 JZSDK_LOG_INFO("云台俯仰微调角度符号错误，无法正常控制");
1401 //回复操作失败 1417 //回复操作失败
1402 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1418 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
1403 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 1419 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
1404 } 1420 }
1405 1421
1406 JZSDK_LOG_INFO("处理得到云台俯仰微调角度是%d",Gimbal_angle); 1422 JZSDK_LOG_INFO("处理得到云台俯仰微调角度是%d",Gimbal_angle);
1407 1423
1408 - JZsdk_Uart_Gimbal_PitchFineTuningControl(UART_DEV_1, FrameSequence ,Gimbal_angle); 1424 + JZsdk_Uart_Gimbal_PitchFineTuningControl(UART_DEV_2, FrameSequence ,Gimbal_angle);
1409 1425
1410 } 1426 }
1411 1427
@@ -1431,16 +1447,16 @@ static int Uart_DEV2_RecvDeal_SearchLight_SetFrequency(char *getbuf) @@ -1431,16 +1447,16 @@ static int Uart_DEV2_RecvDeal_SearchLight_SetFrequency(char *getbuf)
1431 //1、通过数据帧2，获取爆闪频率 1447 //1、通过数据帧2，获取爆闪频率
1432 int Frequency = getbuf[10]; 1448 int Frequency = getbuf[10];
1433 1449
1434 - T_JZsdkReturnCode ret = JZsdk_Uart_Lighting_SetSearchLightFrequency(UART_DEV_1, Frequency); 1450 + T_JZsdkReturnCode ret = JZsdk_Uart_Lighting_SetSearchLightFrequency(UART_DEV_2, Frequency);
1435 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1451 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1436 { 1452 {
1437 //回复操作成功 1453 //回复操作成功
1438 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1454 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
1439 } 1455 }
1440 else 1456 else
1441 { 1457 {
1442 //回复操作失败 1458 //回复操作失败
1443 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1459 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
1444 } 1460 }
1445 } 1461 }
1446 1462
@@ -1458,16 +1474,16 @@ static int Uart_DEV2_RecvDeal_SearchLight_Control(char *getbuf) @@ -1458,16 +1474,16 @@ static int Uart_DEV2_RecvDeal_SearchLight_Control(char *getbuf)
1458 //1、通过数据帧2，获取灯光控制模式 1474 //1、通过数据帧2，获取灯光控制模式
1459 int value = getbuf[10]; 1475 int value = getbuf[10];
1460 1476
1461 - T_JZsdkReturnCode ret = JZsdk_Uart_SearchLight_Control(UART_DEV_1, value); 1477 + T_JZsdkReturnCode ret = JZsdk_Uart_SearchLight_Control(UART_DEV_2, value);
1462 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1478 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1463 { 1479 {
1464 //回复操作成功 1480 //回复操作成功
1465 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1481 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
1466 } 1482 }
1467 else 1483 else
1468 { 1484 {
1469 //回复操作失败 1485 //回复操作失败
1470 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1486 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
1471 } 1487 }
1472 } 1488 }
1473 1489
@@ -1486,16 +1502,16 @@ static int Uart_DEV2_RecvDeal_SearchLight_Lumen(char *getbuf) @@ -1486,16 +1502,16 @@ static int Uart_DEV2_RecvDeal_SearchLight_Lumen(char *getbuf)
1486 int LeftLumen = getbuf[9]; //左灯亮度 1502 int LeftLumen = getbuf[9]; //左灯亮度
1487 int RightLumen = getbuf[10]; //右灯亮度 1503 int RightLumen = getbuf[10]; //右灯亮度
1488 1504
1489 - T_JZsdkReturnCode ret = JZsdk_Uart_SearchLight_Lumen(UART_DEV_1, LeftLumen, RightLumen); 1505 + T_JZsdkReturnCode ret = JZsdk_Uart_SearchLight_Lumen(UART_DEV_2, LeftLumen, RightLumen);
1490 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1506 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1491 { 1507 {
1492 //回复操作成功 1508 //回复操作成功
1493 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1509 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
1494 } 1510 }
1495 else 1511 else
1496 { 1512 {
1497 //回复操作失败 1513 //回复操作失败
1498 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1514 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
1499 } 1515 }
1500 } 1516 }
1501 1517
@@ -1511,7 +1527,7 @@ static int Uart_DEV2_RecvDeal_CheckStatus_SearchLightLightAttribute(char *getbuf @@ -1511,7 +1527,7 @@ static int Uart_DEV2_RecvDeal_CheckStatus_SearchLightLightAttribute(char *getbuf
1511 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 1527 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
1512 1528
1513 //2、查询灯光属性 1529 //2、查询灯光属性
1514 - T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_SearchLightLightAttribute(UART_DEV_1, FrameSequence); 1530 + T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_SearchLightLightAttribute(UART_DEV_2, FrameSequence);
1515 1531
1516 } 1532 }
1517 1533
@@ -1527,7 +1543,7 @@ static int Uart_DEV2_RecvDeal_CheckStatus_SearchLightTemperture(char *getbuf) @@ -1527,7 +1543,7 @@ static int Uart_DEV2_RecvDeal_CheckStatus_SearchLightTemperture(char *getbuf)
1527 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 1543 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
1528 1544
1529 //2、查询探照灯温度 1545 //2、查询探照灯温度
1530 - T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_SearchLightTemperture(UART_DEV_1, FrameSequence); 1546 + T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_SearchLightTemperture(UART_DEV_2, FrameSequence);
1531 } 1547 }
1532 1548
1533 /********* 1549 /*********
@@ -1544,16 +1560,16 @@ static int Uart_DEV2_RecvDeal_SearchLight_SubscriptionControl(char *getbuf) @@ -1544,16 +1560,16 @@ static int Uart_DEV2_RecvDeal_SearchLight_SubscriptionControl(char *getbuf)
1544 //1、通过数据帧2，获取控制值 1560 //1、通过数据帧2，获取控制值
1545 int value = getbuf[10]; 1561 int value = getbuf[10];
1546 1562
1547 - T_JZsdkReturnCode ret = JZsdk_Uart_SearchLight_SubscriptionControl(UART_DEV_1, value); 1563 + T_JZsdkReturnCode ret = JZsdk_Uart_SearchLight_SubscriptionControl(UART_DEV_2, value);
1548 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1564 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1549 { 1565 {
1550 //回复操作成功 1566 //回复操作成功
1551 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1567 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
1552 } 1568 }
1553 else 1569 else
1554 { 1570 {
1555 //回复操作失败 1571 //回复操作失败
1556 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1572 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
1557 } 1573 }
1558 } 1574 }
1559 1575
@@ -1568,7 +1584,7 @@ static int Uart_DEV2_RecvDeal_CheckStatus_SerialNumber(char *getbuf) @@ -1568,7 +1584,7 @@ static int Uart_DEV2_RecvDeal_CheckStatus_SerialNumber(char *getbuf)
1568 //获取帧的序列号 1584 //获取帧的序列号
1569 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 1585 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
1570 1586
1571 - JZsdk_Uart_CheckStatus_SerialNumber(UART_DEV_1, FrameSequence); 1587 + JZsdk_Uart_CheckStatus_SerialNumber(UART_DEV_2, FrameSequence);
1572 1588
1573 } 1589 }
1574 1590
@@ -1587,7 +1603,7 @@ static int Uart_DEV2_RecvDeal_OutPutPower_Control(char *getbuf) @@ -1587,7 +1603,7 @@ static int Uart_DEV2_RecvDeal_OutPutPower_Control(char *getbuf)
1587 int Value = getbuf[9]; 1603 int Value = getbuf[9];
1588 1604
1589 //控制 1605 //控制
1590 - JZsdk_Uart_OutPutPower_Control(UART_DEV_1, FrameSequence, Value); 1606 + JZsdk_Uart_OutPutPower_Control(UART_DEV_2, FrameSequence, Value);
1591 } 1607 }
1592 1608
1593 /********* 1609 /*********
@@ -1603,7 +1619,7 @@ static int Uart_DEV2_RecvDeal_Checkstatus_OutPutPower(char *getbuf) @@ -1603,7 +1619,7 @@ static int Uart_DEV2_RecvDeal_Checkstatus_OutPutPower(char *getbuf)
1603 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 1619 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
1604 1620
1605 //获取本地数值 1621 //获取本地数值
1606 - JZsdk_Uart_Checkstatus_OutPutPower(UART_DEV_1, FrameSequence); 1622 + JZsdk_Uart_Checkstatus_OutPutPower(UART_DEV_2, FrameSequence);
1607 } 1623 }
1608 1624
1609 /******************************************************************************************************************************* 1625 /*******************************************************************************************************************************
@@ -1626,16 +1642,16 @@ static int Uart_DEV2_RecvDeal_WarningLight_ModeControl(char *getbuf) @@ -1626,16 +1642,16 @@ static int Uart_DEV2_RecvDeal_WarningLight_ModeControl(char *getbuf)
1626 int value1 = getbuf[9]; 1642 int value1 = getbuf[9];
1627 int value2 = getbuf[10]; 1643 int value2 = getbuf[10];
1628 1644
1629 - T_JZsdkReturnCode ret = JZsdk_Uart_WarningLight_ModeControl(UART_DEV_1, value1, value2); 1645 + T_JZsdkReturnCode ret = JZsdk_Uart_WarningLight_ModeControl(UART_DEV_2, value1, value2);
1630 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1646 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1631 { 1647 {
1632 //回复操作成功 1648 //回复操作成功
1633 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1649 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
1634 } 1650 }
1635 else 1651 else
1636 { 1652 {
1637 //回复操作失败 1653 //回复操作失败
1638 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1654 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
1639 } 1655 }
1640 } 1656 }
1641 1657
@@ -1654,16 +1670,16 @@ static int Uart_DEV2_RecvDeal_WarningLight_SetColor(char *getbuf) @@ -1654,16 +1670,16 @@ static int Uart_DEV2_RecvDeal_WarningLight_SetColor(char *getbuf)
1654 int value1 = getbuf[9]; 1670 int value1 = getbuf[9];
1655 int value2 = getbuf[10]; 1671 int value2 = getbuf[10];
1656 1672
1657 - T_JZsdkReturnCode ret = JZsdk_Uart_WarningLight_SetColor(UART_DEV_1, value1, value2); 1673 + T_JZsdkReturnCode ret = JZsdk_Uart_WarningLight_SetColor(UART_DEV_2, value1, value2);
1658 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 1674 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
1659 { 1675 {
1660 //回复操作成功 1676 //回复操作成功
1661 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 1677 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
1662 } 1678 }
1663 else 1679 else
1664 { 1680 {
1665 //回复操作失败 1681 //回复操作失败
1666 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 1682 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
1667 } 1683 }
1668 } 1684 }
1669 1685
@@ -1679,7 +1695,7 @@ static int Uart_DEV2_RecvDeal_CheckStatus_WarningLightStatus(char *getbuf) @@ -1679,7 +1695,7 @@ static int Uart_DEV2_RecvDeal_CheckStatus_WarningLightStatus(char *getbuf)
1679 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 1695 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
1680 1696
1681 //2、查询灯光属性 1697 //2、查询灯光属性
1682 - T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_WarningLightStatus(UART_DEV_1, FrameSequence); 1698 + T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_WarningLightStatus(UART_DEV_2, FrameSequence);
1683 } 1699 }
1684 1700
1685 1701
@@ -1695,7 +1711,7 @@ static int Uart_DEV2_RecvDeal_CheckStatus_WarningLightColor(char *getbuf) @@ -1695,7 +1711,7 @@ static int Uart_DEV2_RecvDeal_CheckStatus_WarningLightColor(char *getbuf)
1695 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 1711 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
1696 1712
1697 //2、查询灯光属性 1713 //2、查询灯光属性
1698 - T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_WarningLightColor(UART_DEV_1, FrameSequence); 1714 + T_JZsdkReturnCode ret = JZsdk_Uart_CheckStatus_WarningLightColor(UART_DEV_2, FrameSequence);
1699 } 1715 }
1700 1716
1701 /******************************************************************************************************** 1717 /********************************************************************************************************
@@ -1737,7 +1753,7 @@ static int Uart_DEV2_RecvDeal_ObtainSearchLight_Frequency(char *getbuf) @@ -1737,7 +1753,7 @@ static int Uart_DEV2_RecvDeal_ObtainSearchLight_Frequency(char *getbuf)
1737 int value = getbuf[10]; 1753 int value = getbuf[10];
1738 1754
1739 //2、发送到本地处理 1755 //2、发送到本地处理
1740 - JZsdl_Uart_ObtainSearchLight_Frequency(UART_DEV_1, value); 1756 + JZsdl_Uart_ObtainSearchLight_Frequency(UART_DEV_2, value);
1741 } 1757 }
1742 1758
1743 /********* 1759 /*********
@@ -1755,7 +1771,7 @@ static int Uart_DEV2_RecvDeal_ObtainSearchLight_Mode(char *getbuf) @@ -1755,7 +1771,7 @@ static int Uart_DEV2_RecvDeal_ObtainSearchLight_Mode(char *getbuf)
1755 int value = getbuf[10]; 1771 int value = getbuf[10];
1756 1772
1757 //2、发送到本地处理 1773 //2、发送到本地处理
1758 - JZsdl_Uart_ObtainSearchLight_Mode(UART_DEV_1, value); 1774 + JZsdl_Uart_ObtainSearchLight_Mode(UART_DEV_2, value);
1759 } 1775 }
1760 1776
1761 /********* 1777 /*********
@@ -1774,7 +1790,7 @@ static int Uart_DEV2_RecvDeal_ObtainSearchLight_Lumen(char *getbuf) @@ -1774,7 +1790,7 @@ static int Uart_DEV2_RecvDeal_ObtainSearchLight_Lumen(char *getbuf)
1774 int value2 = getbuf[10]; 1790 int value2 = getbuf[10];
1775 1791
1776 //2、发送到本地处理 1792 //2、发送到本地处理
1777 - JZsdl_Uart_ObtainSearchLight_Lumen(UART_DEV_1, value1, value2); 1793 + JZsdl_Uart_ObtainSearchLight_Lumen(UART_DEV_2, value1, value2);
1778 } 1794 }
1779 1795
1780 /********* 1796 /*********
@@ -1793,7 +1809,7 @@ static int Uart_DEV2_RecvDeal_ObtainSearchLight_Temperature(char *getbuf) @@ -1793,7 +1809,7 @@ static int Uart_DEV2_RecvDeal_ObtainSearchLight_Temperature(char *getbuf)
1793 int value2 = getbuf[10]; 1809 int value2 = getbuf[10];
1794 1810
1795 //2、发送到本地处理 1811 //2、发送到本地处理
1796 - JZsdl_Uart_ObtainSearchLight_Temperature(UART_DEV_1, value1, value2); 1812 + JZsdl_Uart_ObtainSearchLight_Temperature(UART_DEV_2, value1, value2);
1797 } 1813 }
1798 1814
1799 /********* 1815 /*********
@@ -1824,7 +1840,7 @@ static int Uart_DEV2_RecvDeal_ObtainGimbal_Pitch(char *getbuf) @@ -1824,7 +1840,7 @@ static int Uart_DEV2_RecvDeal_ObtainGimbal_Pitch(char *getbuf)
1824 } 1840 }
1825 1841
1826 //2、发送到本地处理 1842 //2、发送到本地处理
1827 - JZsdl_Uart_RecvDeal_ObtainGimbal_Pitch(UART_DEV_1, Gimbal_angle); 1843 + JZsdl_Uart_RecvDeal_ObtainGimbal_Pitch(UART_DEV_2, Gimbal_angle);
1828 } 1844 }
1829 1845
1830 /********* 1846 /*********
@@ -1855,7 +1871,7 @@ static int Uart_DEV2_RecvDeal_ObtainGimbal_Yaw(char *getbuf) @@ -1855,7 +1871,7 @@ static int Uart_DEV2_RecvDeal_ObtainGimbal_Yaw(char *getbuf)
1855 } 1871 }
1856 1872
1857 //2、发送到本地处理 1873 //2、发送到本地处理
1858 - JZsdl_Uart_RecvDeal_ObtainGimbal_Yaw(UART_DEV_1, Gimbal_angle); 1874 + JZsdl_Uart_RecvDeal_ObtainGimbal_Yaw(UART_DEV_2, Gimbal_angle);
1859 } 1875 }
1860 1876
1861 /********* 1877 /*********
@@ -1884,7 +1900,7 @@ static int Uart_DEV2_RecvDeal_ObtainGimbalPitchFineTuning(char *getbuf) @@ -1884,7 +1900,7 @@ static int Uart_DEV2_RecvDeal_ObtainGimbalPitchFineTuning(char *getbuf)
1884 pitch = -pitch; 1900 pitch = -pitch;
1885 } 1901 }
1886 1902
1887 - JZsdl_Uart_ObtainGimbalPitchFineTuning(UART_DEV_1, FrameSequence, pitch); 1903 + JZsdl_Uart_ObtainGimbalPitchFineTuning(UART_DEV_2, FrameSequence, pitch);
1888 } 1904 }
1889 1905
1890 /********* 1906 /*********
@@ -1903,7 +1919,7 @@ static int Uart_DEV2_RecvDeal_ObtainWaringlight_Status(char *getbuf) @@ -1903,7 +1919,7 @@ static int Uart_DEV2_RecvDeal_ObtainWaringlight_Status(char *getbuf)
1903 int value2 = getbuf[10]; 1919 int value2 = getbuf[10];
1904 1920
1905 //2、发送到本地处理 1921 //2、发送到本地处理
1906 - JZsdl_Uart_RecvDeal_ObtainWaringlight_Status(UART_DEV_1, value1, value2); 1922 + JZsdl_Uart_RecvDeal_ObtainWaringlight_Status(UART_DEV_2, value1, value2);
1907 } 1923 }
1908 1924
1909 /********* 1925 /*********
@@ -1922,7 +1938,7 @@ static int Uart_DEV2_RecvDeal_ObtainWaringlight_Color(char *getbuf) @@ -1922,7 +1938,7 @@ static int Uart_DEV2_RecvDeal_ObtainWaringlight_Color(char *getbuf)
1922 int value2 = getbuf[10]; 1938 int value2 = getbuf[10];
1923 1939
1924 //2、发送到本地处理 1940 //2、发送到本地处理
1925 - JZsdl_Uart_RecvDeal_ObtainWaringlight_Color(UART_DEV_1, value1, value2); 1941 + JZsdl_Uart_RecvDeal_ObtainWaringlight_Color(UART_DEV_2, value1, value2);
1926 } 1942 }
1927 1943
1928 /********* 1944 /*********
@@ -1977,7 +1993,7 @@ static int Uart_DEV2_RecvDeal_QuerySecondaryDeviceName(char *getbuf) @@ -1977,7 +1993,7 @@ static int Uart_DEV2_RecvDeal_QuerySecondaryDeviceName(char *getbuf)
1977 int SecondaryName = JZsdk_Uart_GetSecondaryDeviceName(); 1993 int SecondaryName = JZsdk_Uart_GetSecondaryDeviceName();
1978 1994
1979 //3、回复当前从设备名 1995 //3、回复当前从设备名
1980 - JZsdk_Uart_SendDeal_Reply_SecondaryDeviceName(UART_DEV_1 ,SecondaryName, FrameSequence); 1996 + JZsdk_Uart_SendDeal_Reply_SecondaryDeviceName(UART_DEV_2 ,SecondaryName, FrameSequence);
1981 } 1997 }
1982 1998
1983 /******************************************************************************************************************************* 1999 /*******************************************************************************************************************************
@@ -1999,16 +2015,16 @@ static int Uart_DEV2_RecvDeal_SetGimbalRange(char *getbuf) @@ -1999,16 +2015,16 @@ static int Uart_DEV2_RecvDeal_SetGimbalRange(char *getbuf)
1999 //1、通过数据帧2，获取设置的大小值 2015 //1、通过数据帧2，获取设置的大小值
2000 int value = getbuf[10] ; 2016 int value = getbuf[10] ;
2001 2017
2002 - T_JZsdkReturnCode ret = JZsdk_Uart_SetGimbalRange(UART_DEV_1, value); 2018 + T_JZsdkReturnCode ret = JZsdk_Uart_SetGimbalRange(UART_DEV_2, value);
2003 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 2019 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
2004 { 2020 {
2005 //回复操作成功 2021 //回复操作成功
2006 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 2022 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
2007 } 2023 }
2008 else 2024 else
2009 { 2025 {
2010 //回复操作失败 2026 //回复操作失败
2011 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 2027 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
2012 } 2028 }
2013 } 2029 }
2014 2030
@@ -2028,7 +2044,7 @@ static int Uart_DEV2_RecvDeal_GimbalLinkageControl(char *getbuf) @@ -2028,7 +2044,7 @@ static int Uart_DEV2_RecvDeal_GimbalLinkageControl(char *getbuf)
2028 int value = getbuf[10] ; 2044 int value = getbuf[10] ;
2029 2045
2030 //2、设置 2046 //2、设置
2031 - JZsdk_Uart_GimbalLinkageControl(UART_DEV_1, FrameSequence, value); 2047 + JZsdk_Uart_GimbalLinkageControl(UART_DEV_2, FrameSequence, value);
2032 2048
2033 } 2049 }
2034 2050
@@ -2045,7 +2061,7 @@ static int Uart_DEV2_RecvDeal_Checkstatus_GimbalLinkage(char *getbuf) @@ -2045,7 +2061,7 @@ static int Uart_DEV2_RecvDeal_Checkstatus_GimbalLinkage(char *getbuf)
2045 int FrameSequence = JZsdk_Get_FrameSequence(getbuf); 2061 int FrameSequence = JZsdk_Get_FrameSequence(getbuf);
2046 2062
2047 //查询是否开启云台联动 2063 //查询是否开启云台联动
2048 - JZsdk_Uart_Checkstatus_GimbalLinkage(UART_DEV_1, FrameSequence); 2064 + JZsdk_Uart_Checkstatus_GimbalLinkage(UART_DEV_2, FrameSequence);
2049 } 2065 }
2050 2066
2051 static int Uart_DEV2_RecvDeal_UartBitrateChange(char *getbuf) 2067 static int Uart_DEV2_RecvDeal_UartBitrateChange(char *getbuf)
@@ -2086,7 +2102,7 @@ static int Uart_DEV2_RecvDeal_UartBitrateChange(char *getbuf) @@ -2086,7 +2102,7 @@ static int Uart_DEV2_RecvDeal_UartBitrateChange(char *getbuf)
2086 break; 2102 break;
2087 } 2103 }
2088 2104
2089 - JZsdk_Uart_BitRateChange(UART_DEV_1, BitRate); 2105 + JZsdk_Uart_BitRateChange(UART_DEV_2, BitRate);
2090 } 2106 }
2091 2107
2092 /******************************************************************************************************** 2108 /********************************************************************************************************
@@ -2125,12 +2141,12 @@ static int Uart_DEV2_RecvDeal_ObtainSecondaryDeviceName(char *getbuf) @@ -2125,12 +2141,12 @@ static int Uart_DEV2_RecvDeal_ObtainSecondaryDeviceName(char *getbuf)
2125 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS) 2141 if (ret == JZ_ERROR_SYSTEM_MODULE_CODE_SUCCESS)
2126 { 2142 {
2127 //回复操作成功 2143 //回复操作成功
2128 - JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_1, FrameSequence); 2144 + JZsdk_Uart_SendDeal_Reply_Sucesss(UART_DEV_2, FrameSequence);
2129 } 2145 }
2130 else 2146 else
2131 { 2147 {
2132 //回复操作失败 2148 //回复操作失败
2133 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, FrameSequence); 2149 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, FrameSequence);
2134 } 2150 }
2135 } 2151 }
2136 2152
@@ -2154,7 +2170,7 @@ static int Uart_DEV2_RecvDeal_ObtainGimbalLinkage(char *getbuf) @@ -2154,7 +2170,7 @@ static int Uart_DEV2_RecvDeal_ObtainGimbalLinkage(char *getbuf)
2154 int value1 = getbuf[10]; 2170 int value1 = getbuf[10];
2155 2171
2156 //2、保存 2172 //2、保存
2157 - JZsdk_Uart_ObtainGimbalLinkage(UART_DEV_1,FrameSequence,value1); 2173 + JZsdk_Uart_ObtainGimbalLinkage(UART_DEV_2,FrameSequence,value1);
2158 } 2174 }
2159 2175
2160 2176
@@ -2184,7 +2200,7 @@ static int Uart_DEV2_RecvDeal_FrameErrorReply(char *getbuf) @@ -2184,7 +2200,7 @@ static int Uart_DEV2_RecvDeal_FrameErrorReply(char *getbuf)
2184 JZSDK_LOG_ERROR("帧指令错误：帧错误或者是帧无对应操作\n"); 2200 JZSDK_LOG_ERROR("帧指令错误：帧错误或者是帧无对应操作\n");
2185 //无法正常获取帧的序列号 2201 //无法正常获取帧的序列号
2186 //回复操作失败 2202 //回复操作失败
2187 - JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_1, 0x00); 2203 + JZsdk_Uart_SendDeal_Reply_Failure(UART_DEV_2, 0x00);
2188 2204
2189 } 2205 }
2190 2206
@@ -2224,7 +2240,7 @@ static int Uart_DEV2_RecvDeal_OperationFailed(char *getbuf) @@ -2224,7 +2240,7 @@ static int Uart_DEV2_RecvDeal_OperationFailed(char *getbuf)
2224 *********************************************************************************************************/ 2240 *********************************************************************************************************/
2225 int Uart_DEV2_RecvDeal_RecvDeal(int Receive_mode, unsigned char *getdata, int len) 2241 int Uart_DEV2_RecvDeal_RecvDeal(int Receive_mode, unsigned char *getdata, int len)
2226 { 2242 {
2227 - JZSDK_LOG_INFO("串口设备4g,接受到的模式为:%x",Receive_mode); 2243 + JZSDK_LOG_INFO("串口设备2号,接受到的模式为:%x",Receive_mode);
2228 switch (Receive_mode) 2244 switch (Receive_mode)
2229 { 2245 {
2230 /******************************************************************************************************************************* 2246 /*******************************************************************************************************************************
@@ -2238,6 +2254,12 @@ int Uart_DEV2_RecvDeal_RecvDeal(int Receive_mode, unsigned char *getdata, int le @@ -2238,6 +2254,12 @@ int Uart_DEV2_RecvDeal_RecvDeal(int Receive_mode, unsigned char *getdata, int le
2238 return 0; 2254 return 0;
2239 break; 2255 break;
2240 2256
  2257 + //电源状态设置
  2258 + case JZ_INSCODE_5AFRAME_FRAME_POWER_STATUS:
  2259 + Uart_DEV2_RecvDeal_PowerStatus(getdata);
  2260 + return 0;
  2261 + break;
  2262 +
2241 //开启语音 2263 //开启语音
2242 case JZ_INSCODE_5AFRAME_REALTIMEMP2_START: 2264 case JZ_INSCODE_5AFRAME_REALTIMEMP2_START:
2243 Uart_DEV2_RecvDeal_RealTimeMP2_start(getdata); 2265 Uart_DEV2_RecvDeal_RealTimeMP2_start(getdata);
@@ -2784,9 +2806,11 @@ int JZsdk_Uart_RecvDeal_CharmDeal_Uart_DEV2(unsigned char *getbuf, int len) @@ -2784,9 +2806,11 @@ int JZsdk_Uart_RecvDeal_CharmDeal_Uart_DEV2(unsigned char *getbuf, int len)
2784 { 2806 {
2785 Uart_DEV2_RecvDeal_RecvDeal(UART_DEV2_Receive_mode, getbuf, len); 2807 Uart_DEV2_RecvDeal_RecvDeal(UART_DEV2_Receive_mode, getbuf, len);
2786 } 2808 }
2787 -  
2788 - //否则直接丢弃  
2789 - return -1; 2809 + else
  2810 + {
  2811 + //否则直接丢弃
  2812 + Uart_DEV2_RecvDeal_RecvDeal(JZ_ERROR_SYSTEM_FRAME_ERROR, getbuf, len);
  2813 + }
2790 } 2814 }
2791 2815
2792 /******************* 2816 /*******************
@@ -2797,7 +2821,7 @@ int JZsdk_Uart_RecvDeal_CharmDeal_Uart_DEV2(unsigned char *getbuf, int len) @@ -2797,7 +2821,7 @@ int JZsdk_Uart_RecvDeal_CharmDeal_Uart_DEV2(unsigned char *getbuf, int len)
2797 * ****************/ 2821 * ****************/
2798 int JZsdk_Uart_RecvDeal_Set_UART_DEV2_ReceiveMode(int value) 2822 int JZsdk_Uart_RecvDeal_Set_UART_DEV2_ReceiveMode(int value)
2799 { 2823 {
2800 - JZSDK_LOG_INFO("串口设备4g,二次修改接收模式%x\n",value); 2824 + JZSDK_LOG_INFO("串口设备2号,二次修改接收模式%x\n",value);
2801 UART_DEV2_Receive_mode = value; 2825 UART_DEV2_Receive_mode = value;
2802 return 0; 2826 return 0;
2803 } 2827 }
@@ -8,13 +8,25 @@ @@ -8,13 +8,25 @@
8 #include "Jzsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h" 8 #include "Jzsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h"
9 9
10 //发送任务 10 //发送任务
11 -static int JZsdk_Uart_SendDeal_SendOreder(int UartPort ,char *sendbuf, int len) 11 +int JZsdk_Uart_SendDeal_SendOreder(int UartPort ,char *sendbuf, int len)
12 { 12 {
13 JZsdk_Uart_UartSend(UartPort, sendbuf, len); 13 JZsdk_Uart_UartSend(UartPort, sendbuf, len);
14 } 14 }
15 15
  16 +//发送主动连接帧
  17 +int JZsdk_Uart_SendDeal_ConnectFrame(int PortNum)
  18 +{
  19 + char sendbuf[256];
  20 + int send_buf_len;
  21 +
  22 + //1、获取帧样板
  23 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_ASKFORCONNECT , sendbuf, &send_buf_len);
  24 +
  25 + //2、发送帧
  26 + JZsdk_Uart_SendDeal_SendOreder(PortNum ,sendbuf, send_buf_len);
  27 +}
16 28
17 -//发送连接帧 29 +//回复连接帧
18 int JZsdk_Uart_SendDeal_Send_Connect(int Uartport ,int Version_flag) 30 int JZsdk_Uart_SendDeal_Send_Connect(int Uartport ,int Version_flag)
19 { 31 {
20 char sendbuf[256]; 32 char sendbuf[256];
@@ -350,6 +362,28 @@ int JZsdk_Uart_SendDeal_Reply_TTS_speed(int Uartport ,int speed) @@ -350,6 +362,28 @@ int JZsdk_Uart_SendDeal_Reply_TTS_speed(int Uartport ,int speed)
350 JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len); 362 JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
351 } 363 }
352 364
  365 +/*************
  366 + *
  367 + * 发送opus解码状态
  368 + *
  369 + * **************/
  370 +int JZsdk_Uart_SendDeal_OpusDecodeStatus(int Uartport,int value)
  371 +{
  372 + printf("发送opus解码状态帧\n");
  373 +
  374 + char sendbuf[256];
  375 + int send_buf_len;
  376 +
  377 + //1、获取帧样板
  378 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_OPUS_DECODE_STATUS, sendbuf, &send_buf_len);
  379 +
  380 + //2、写入数据
  381 + sendbuf[9] = value;
  382 +
  383 + //3、发送帧
  384 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  385 +}
  386 +
353 /**************************************************************************************************************************************************** 387 /****************************************************************************************************************************************************
354 * 388 *
355 * 云台部分 389 * 云台部分
@@ -386,11 +420,14 @@ int JZsdk_Uart_SendDeal_Reply_GimbalPitchAngle(int Uartport ,int angle) @@ -386,11 +420,14 @@ int JZsdk_Uart_SendDeal_Reply_GimbalPitchAngle(int Uartport ,int angle)
386 int JZsdk_Uart_SendDeal_Set_GimbalPitchAngle(int Uartport ,int angle) 420 int JZsdk_Uart_SendDeal_Set_GimbalPitchAngle(int Uartport ,int angle)
387 { 421 {
388 printf("发送设置云台角度帧 %d\n",angle); 422 printf("发送设置云台角度帧 %d\n",angle);
389 - char sendbuf[256]; 423 + //char sendbuf[256];
390 int send_buf_len; 424 int send_buf_len;
391 425
392 //1、获取帧样板 426 //1、获取帧样板
393 - JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_GIMBAL_PITCH_CONTROL, sendbuf, &send_buf_len); 427 + //JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_GIMBAL_PITCH_CONTROL, sendbuf, &send_buf_len);
  428 +
  429 + char sendbuf[14] = {0x5A ,0x5A ,0x77 ,0x00 ,0x0E ,0x00 ,0x00 ,0x64 ,0x51 ,0x00 ,0x00 ,0x00 ,0x00 ,0x23};
  430 + send_buf_len = 14;
394 431
395 //2、写入数据 432 //2、写入数据
396 if (angle < 0) 433 if (angle < 0)
  1 +#include <stdio.h>
  2 +#include <string.h>
  3 +
  4 +#include "JZsdk_Uart_UartDeal.h"
  5 +#include "Uart_Config.h"
  6 +
  7 +#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
  8 +#include "Jzsdk_Base/JZsdk_FrameComparsion/JZsdk_FrameComparsion.h"
  9 +
  10 +//发送任务
  11 +int JZsdk_Uart_SendDeal_SendOreder(int UartPort ,char *sendbuf, int len)
  12 +{
  13 + JZsdk_Uart_UartSend(UartPort, sendbuf, len);
  14 +}
  15 +
  16 +//发送主动连接帧
  17 +int JZsdk_Uart_SendDeal_ConnectFrame(int PortNum)
  18 +{
  19 + char sendbuf[256];
  20 + int send_buf_len;
  21 +
  22 + //1、获取帧样板
  23 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_ASKFORCONNECT , sendbuf, &send_buf_len);
  24 +
  25 + //2、发送帧
  26 + JZsdk_Uart_SendDeal_SendOreder(PortNum ,sendbuf, send_buf_len);
  27 +}
  28 +
  29 +//回复连接帧
  30 +int JZsdk_Uart_SendDeal_Send_Connect(int Uartport ,int Version_flag)
  31 +{
  32 + char sendbuf[256];
  33 + int send_buf_len;
  34 +
  35 + //1、获取帧样板
  36 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_INITIATECONNECT , sendbuf, &send_buf_len);
  37 +
  38 + //2、写入硬件码
  39 + sendbuf[9] = Version_flag;
  40 +
  41 + //3、发送帧
  42 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  43 +}
  44 +
  45 +//发送成功帧
  46 +int JZsdk_Uart_SendDeal_Reply_Sucesss(int Uartport ,int FrameSequence)
  47 +{
  48 + char sendbuf[256];
  49 + int send_buf_len;
  50 +
  51 + //1、获取帧样板
  52 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_SUCESS , sendbuf, &send_buf_len);
  53 +
  54 + //2、写入数据
  55 + sendbuf[6] = FrameSequence; //帧序列
  56 +
  57 + //3、发送帧
  58 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  59 +}
  60 +
  61 +//发送失败帧
  62 +int JZsdk_Uart_SendDeal_Reply_Failure(int Uartport ,int FrameSequence)
  63 +{
  64 + char sendbuf[256];
  65 + int send_buf_len;
  66 +
  67 + //1、获取帧样板
  68 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_DEFEAT , sendbuf, &send_buf_len);
  69 +
  70 + //2、写入数据
  71 + sendbuf[6] = FrameSequence; //帧序列
  72 +
  73 + //3、发送帧
  74 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  75 +}
  76 +
  77 +//发送当前从设备名
  78 +int JZsdk_Uart_SendDeal_Reply_SecondaryDeviceName(int Uartport , int device_name, int FrameSequence)
  79 +{
  80 + char sendbuf[256];
  81 + int send_buf_len;
  82 +
  83 + //1、获取帧样板
  84 + JZsdk_GetFrameTemplate(JZ_INSCODE_6BFRAME_CHECKSTATUS_SECONDARY_DEVICE_NAME , sendbuf, &send_buf_len);
  85 +
  86 + //2、写入数据
  87 + sendbuf[6] = FrameSequence; //帧序列
  88 + sendbuf[10] = device_name;
  89 +
  90 + //3、发送帧
  91 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  92 +}
  93 +
  94 +
  95 +//查询当前从设备名
  96 +int JZsdk_Uart_SendDeal_QuerySecondaryDeviceName(int Uartport ,int FrameSequence)
  97 +{
  98 + char sendbuf[256];
  99 + int send_buf_len;
  100 +
  101 + //1、获取帧样板
  102 + JZsdk_GetFrameTemplate(JZ_INSCODE_6AFRAME_CHECKSTATUS_SECONDARY_DEVICE_NAME , sendbuf, &send_buf_len);
  103 +
  104 + //2、写入数据
  105 + sendbuf[6] = FrameSequence; //帧序列
  106 +
  107 + //3、发送帧
  108 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  109 +}
  110 +
  111 +//发送当前设备序列号
  112 +int JZsdk_Uart_SendDeal_SerialNumber(int UartPort, int FrameSequence, char *SerialNumber)
  113 +{
  114 + char sendbuf[256];
  115 + int send_buf_len;
  116 +
  117 + //1、获取帧样板
  118 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_CHECKSTATUS_SERIALNUMBER , sendbuf, &send_buf_len);
  119 +
  120 + //2、写入数据
  121 + sendbuf[6] = FrameSequence; //帧序列
  122 +
  123 + for (int i = 0; i < 14; i++)
  124 + {
  125 + sendbuf[9+i] = SerialNumber[i];
  126 + }
  127 +
  128 + sendbuf[23] = 0x00;
  129 + sendbuf[24] = 0x23;
  130 + sendbuf[4] = 0x17;
  131 +
  132 + send_buf_len = 25;
  133 +
  134 + //3、发送帧
  135 + JZsdk_Uart_SendDeal_SendOreder(UartPort ,sendbuf, send_buf_len);
  136 +}
  137 +
  138 +
  139 +//发送歌曲名字
  140 +int JZsdk_Uart_SendDeal_Reply_Musiclist(int Uartport ,char *music_name, int music_name_length)
  141 +{
  142 + char sendbuf[256];
  143 + int send_buf_len;
  144 +
  145 + //1、获取帧样板
  146 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_MUSICLIST_TRANS , sendbuf, &send_buf_len);
  147 +
  148 + //2、写入数据
  149 + memcpy(&sendbuf[9],music_name,music_name_length);
  150 + sendbuf[9+music_name_length]=0x00;
  151 + sendbuf[10+music_name_length]=0x23;
  152 +
  153 + int len = send_buf_len -1 + music_name_length ;
  154 +
  155 + sendbuf[3] = len >> 8;
  156 + sendbuf[4] = len & 0xff;
  157 +
  158 + //3、发送帧
  159 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, len);
  160 +}
  161 +
  162 +//发送歌曲列表开始帧
  163 +int JZsdk_Uart_SendDeal_Reply_Musiclist_start(int Uartport ,int num)
  164 +{
  165 + printf("发送列表开始帧\n");
  166 + char sendbuf[256];
  167 + int send_buf_len;
  168 +
  169 + //1、获取帧样板
  170 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_MUSICLIST_START , sendbuf, &send_buf_len);
  171 +
  172 + //2、写入数据
  173 + sendbuf[9] = num;
  174 +
  175 + //3、发送帧
  176 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  177 +
  178 +}
  179 +
  180 +//发送歌曲列表结束帧
  181 +int JZsdk_Uart_SendDeal_Reply_Musiclist_end(int Uartport)
  182 +{
  183 + printf("发送歌曲列表结束帧\n");
  184 + printf("发送歌曲列表结束帧\n");
  185 + char sendbuf[256];
  186 + int send_buf_len;
  187 +
  188 + //1、获取帧样板
  189 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_MUSICLIST_STOP , sendbuf, &send_buf_len);
  190 +
  191 + //2、写入数据
  192 +
  193 + //3、发送帧
  194 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  195 +}
  196 +
  197 +//发送播放状态结束帧
  198 +int JZsdk_Uart_SendDeal_Send_PlayStatus_end(int Uartport)
  199 +{
  200 + printf("发送播放状态结束帧\n");
  201 + char sendbuf[256];
  202 + int send_buf_len;
  203 +
  204 + //1、获取帧样板
  205 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_AUDIO_PLAYSTATUS_END , sendbuf, &send_buf_len);
  206 +
  207 + //2、写入数据
  208 +
  209 + //3、发送帧
  210 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  211 +}
  212 +
  213 +//发送播放状态帧
  214 +int JZsdk_Uart_SendDeal_Send_PlayStatus(int Uartport ,int num)
  215 +{
  216 + printf("向");
  217 + switch (Uartport)
  218 + {
  219 + case UART_4G:
  220 + printf("4G模块");
  221 + break;
  222 + case UART_DEV_1:
  223 + printf("串口1设备");
  224 + break;
  225 + case UART_DEV_2:
  226 + printf("串口2设备");
  227 + break;
  228 +
  229 + default:
  230 + break;
  231 + }
  232 + printf("发送播放状态帧%x\n",num);
  233 + char sendbuf[256];
  234 + int send_buf_len;
  235 +
  236 + //1、获取帧样板
  237 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_AUDIO_PLAYSTATUS , sendbuf, &send_buf_len);
  238 +
  239 + //2、写入数据
  240 + sendbuf[9] = (char)num;
  241 +
  242 + //3、发送帧
  243 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  244 +}
  245 +
  246 +//回复当前播放的歌曲名字
  247 +int JZsdk_Uart_SendDeal_Reply_MusicName(int Uartport ,char *music_name, int music_name_len)
  248 +{
  249 + printf("发送当前歌曲名字帧");
  250 + char sendbuf[256];
  251 + int send_buf_len;
  252 +
  253 + //1、获取帧样板
  254 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_AUDIO_PLAYFILENAME , sendbuf, &send_buf_len);
  255 +
  256 + //2、写入数据
  257 + memcpy(&sendbuf[9],music_name,music_name_len);
  258 + sendbuf[9+music_name_len]=0x00;
  259 + sendbuf[10+music_name_len]=0x23;
  260 +
  261 + int len = send_buf_len -1 + music_name_len;
  262 +
  263 + sendbuf[3] = len >> 8;
  264 + sendbuf[4] = len & 0xff;
  265 +
  266 + //3、发送帧
  267 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, len);
  268 +}
  269 +
  270 +//回复当前音量
  271 +int JZsdk_Uart_SendDeal_Reply_Volume(int Uartport ,int num)
  272 +{
  273 + printf("发送播放状态帧\n");
  274 + char sendbuf[256];
  275 + int send_buf_len;
  276 +
  277 + //1、获取帧样板
  278 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_VOLUME, sendbuf, &send_buf_len);
  279 +
  280 + //2、写入数据
  281 + sendbuf[9] = (char)num;
  282 +
  283 + //3、发送帧
  284 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  285 +
  286 +}
  287 +
  288 +
  289 +
  290 +//回复软件版本号
  291 +int JZsdk_Uart_SendDeal_Reply_SoftVersion(int Uartport ,char majorVersion, char minorVersion, char modifyVersion, char debugVersion)
  292 +{
  293 + printf("发送软件版本号帧\n");
  294 + char sendbuf[256];
  295 + int send_buf_len;
  296 +
  297 + //1、获取帧样板
  298 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_SORTWAREVERSION, sendbuf, &send_buf_len);
  299 +
  300 + //2、写入数据
  301 + sendbuf[9] = majorVersion;
  302 + sendbuf[10] = minorVersion;
  303 + sendbuf[11] = modifyVersion;
  304 + sendbuf[12] = debugVersion;
  305 +
  306 + //3、发送帧
  307 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  308 +}
  309 +
  310 +//发送循环状态
  311 +int JZsdk_Uart_SendDeal_Reply_LoopPlayStatus(int Uartport ,int status)
  312 +{
  313 + printf("发送循环状态帧\n");
  314 +
  315 + char sendbuf[256];
  316 + int send_buf_len;
  317 +
  318 + //1、获取帧样板
  319 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_AUDIO_PLAYLOOPSTATUS, sendbuf, &send_buf_len);
  320 +
  321 + //2、写入数据
  322 + sendbuf[9] = status;
  323 +
  324 + //3、发送帧
  325 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  326 +
  327 +}
  328 +
  329 +//发送音色
  330 +int JZsdk_Uart_SendDeal_Reply_TTS_tone(int Uartport ,int tone)
  331 +{
  332 + printf("发送音色帧\n");
  333 +
  334 + char sendbuf[256];
  335 + int send_buf_len;
  336 +
  337 + //1、获取帧样板
  338 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_TTS_TONE, sendbuf, &send_buf_len);
  339 +
  340 + //2、写入数据
  341 + sendbuf[9] = tone;
  342 +
  343 + //3、发送帧
  344 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  345 +}
  346 +
  347 +//发送语速
  348 +int JZsdk_Uart_SendDeal_Reply_TTS_speed(int Uartport ,int speed)
  349 +{
  350 + printf("发送音色帧\n");
  351 +
  352 + char sendbuf[256];
  353 + int send_buf_len;
  354 +
  355 + //1、获取帧样板
  356 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_TTS_SPEED, sendbuf, &send_buf_len);
  357 +
  358 + //2、写入数据
  359 + sendbuf[9] = speed;
  360 +
  361 + //3、发送帧
  362 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  363 +}
  364 +
  365 +/*************
  366 + *
  367 + * 发送opus解码状态
  368 + *
  369 + * **************/
  370 +int JZsdk_Uart_SendDeal_OpusDecodeStatus(int Uartport,int value)
  371 +{
  372 + printf("发送opus解码状态帧\n");
  373 +
  374 + char sendbuf[256];
  375 + int send_buf_len;
  376 +
  377 + //1、获取帧样板
  378 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_OPUS_DECODE_STATUS, sendbuf, &send_buf_len);
  379 +
  380 + //2、写入数据
  381 + sendbuf[9] = value;
  382 +
  383 + //3、发送帧
  384 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  385 +}
  386 +
  387 +/****************************************************************************************************************************************************
  388 +*
  389 +* 云台部分
  390 +*
  391 +****************************************************************************************************************************************************/
  392 +
  393 +//回复当前云台角度
  394 +int JZsdk_Uart_SendDeal_Reply_GimbalPitchAngle(int Uartport ,int angle)
  395 +{
  396 + printf("发送当前云台角度帧\n");
  397 + char sendbuf[256];
  398 + int send_buf_len;
  399 +
  400 + //1、获取帧样板
  401 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_GIMBAL_PITCH, sendbuf, &send_buf_len);
  402 +
  403 + //2、写入数据
  404 + char signal = 0x00;
  405 + if (angle < 0)
  406 + {
  407 + signal = 0xff;
  408 + angle = -angle;
  409 + }
  410 +
  411 + sendbuf[9] = (char)signal;
  412 + sendbuf[10] = (char)(angle >> 8);
  413 + sendbuf[11] = (char)(angle & 255);
  414 +
  415 + //3、发送帧
  416 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  417 +}
  418 +
  419 +//设置当前云台角度
  420 +int JZsdk_Uart_SendDeal_Set_GimbalPitchAngle(int Uartport ,int angle)
  421 +{
  422 + printf("发送设置云台角度帧 %d\n",angle);
  423 + char sendbuf[256];
  424 + int send_buf_len;
  425 +
  426 + //1、获取帧样板
  427 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_GIMBAL_PITCH_CONTROL, sendbuf, &send_buf_len);
  428 +
  429 + //2、写入数据
  430 + if (angle < 0)
  431 + {
  432 + angle = -angle;
  433 + sendbuf[9] = 0xff;
  434 + }
  435 + else
  436 + {
  437 + sendbuf[9] = 0x00;
  438 + }
  439 +
  440 + sendbuf[10] = ((angle>>8) & 0xff);
  441 + sendbuf[11] = (angle & 0xff);
  442 +
  443 + //3、发送帧
  444 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  445 +}
  446 +
  447 +//查询云台角度
  448 +int JZsdk_Uart_SendDeal_CheckStatus_GimbalAngle(int Uartport ,int FrameSequence)
  449 +{
  450 + printf("发送查询云台角度帧\n");
  451 + char sendbuf[256];
  452 + int send_buf_len;
  453 +
  454 + //1、获取帧样板
  455 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_GIMBAL, sendbuf, &send_buf_len);
  456 +
  457 + //2、写入帧序列
  458 + sendbuf[6] = FrameSequence;
  459 +
  460 + //3、发送帧
  461 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  462 +}
  463 +
  464 +//微调云台pitch
  465 +int JZsdk_Uart_SendDeal_Set_GimbalFineTuningPitch(int Uartport, int PitchFineTuning)
  466 +{
  467 + printf("发送微调云台pitch帧\n");
  468 + char sendbuf[256];
  469 + int send_buf_len;
  470 +
  471 + //1、获取帧样板
  472 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_GIMBAL_PITCH_FINETUNING_CONTROL, sendbuf, &send_buf_len);
  473 +
  474 + //2、写入数据
  475 + if (PitchFineTuning < 0)
  476 + {
  477 + PitchFineTuning = -PitchFineTuning;
  478 + sendbuf[9] = 0xff;
  479 + }
  480 + else
  481 + {
  482 + sendbuf[9] = 0x00;
  483 + }
  484 +
  485 + sendbuf[10] = ((PitchFineTuning>>8) & 0xff);
  486 + sendbuf[11] = (PitchFineTuning & 0xff);
  487 +
  488 + //3、发送帧
  489 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  490 +}
  491 +
  492 +//查询云台角度微调值
  493 +int JZsdk_Uart_SendDeal_CheckStatus_GimbalFineTuningPitch(int Uartport, int FrameSequence)
  494 +{
  495 + printf("发送查询云台角度微调值帧\n");
  496 + char sendbuf[256];
  497 + int send_buf_len;
  498 +
  499 + //1、获取帧样板
  500 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_GIMBAL_FINETUNING, sendbuf, &send_buf_len);
  501 +
  502 + //2、写入数据
  503 + sendbuf[6] = FrameSequence; //帧序列
  504 +
  505 + //3、发送帧
  506 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  507 +}
  508 +
  509 +//回复云台pitch微调值
  510 +int JZsdk_Uart_SendDeal_Reply_GimbalFineTuningPitch(int Uartport, int FrameSequence, int FineTunigPitch)
  511 +{
  512 + printf("发送云台pitch微调值\n");
  513 + char sendbuf[256];
  514 + int send_buf_len;
  515 +
  516 + //1、获取帧样板
  517 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_GIMBAL_PITCH_FINETUNING, sendbuf, &send_buf_len);
  518 +
  519 + //2、写入数据
  520 + if (FineTunigPitch < 0)
  521 + {
  522 + FineTunigPitch = -FineTunigPitch;
  523 + sendbuf[9] = 0xff;
  524 + }
  525 + else
  526 + {
  527 + sendbuf[9] = 0x00;
  528 + }
  529 +
  530 + sendbuf[10] = ((FineTunigPitch>>8) & 0xff);
  531 + sendbuf[11] = (FineTunigPitch & 0xff);
  532 +
  533 + //3、发送帧
  534 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  535 +}
  536 +
  537 +//设置云台联动
  538 +int JZsdk_Uart_SendDeal_Set_GimbalLinkageControl(int Uartport,int FrameSequence, int value)
  539 +{
  540 + printf("发送设置云台联动帧\n");
  541 + char sendbuf[256];
  542 + int send_buf_len;
  543 +
  544 + //1、获取帧样板
  545 + JZsdk_GetFrameTemplate(JZ_INSCODE_6AFRAME_GIMBAL_LINKAGE_CONTROL, sendbuf, &send_buf_len);
  546 +
  547 + //2、写入数据
  548 + sendbuf[6] = FrameSequence; //帧序列
  549 + sendbuf[10] = value;
  550 +
  551 + //3、发送帧
  552 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  553 +}
  554 +
  555 +//查询云台联动值
  556 +int JZsdk_Uart_SendDeal_CheckStatus_GimbalLinkage(int Uartport,int FrameSequence)
  557 +{
  558 + printf("发送查询云台联动值帧\n");
  559 + char sendbuf[256];
  560 + int send_buf_len;
  561 +
  562 + //1、获取帧样板
  563 + JZsdk_GetFrameTemplate(JZ_INSCODE_6AFRAME_CHECKSTATUS_GIMBAL_LINKAGE, sendbuf, &send_buf_len);
  564 +
  565 + //2、写入数据
  566 + sendbuf[6] = FrameSequence; //帧序列
  567 +
  568 + //3、发送帧
  569 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  570 +}
  571 +
  572 +//发送云台联动值
  573 +int JZsdk_Uart_SendDeal_GimbalLinkageControl(int Uartport,int FrameSequence,int value)
  574 +{
  575 + printf("发送云台联动值帧\n");
  576 + char sendbuf[256];
  577 + int send_buf_len;
  578 +
  579 + //1、获取帧样板
  580 + JZsdk_GetFrameTemplate(JZ_INSCODE_6BFRAME_CHECKSTATUS_GIMBAL_LINKAGE, sendbuf, &send_buf_len);
  581 +
  582 + //2、写入数据
  583 + sendbuf[6] = FrameSequence; //帧序列
  584 + sendbuf[10] = value;
  585 +
  586 + //3、发送帧
  587 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  588 +}
  589 +
  590 +//发送云台最大最小值帧
  591 +int JZsdk_Uart_SendDeal_SetGimbalRange(int Uartport,int FrameSequence,int value)
  592 +{
  593 + printf("发送云台最大最小值帧\n");
  594 + char sendbuf[256];
  595 + int send_buf_len;
  596 +
  597 + //1、获取帧样板
  598 + JZsdk_GetFrameTemplate(JZ_INSCODE_6AFRAME_SET_GIMBAL_MAXMIN_RANGE, sendbuf, &send_buf_len);
  599 +
  600 + //2、写入数据
  601 + sendbuf[6] = FrameSequence; //帧序列
  602 + sendbuf[10] = value;
  603 +
  604 + //3、发送帧
  605 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  606 +}
  607 +
  608 +/****************************************************************************************************************************************************
  609 +*
  610 +* 探照灯部分
  611 +*
  612 +****************************************************************************************************************************************************/
  613 +
  614 +//发送设置探照灯爆闪频率
  615 +int JZsdk_Uart_SendDeal_Set_SearchLightFrequency(int Uartport ,int Frequency)
  616 +{
  617 + printf("发送设置爆闪频率帧\n");
  618 +
  619 + char sendbuf[256];
  620 + int send_buf_len;
  621 +
  622 + //1、获取帧样板
  623 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_SEARCHLIGHT_SET_FREQUENCY, sendbuf, &send_buf_len);
  624 +
  625 + //2、写入数据
  626 + sendbuf[10] = Frequency;
  627 +
  628 + //3、发送帧
  629 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  630 +}
  631 +
  632 +//设置探照灯控制
  633 +int JZsdk_Uart_SendDeal_SearchLight_Control(int Uartport,int mode)
  634 +{
  635 + printf("发送探照灯控制\n");
  636 +
  637 + char sendbuf[256];
  638 + int send_buf_len;
  639 +
  640 + //1、获取帧样板
  641 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_SEARCHLIGHT_CONTROL, sendbuf, &send_buf_len);
  642 +
  643 + //2、写入数据
  644 + sendbuf[10] = mode;
  645 +
  646 + //3、发送帧
  647 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  648 +}
  649 +
  650 +//设置探照灯亮度
  651 +int JZsdk_Uart_SendDeal_SearchLight_SetLumen(int Uartport, int LeftLumen, int RightLumen)
  652 +{
  653 + printf("发送设置探照灯亮度\n");
  654 +
  655 + char sendbuf[256];
  656 + int send_buf_len;
  657 +
  658 + //1、获取帧样板
  659 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_SEARCHLIGHT_SET_LUMEN, sendbuf, &send_buf_len);
  660 +
  661 + //2、写入数据
  662 + sendbuf[9] = LeftLumen;
  663 + sendbuf[10] = RightLumen;
  664 +
  665 + //3、发送帧
  666 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  667 +}
  668 +
  669 +//发送
  670 +
  671 +//查询探照灯频率
  672 +int JZsdk_Uart_SendDeal_Set_SearchLight_CheckStatus_Frequency(int Uartport)
  673 +{
  674 + printf("发送查询探照灯频率帧\n");
  675 +
  676 + char sendbuf[256];
  677 + int send_buf_len;
  678 +
  679 + //1、获取帧样板
  680 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_SEARCHLIGHT_FREQUENCY, sendbuf, &send_buf_len);
  681 +
  682 + //2、发送帧
  683 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  684 +}
  685 +
  686 +//查询探照灯亮度
  687 +int JZsdk_Uart_SendDeal_Set_SearchLight_CheckStatus_Lumen(int Uartport)
  688 +{
  689 + printf("发送查询探照灯亮度帧\n");
  690 +
  691 + char sendbuf[256];
  692 + int send_buf_len;
  693 +
  694 + //1、获取帧样板
  695 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_SEARCHLIGHT_LUMEN, sendbuf, &send_buf_len);
  696 +
  697 + //2、发送帧
  698 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  699 +}
  700 +
  701 +//查询探照灯模式
  702 +int JZsdk_Uart_SendDeal_Set_SearchLight_CheckStatus_Mode(int Uartport)
  703 +{
  704 + printf("发送查询探照灯模式帧\n");
  705 +
  706 + char sendbuf[256];
  707 + int send_buf_len;
  708 +
  709 + //1、获取帧样板
  710 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_SEARCHLIGHT_MODE, sendbuf, &send_buf_len);
  711 +
  712 + //2、发送帧
  713 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  714 +}
  715 +
  716 +//查询探照灯属性
  717 +int JZsdk_Uart_SendDeal_CheckStatus_LightAttribute(int Uartport)
  718 +{
  719 + printf("发送查询探照灯属性帧\n");
  720 +
  721 + char sendbuf[256];
  722 + int send_buf_len;
  723 +
  724 + //1、获取帧样板
  725 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_SEARCHLIGHT_LIGHTATTRIBUTE, sendbuf, &send_buf_len);
  726 +
  727 + //2、发送帧
  728 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  729 +}
  730 +
  731 +//查询探照灯温度
  732 +int JZsdk_Uart_SendDeal_CheckStatus_SearchLightTemperture(int Uartport)
  733 +{
  734 + printf("发送查询探照灯温度\n");
  735 +
  736 + char sendbuf[256];
  737 + int send_buf_len;
  738 +
  739 + //1、获取帧样板
  740 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_SEARCHLIGHT_TEMPERATURE, sendbuf, &send_buf_len);
  741 +
  742 + //2、发送帧
  743 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  744 +}
  745 +
  746 +//开启消息订阅
  747 +int JZsdk_Uart_SendDeal_MessageSubcription_Control(int Uartport, int value)
  748 +{
  749 + printf("发送开启消息订阅%d\n",value);
  750 +
  751 + char sendbuf[256];
  752 + int send_buf_len;
  753 +
  754 + //1、获取帧样板
  755 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_SEARCHLIGHT_MESSAGE_SUBSCRIPTION_CONTROL, sendbuf, &send_buf_len);
  756 +
  757 + //2、写入数据
  758 + sendbuf[10] = value;
  759 +
  760 + //3、发送帧
  761 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  762 +}
  763 +
  764 +/****************************************************************************************************************************************************
  765 +*
  766 +* 警灯部分
  767 +*
  768 +****************************************************************************************************************************************************/
  769 +/*************
  770 + *
  771 + * 设置警灯状态
  772 + *
  773 + * **************/
  774 +int JZsdk_Uart_SendDeal_Set_WarningLight_Status(int Uartport,int status, int mode)
  775 +{
  776 + printf("发送设置警灯状态\n");
  777 +
  778 + char sendbuf[256];
  779 + int send_buf_len;
  780 +
  781 + //1、获取帧样板
  782 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_WARNINGLIGHT_CONTROL, sendbuf, &send_buf_len);
  783 +
  784 + //2、写入数据
  785 + sendbuf[9] = status;
  786 + sendbuf[10] = mode;
  787 +
  788 + //3、发送帧
  789 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  790 +}
  791 +
  792 +/*************
  793 + *
  794 + * 设置警灯颜色
  795 + *
  796 + * **************/
  797 +int JZsdk_Uart_SendDeal_Set_WarningLight_Color(int Uartport,int color1, int color2)
  798 +{
  799 + printf("发送设置警灯颜色\n");
  800 +
  801 + char sendbuf[256];
  802 + int send_buf_len;
  803 +
  804 + //1、获取帧样板
  805 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_WARNINGLIGHT_COLOUR, sendbuf, &send_buf_len);
  806 +
  807 + //2、写入数据
  808 + sendbuf[9] = color1;
  809 + sendbuf[10] = color2;
  810 +
  811 + //3、发送帧
  812 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  813 +}
  814 +
  815 +//查询警灯状态
  816 +int JZsdk_Uart_SendDeal_CheckStatus_WarningLightStatus(int Uartport)
  817 +{
  818 + printf("发送查询警灯状态\n");
  819 +
  820 + char sendbuf[256];
  821 + int send_buf_len;
  822 +
  823 + //1、获取帧样板
  824 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_WARNINGLIGHT_STATUS, sendbuf, &send_buf_len);
  825 +
  826 + //2、发送帧
  827 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  828 +}
  829 +
  830 +//查询警灯颜色
  831 +int JZsdk_Uart_SendDeal_CheckStatus_WarningLightColor(int Uartport)
  832 +{
  833 + printf("发送查询警灯颜色\n");
  834 +
  835 + char sendbuf[256];
  836 + int send_buf_len;
  837 +
  838 + //1、获取帧样板
  839 + JZsdk_GetFrameTemplate(JZ_INSCODE_5AFRAME_CHECKSTATUS_WARNINGLIGHT_COLOR, sendbuf, &send_buf_len);
  840 +
  841 + //2、发送帧
  842 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  843 +}
  844 +
  845 +/****************************************************************************************************************************************************
  846 +*
  847 +* 5B类帧
  848 +*
  849 +****************************************************************************************************************************************************/
  850 +/*************
  851 + *
  852 + * 发送探照灯爆闪频率
  853 + *
  854 + * **************/
  855 +int JZsdk_Uart_SendDeal_SearchLight_Frequency(int Uartport, int Frequency)
  856 +{
  857 + printf("发送灯光频率帧\n");
  858 +
  859 + char sendbuf[256];
  860 + int send_buf_len;
  861 +
  862 + //1、获取帧样板
  863 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_CHECKSTATUS_SEARCHLIGHT_FREQUENCY, sendbuf, &send_buf_len);
  864 +
  865 + //2、写入数据
  866 + sendbuf[10] = Frequency;
  867 +
  868 + //3、发送帧
  869 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  870 +}
  871 +
  872 +/*************
  873 + *
  874 + * 发送探照灯模式
  875 + *
  876 + * **************/
  877 +int JZsdk_Uart_SendDeal_SearchLight_Mode(int Uartport, int mode)
  878 +{
  879 + printf("发送探照灯模式帧\n");
  880 +
  881 + char sendbuf[256];
  882 + int send_buf_len;
  883 +
  884 + //1、获取帧样板
  885 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_CHECKSTATUS_SEARCHLIGHT_MODE, sendbuf, &send_buf_len);
  886 +
  887 + //2、写入数据
  888 + sendbuf[10] = mode;
  889 +
  890 + //3、发送帧
  891 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  892 +}
  893 +
  894 +/*************
  895 + *
  896 + * 发送探照灯亮度
  897 + *
  898 + * **************/
  899 +int JZsdk_Uart_SendDeal_SearchLight_Lumen(int Uartport,int LeftLumen, int RightLumen)
  900 +{
  901 + printf("发送探照灯亮度帧\n");
  902 +
  903 + char sendbuf[256];
  904 + int send_buf_len;
  905 +
  906 + //1、获取帧样板
  907 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_CHECKSTATUS_SEARCHLIGHT_LUMEN, sendbuf, &send_buf_len);
  908 +
  909 + //2、写入数据
  910 + sendbuf[9] = LeftLumen;
  911 + sendbuf[10] = RightLumen;
  912 +
  913 + //3、发送帧
  914 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  915 +}
  916 +
  917 +/*************
  918 + *
  919 + * 发送探照灯温度
  920 + *
  921 + * **************/
  922 +int JZsdk_Uart_SendDeal_SearchLight_Temperature(int Uartport, int LeftTemperature, int RightTemperature)
  923 +{
  924 + printf("发送探照灯温度帧\n");
  925 +
  926 + char sendbuf[256];
  927 + int send_buf_len;
  928 +
  929 + //1、获取帧样板
  930 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_CHECKSTATUS_SEARCHLIGHT_TEMPERATURE, sendbuf, &send_buf_len);
  931 +
  932 + //2、写入数据
  933 + sendbuf[9] = LeftTemperature;
  934 + sendbuf[10] = RightTemperature;
  935 +
  936 + //3、发送帧
  937 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  938 +}
  939 +
  940 +
  941 +/*************
  942 + *
  943 + * 发送警灯状态
  944 + *
  945 + * **************/
  946 +int JZsdk_Uart_SendDeal_WarningLight_Status(int Uartport, int status, int mode)
  947 +{
  948 + printf("发送警灯状态帧\n");
  949 +
  950 + char sendbuf[256];
  951 + int send_buf_len;
  952 +
  953 + //1、获取帧样板
  954 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_CHECKSTATUS_WARNINGLIGHT_STATUS, sendbuf, &send_buf_len);
  955 +
  956 + //2、写入数据
  957 + sendbuf[9] = status;
  958 + sendbuf[10] = mode;
  959 +
  960 + //3、发送帧
  961 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len); }
  962 +
  963 +/*************
  964 + *
  965 + * 发送警灯颜色
  966 + *
  967 + * **************/
  968 +int JZsdk_Uart_SendDeal_WarningLight_Color(int Uartport, int color1, int color2)
  969 +{
  970 + printf("发送警灯颜色帧\n");
  971 +
  972 + char sendbuf[256];
  973 + int send_buf_len;
  974 +
  975 + //1、获取帧样板
  976 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_CHECKSTATUS_WARNINGLIGHT_COLOR, sendbuf, &send_buf_len);
  977 +
  978 + //2、写入数据
  979 + sendbuf[9] = color1;
  980 + sendbuf[10] = color2;
  981 +
  982 + //3、发送帧
  983 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  984 +}
  985 +
  986 +/*************
  987 + *
  988 + * 发送对外电源状态
  989 + *
  990 + * **************/
  991 +int JZsdk_Uart_SendDeal_OutputPowerStatus(int Uartport, int FrameSequence, int status)
  992 +{
  993 + printf("发送对外电源状态帧\n");
  994 +
  995 + char sendbuf[256];
  996 + int send_buf_len;
  997 +
  998 + //1、获取帧样板
  999 + JZsdk_GetFrameTemplate(JZ_INSCODE_5BFRAME_CHECKSTATUS_OUTPUTPOWER, sendbuf, &send_buf_len);
  1000 +
  1001 + //2、写入数据
  1002 + sendbuf[9] = status;
  1003 +
  1004 + //3、发送帧
  1005 + JZsdk_Uart_SendDeal_SendOreder(Uartport ,sendbuf, send_buf_len);
  1006 +}
@@ -22,6 +22,8 @@ extern "C" { @@ -22,6 +22,8 @@ extern "C" {
22 22
23 /* Exported types ------------------------------------------------------------*/ 23 /* Exported types ------------------------------------------------------------*/
24 int JZsdk_Uart_SendDeal_Send_Connect(int Uartport ,int Version_flag); 24 int JZsdk_Uart_SendDeal_Send_Connect(int Uartport ,int Version_flag);
  25 +int JZsdk_Uart_SendDeal_SendOreder(int UartPort ,char *sendbuf, int len);
  26 +int JZsdk_Uart_SendDeal_ConnectFrame(int PortNum);
25 27
26 int JZsdk_Uart_SendDeal_Reply_SecondaryDeviceName(int Uartport , int device_name, int FrameSequence); 28 int JZsdk_Uart_SendDeal_Reply_SecondaryDeviceName(int Uartport , int device_name, int FrameSequence);
27 int JZsdk_Uart_SendDeal_QuerySecondaryDeviceName(int Uartport ,int FrameSequence); 29 int JZsdk_Uart_SendDeal_QuerySecondaryDeviceName(int Uartport ,int FrameSequence);
@@ -37,6 +39,7 @@ int JZsdk_Uart_SendDeal_Send_PlayStatus_end(int Uartport); @@ -37,6 +39,7 @@ int JZsdk_Uart_SendDeal_Send_PlayStatus_end(int Uartport);
37 int JZsdk_Uart_SendDeal_Send_PlayStatus(int Uartport ,int num); 39 int JZsdk_Uart_SendDeal_Send_PlayStatus(int Uartport ,int num);
38 int JZsdk_Uart_SendDeal_Reply_MusicName(int Uartport ,char *music_name, int music_name_len); 40 int JZsdk_Uart_SendDeal_Reply_MusicName(int Uartport ,char *music_name, int music_name_len);
39 int JZsdk_Uart_SendDeal_Reply_Volume(int Uartport ,int num); 41 int JZsdk_Uart_SendDeal_Reply_Volume(int Uartport ,int num);
  42 +int JZsdk_Uart_SendDeal_OpusDecodeStatus(int Uartport,int value);
40 43
41 int JZsdk_Uart_SendDeal_Reply_GimbalPitchAngle(int Uartport ,int angle); 44 int JZsdk_Uart_SendDeal_Reply_GimbalPitchAngle(int Uartport ,int angle);
42 int JZsdk_Uart_SendDeal_Set_GimbalPitchAngle(int Uartport ,int angle); 45 int JZsdk_Uart_SendDeal_Set_GimbalPitchAngle(int Uartport ,int angle);
@@ -20,7 +20,8 @@ typedef struct @@ -20,7 +20,8 @@ typedef struct
20 char Message[1024]; // 传递的字符串 20 char Message[1024]; // 传递的字符串
21 int MessageLength; // 字符串的长度 21 int MessageLength; // 字符串的长度
22 int ResLen; //剩余长度 22 int ResLen; //剩余长度
23 - pthread_mutex_t mutex; // 互斥锁 23 + pthread_mutex_t WriteMutex; // 互斥锁
  24 + pthread_mutex_t ReadMutex; // 互斥锁
24 pthread_cond_t cond; // 条件变量 25 pthread_cond_t cond; // 条件变量
25 } s_SerialArgs; 26 } s_SerialArgs;
26 27
@@ -86,7 +87,9 @@ int JZsdk_Uart_UartDeal_Receive(int Uart_fd, int Uart_Dev_name) @@ -86,7 +87,9 @@ int JZsdk_Uart_UartDeal_Receive(int Uart_fd, int Uart_Dev_name)
86 parameter->UartDevName = Uart_Dev_name; 87 parameter->UartDevName = Uart_Dev_name;
87 parameter->MessageLength = 0; 88 parameter->MessageLength = 0;
88 memset(parameter->Message, 0, sizeof(parameter->Message)); 89 memset(parameter->Message, 0, sizeof(parameter->Message));
89 - pthread_mutex_init(&parameter->mutex, NULL); 90 + pthread_mutex_init(&parameter->WriteMutex, NULL);
  91 + pthread_mutex_init(&parameter->ReadMutex, NULL);
  92 +
90 pthread_cond_init(&parameter->cond, NULL); 93 pthread_cond_init(&parameter->cond, NULL);
91 94
92 // 创建串口数据接收线程 95 // 创建串口数据接收线程
@@ -124,7 +127,6 @@ static void *UartDeal_rece(void *arg) @@ -124,7 +127,6 @@ static void *UartDeal_rece(void *arg)
124 s_SerialArgs *args = (s_SerialArgs *)arg; 127 s_SerialArgs *args = (s_SerialArgs *)arg;
125 struct timeval timeout; // 超时时间 128 struct timeval timeout; // 超时时间
126 fd_set fs_read; 129 fd_set fs_read;
127 - static int ResidualLength = 0; // 未处理数据长度  
128 130
129 int Uart_fd = args->UartFd; 131 int Uart_fd = args->UartFd;
130 132
@@ -155,44 +157,71 @@ static void *UartDeal_rece(void *arg) @@ -155,44 +157,71 @@ static void *UartDeal_rece(void *arg)
155 while (*TheadSwtch) 157 while (*TheadSwtch)
156 { 158 {
157 FD_ZERO(&fs_read); 159 FD_ZERO(&fs_read);
158 - FD_SET(Uart_fd,&fs_read); 160 + FD_SET(Uart_fd, &fs_read);
159 161
160 - timeout.tv_sec = 0; // 秒数设置为0  
161 - timeout.tv_usec = 100000; // 微秒数设置为100000（100毫秒）  
162 -  
163 - // 检查fs_read套节字是否有数据  
164 - select(Uart_fd + 1, &fs_read, NULL, NULL, &timeout);  
165 - delayMs(3); // 加多了可能导致实时播放难恢复,以及声音间隔 3ms32字节 会向上约1个3ms opus一帧80字节 162 + timeout.tv_sec = 0;
  163 + timeout.tv_usec = 100000; // 设置为可变的超时时间（100毫秒）
166 164
167 - if (FD_ISSET(Uart_fd, &fs_read)) 165 + // 检查fs_read套接字是否有数据
  166 + int ret = select(Uart_fd + 1, &fs_read, NULL, NULL, &timeout);
  167 + if (ret == -1) {
  168 + // 发生错误
  169 + JZSDK_LOG_ERROR("串口select出错");
  170 + break;
  171 + } else if (ret == 0)
168 { 172 {
  173 + // 超时
  174 + continue;
  175 + }
169 176
170 - // 如果有数据就加锁  
171 - pthread_mutex_lock(&args->mutex); 177 + // 如果有数据就加锁
  178 + pthread_mutex_lock(&args->WriteMutex);
172 179
173 - // 1、读取串口内容 ret 接收长度 getbuf 获取的字符  
174 - ResidualLength = args->MessageLength;  
175 - args->MessageLength = read(Uart_fd, &(args->Message[args->MessageLength]), (sizeof(args->Message) - ResidualLength)) + ResidualLength; 180 + // 读取串口内容
  181 + int bytesRead = read(Uart_fd, &(args->Message[args->ResLen]), (sizeof(args->Message) - args->ResLen));
  182 + if (bytesRead > 0)
  183 + {
  184 + args->MessageLength = args->ResLen + bytesRead;
176 185
177 - // JZSDK_LOG_INFO("从串口读取到,长度%d",(args->MessageLength-ResidualLength)); 186 + // data_len+=bytesRead;
  187 + // data_len2+=args->MessageLength;
  188 + // printf("当前接收长度%d bytesRead%d bmessage%d reslen%d\n",data_len,bytesRead,data_len2,args->ResLen);
178 189
179 - // for (int i = 0; i < (args->MessageLength-ResidualLength); i++)  
180 - // {  
181 - // JZSDK_LOG_OUTPUTHEX("%s",&args->Message[i+ResidualLength]);  
182 - // } 190 + args->ResLen = 0;
183 191
184 - // 通知线程  
185 - pthread_cond_signal(&args->cond);  
186 - pthread_mutex_unlock(&args->mutex); // 解锁 192 + // // JZSDK_LOG_INFO("从串口读取到,长度%d",(args->MessageLength-ResidualLength));
  193 +
  194 + // // for (int i = 0; i < (args->MessageLength-ResidualLength); i++)
  195 + // // {
  196 + // // JZSDK_LOG_OUTPUTHEX("%s",&args->Message[i+ResidualLength]);
  197 + // // }
  198 + }
  199 + else if (bytesRead == 0)
  200 + {
  201 + // 串口关闭或者无数据可读
  202 + break;
  203 + }
  204 + else
  205 + {
  206 + // 读取错误发生
  207 + JZSDK_LOG_ERROR("Error reading from serial port");
  208 + break;
187 } 209 }
188 210
  211 + // 通知线程
  212 + //pthread_cond_signal(&args->cond);
  213 + pthread_mutex_unlock(&args->ReadMutex); // 解锁
  214 +
  215 + // 添加适当延时，确保接收缓冲区完全填满
  216 + delayMs(3); // 加多了可能导致实时播放难恢复,以及声音间隔 3ms32字节 会向上约1个3ms opus一帧80字节
189 } 217 }
190 218
191 //注销相关 219 //注销相关
192 Recv_Thread = JZ_FLAGCODE_OFF; 220 Recv_Thread = JZ_FLAGCODE_OFF;
193 // 通知线程 221 // 通知线程
194 - pthread_cond_signal(&args->cond);  
195 - pthread_mutex_unlock(&args->mutex); // 解锁 222 + //pthread_cond_signal(&args->cond);
  223 + pthread_mutex_unlock(&args->WriteMutex); // 解锁
  224 +
196 JZSDK_LOG_WARN("串口接收线程被关闭"); 225 JZSDK_LOG_WARN("串口接收线程被关闭");
197 } 226 }
198 227
@@ -225,22 +254,28 @@ static void *UartDeal_deal(void *arg) @@ -225,22 +254,28 @@ static void *UartDeal_deal(void *arg)
225 Uart_DEV2_Switch = JZ_FLAGCODE_ON; 254 Uart_DEV2_Switch = JZ_FLAGCODE_ON;
226 } 255 }
227 256
  257 + //int data_len = 0;
  258 +
228 while (*TheadSwtch) 259 while (*TheadSwtch)
229 { 260 {
230 261
231 // 加锁 262 // 加锁
232 - pthread_mutex_lock(&args->mutex); 263 + pthread_mutex_lock(&args->ReadMutex);
233 264
234 // 等候接收线程的通知 265 // 等候接收线程的通知
235 - pthread_cond_wait(&args->cond, &args->mutex); 266 + //pthread_cond_wait(&args->cond, &args->mutex);
  267 +
  268 + // data_len+=args->MessageLength;
  269 + // printf("当前处理长度%d\n",data_len);
236 270
237 if (args->MessageLength > 0) 271 if (args->MessageLength > 0)
238 { 272 {
  273 +
239 //清除错误的多余半帧 274 //清除错误的多余半帧
240 //前面有帧的长度 275 //前面有帧的长度
241 if(args->ResLen != 0) 276 if(args->ResLen != 0)
242 { 277 {
243 - //第二轮开头是帧头，则清空前半段帧 278 + //存在第一帧，同时第二轮的数据开头是帧头，则清空前半段第一帧
244 if ( (args->Message[args->ResLen ] == 0x5A) 279 if ( (args->Message[args->ResLen ] == 0x5A)
245 && (args->Message[args->ResLen + 1] == 0x5A) 280 && (args->Message[args->ResLen + 1] == 0x5A)
246 && (args->Message[args->ResLen + 2] == 0x77) ) 281 && (args->Message[args->ResLen + 2] == 0x77) )
@@ -256,24 +291,37 @@ static void *UartDeal_deal(void *arg) @@ -256,24 +291,37 @@ static void *UartDeal_deal(void *arg)
256 memset(&args->Message[temp_num], 0, (args->MessageLength - temp_num)); 291 memset(&args->Message[temp_num], 0, (args->MessageLength - temp_num));
257 args->MessageLength = temp_num; 292 args->MessageLength = temp_num;
258 args->ResLen = 0; 293 args->ResLen = 0;
  294 +
  295 + JZSDK_LOG_ERROR("串口上一帧为不完全帧，舍弃该帧操作");
259 } 296 }
260 } 297 }
261 298
262 // 处理数据 299 // 处理数据
263 ResidualLength = UartDeal_Recv_interface(args->UartFd, args->Message, args->MessageLength); 300 ResidualLength = UartDeal_Recv_interface(args->UartFd, args->Message, args->MessageLength);
  301 + //如果还有剩余的长度
  302 + if (ResidualLength != 0)
  303 + {
  304 + memcpy(args->Message, &(args->Message[args->MessageLength - ResidualLength]), ResidualLength);
  305 + memset(&(args->Message[ResidualLength]), 0, (sizeof(args->Message) - ResidualLength));
  306 + args->MessageLength = 0;
  307 + args->ResLen = ResidualLength;
  308 + }
  309 + else
  310 + {
  311 + memset(args->Message, 0, sizeof(args->Message));
  312 + args->MessageLength = 0;
  313 + args->ResLen = 0;
  314 + }
264 315
265 - memcpy(args->Message, &(args->Message[args->MessageLength - ResidualLength]), ResidualLength);  
266 - memset(&(args->Message[ResidualLength]), 0, (sizeof(args->Message) - ResidualLength));  
267 - args->MessageLength = ResidualLength;  
268 - args->ResLen = ResidualLength;  
269 } 316 }
270 else 317 else
271 { 318 {
272 memset(args->Message, 0, sizeof(args->Message)); 319 memset(args->Message, 0, sizeof(args->Message));
273 args->MessageLength = 0; 320 args->MessageLength = 0;
  321 + args->ResLen = 0;
274 } 322 }
275 323
276 - pthread_mutex_unlock(&args->mutex); // 解锁 324 + pthread_mutex_unlock(&args->WriteMutex); // 解锁
277 } 325 }
278 326
279 Deal_Thread = JZ_FLAGCODE_OFF; 327 Deal_Thread = JZ_FLAGCODE_OFF;
@@ -288,7 +336,7 @@ static void *UartDeal_deal(void *arg) @@ -288,7 +336,7 @@ static void *UartDeal_deal(void *arg)
288 */ 336 */
289 static int UartDeal_Recv_Ouput(int Uart_fd, unsigned char *getbuf, int ReadLen) 337 static int UartDeal_Recv_Ouput(int Uart_fd, unsigned char *getbuf, int ReadLen)
290 { 338 {
291 - //JZSDK_LOG_INFO("UartDeal_Recv_Ouput排出函数"); 339 + //JZSDK_LOG_INFO("UartDeal_Recv_Ouput排出函数%d",ReadLen);
292 340
293 if (Uart_fd == Uart_DEV1_fd) 341 if (Uart_fd == Uart_DEV1_fd)
294 { 342 {
@@ -318,15 +366,15 @@ static int UartDeal_Recv_interface(int Uart_fd, unsigned char *getbuf, int getbu @@ -318,15 +366,15 @@ static int UartDeal_Recv_interface(int Uart_fd, unsigned char *getbuf, int getbu
318 { 366 {
319 if (Uart_fd == Uart_DEV1_fd) 367 if (Uart_fd == Uart_DEV1_fd)
320 { 368 {
321 - JZSDK_LOG_INFO("串口-设备1号,接受到数据len: %d", getbufLen); 369 + JZSDK_LOG_INFO("串口-设备1号,接受到数据+未处理数据的长度len: %d", getbufLen);
322 } 370 }
323 else if (Uart_fd == Uart_DEV2_fd) 371 else if (Uart_fd == Uart_DEV2_fd)
324 { 372 {
325 - JZSDK_LOG_INFO("串口-设备2号,接受到数据len: %d ", getbufLen); 373 + JZSDK_LOG_INFO("串口-设备2号,接受到数据+未处理数据的长度len: %d", getbufLen);
326 } 374 }
327 else if (Uart_fd == Uart_4G_fd) 375 else if (Uart_fd == Uart_4G_fd)
328 { 376 {
329 - JZSDK_LOG_INFO("串口-设备4G,接受到数据len: %d ", getbufLen); 377 + JZSDK_LOG_INFO("串口-设备4G,接受到数据+未处理数据的长度len: %d", getbufLen);
330 } 378 }
331 else 379 else
332 { 380 {
@@ -350,89 +398,123 @@ static int UartDeal_Recv_interface(int Uart_fd, unsigned char *getbuf, int getbu @@ -350,89 +398,123 @@ static int UartDeal_Recv_interface(int Uart_fd, unsigned char *getbuf, int getbu
350 // 检索出帧数据 398 // 检索出帧数据
351 399
352 // 遍历数据找帧头，直到数据的倒数第4位，如果这里有帧，帧存在帧头3位+数据长度两位 400 // 遍历数据找帧头，直到数据的倒数第4位，如果这里有帧，帧存在帧头3位+数据长度两位
353 - for (HaveReadLen = 0; HaveReadLen < getbufLen - 4; HaveReadLen++) 401 +
  402 + //printf("遍历开始\n");
  403 + for (HaveReadLen = 0; HaveReadLen < (getbufLen - 4); )
354 { 404 {
355 // 1、如果找到 5A 5B 6A 6B 判断是否是帧 405 // 1、如果找到 5A 5B 6A 6B 判断是否是帧
356 switch (getbuf[HaveReadLen]) 406 switch (getbuf[HaveReadLen])
357 { 407 {
358 case 0x5A: 408 case 0x5A:
359 - if (getbuf[HaveReadLen + 1] == 0x5A || getbuf[HaveReadLen + 2] == 0x77) 409 + if ( (getbuf[HaveReadLen + 1] == 0x5A) && (getbuf[HaveReadLen + 2] == 0x77))
360 { 410 {
  411 + //JZSDK_LOG_INFO("输入5A");
361 FrameFlag = 0x5A; 412 FrameFlag = 0x5A;
  413 + break;
  414 + }
  415 + else
  416 + {
  417 + FrameFlag = 0x00;
  418 + break;
362 } 419 }
363 - break;  
364 420
365 case 0x5B: 421 case 0x5B:
366 - if (getbuf[HaveReadLen + 1] == 0x5B || getbuf[HaveReadLen + 2] == 0x77) 422 + if ((getbuf[HaveReadLen + 1] == 0x5B) && (getbuf[HaveReadLen + 2] == 0x77))
367 { 423 {
  424 + //JZSDK_LOG_INFO("输入5B");
368 FrameFlag = 0x5B; 425 FrameFlag = 0x5B;
  426 + break;
  427 + }
  428 + else
  429 + {
  430 + FrameFlag = 0x00;
  431 + break;
369 } 432 }
370 - break;  
371 433
372 case 0x6A: 434 case 0x6A:
373 - if (getbuf[HaveReadLen + 1] == 0x6A || getbuf[HaveReadLen + 2] == 0x77) 435 + if ((getbuf[HaveReadLen + 1] == 0x6A) && (getbuf[HaveReadLen + 2] == 0x77))
374 { 436 {
  437 + //JZSDK_LOG_INFO("输入6A");
375 FrameFlag = 0x6A; 438 FrameFlag = 0x6A;
  439 + break;
  440 + }
  441 + else
  442 + {
  443 + FrameFlag = 0x00;
  444 + break;
376 } 445 }
377 - break;  
378 446
379 case 0x6B: 447 case 0x6B:
380 - if (getbuf[HaveReadLen + 1] == 0x6B || getbuf[HaveReadLen + 2] == 0x77) 448 + if ((getbuf[HaveReadLen + 1] == 0x6B) && (getbuf[HaveReadLen + 2] == 0x77))
381 { 449 {
  450 + //JZSDK_LOG_INFO("输入6B");
382 FrameFlag = 0x6B; 451 FrameFlag = 0x6B;
  452 + break;
  453 + }
  454 + else
  455 + {
  456 + FrameFlag = 0x00;
  457 + break;
383 } 458 }
384 - break;  
385 459
386 default: 460 default:
  461 + FrameFlag = 0x00;
387 break; 462 break;
388 } 463 }
389 464
390 - // 2、如果没有帧头，直接continue  
391 if (FrameFlag == 0) 465 if (FrameFlag == 0)
392 { 466 {
  467 + if (HaveReadLen >= (getbufLen - 5))
  468 + {
  469 + //JZSDK_LOG_INFO("没有找到帧头");
  470 + }
  471 + HaveReadLen++;
393 continue; 472 continue;
394 } 473 }
395 - 474 +
396 // 3、如果有帧头,则先判断前面有没有多余的数据残留,并将其排出到处理线程 475 // 3、如果有帧头,则先判断前面有没有多余的数据残留,并将其排出到处理线程
397 if ((HaveReadLen - HaveDealLen) > 0) 476 if ((HaveReadLen - HaveDealLen) > 0)
398 { 477 {
399 - //JZSDK_LOG_INFO("多余处理"); 478 + //JZSDK_LOG_INFO("残余处理%d",(HaveReadLen - HaveDealLen));
400 UartDeal_Recv_Ouput(Uart_fd, &getbuf[HaveDealLen], (HaveReadLen - HaveDealLen)); 479 UartDeal_Recv_Ouput(Uart_fd, &getbuf[HaveDealLen], (HaveReadLen - HaveDealLen));
401 HaveDealLen = HaveReadLen; 480 HaveDealLen = HaveReadLen;
402 } 481 }
403 482
404 // 4、检查帧长度是否超过数组剩余内容 483 // 4、检查帧长度是否超过数组剩余内容
405 - FrameLen = (getbuf[3] << 8) + getbuf[4]; 484 + FrameLen = (((int)getbuf[HaveReadLen+3]) << 8) + (int)getbuf[HaveReadLen+4];
406 if (FrameLen > (getbufLen - HaveReadLen)) 485 if (FrameLen > (getbufLen - HaveReadLen))
407 { 486 {
  487 + JZSDK_LOG_INFO("当前帧长度位长度%d 超出剩余帧长度%d ",FrameLen,(getbufLen - HaveReadLen));
408 // 直接跳出for循环 488 // 直接跳出for循环
409 break; 489 break;
410 } 490 }
411 491
412 // 5、以上检查都没问题，则正常输出帧 492 // 5、以上检查都没问题，则正常输出帧
  493 + //JZSDK_LOG_INFO("正常输出帧%d",FrameLen);
413 UartDeal_Recv_Ouput(Uart_fd, &getbuf[HaveReadLen], FrameLen); 494 UartDeal_Recv_Ouput(Uart_fd, &getbuf[HaveReadLen], FrameLen);
414 - HaveReadLen = HaveReadLen + FrameLen;  
415 - FrameLen = 0; 495 + HaveReadLen = HaveReadLen + FrameLen;
416 HaveDealLen = HaveReadLen; 496 HaveDealLen = HaveReadLen;
417 - FrameFlag = 0;  
418 497
419 - //JZSDK_LOG_INFO("UartDeal_Recv_interface frame%d read%d deal%d get%d",FrameLen ,HaveReadLen ,HaveDealLen, getbufLen); 498 + JZSDK_LOG_INFO("framelen%d read%d [read]:%x get%d",FrameLen ,HaveReadLen, getbuf[HaveReadLen], getbufLen);
  499 +
  500 + FrameLen = 0;
  501 + FrameFlag = 0;
420 } 502 }
421 503
422 - //JZSDK_LOG_INFO("UartDeal_Recv_Ouput%d %d",HaveDealLen, getbufLen); 504 + //JZSDK_LOG_INFO("UartDeal_Recv_Ouput%d %d %d",HaveDealLen,HaveReadLen , getbufLen);
423 505
424 // 如果没有数据残留了 506 // 如果没有数据残留了
425 - if (HaveDealLen >= getbufLen) 507 + if (HaveDealLen >= getbufLen)
426 { 508 {
427 //printf("HaveReadLen:%d HaveDealLen%d getbufLen:%d\n",HaveReadLen,HaveDealLen,getbufLen); 509 //printf("HaveReadLen:%d HaveDealLen%d getbufLen:%d\n",HaveReadLen,HaveDealLen,getbufLen);
428 return 0; 510 return 0;
429 } 511 }
430 512
431 // 如果是有帧头的情况跳出的，说明是帧被切了，需要返回帧长度给接收线程 513 // 如果是有帧头的情况跳出的，说明是帧被切了，需要返回帧长度给接收线程
432 - if (FrameFlag != 0) 514 + if (FrameFlag != 0) //bu
433 { 515 {
434 // 1、判断帧的长度会不会不合理，帧的长度最大为文件名帧，其长度为9+2+400 516 // 1、判断帧的长度会不会不合理，帧的长度最大为文件名帧，其长度为9+2+400
435 - if (FrameLen > (9 + 2 + 128)) 517 + if (FrameLen > (9 + 2 + 400))
436 { 518 {
437 // 将其排出不返回 519 // 将其排出不返回
438 UartDeal_Recv_Ouput(Uart_fd, &getbuf[HaveReadLen], (getbufLen - HaveReadLen)); 520 UartDeal_Recv_Ouput(Uart_fd, &getbuf[HaveReadLen], (getbufLen - HaveReadLen));
@@ -440,12 +522,15 @@ static int UartDeal_Recv_interface(int Uart_fd, unsigned char *getbuf, int getbu @@ -440,12 +522,15 @@ static int UartDeal_Recv_interface(int Uart_fd, unsigned char *getbuf, int getbu
440 return 0; 522 return 0;
441 } 523 }
442 524
  525 + printf("切帧返回%d\n",(getbufLen - HaveDealLen));
  526 +
443 // 2、如果合理，则返回剩余长度 527 // 2、如果合理，则返回剩余长度
444 return (getbufLen - HaveDealLen); 528 return (getbufLen - HaveDealLen);
445 } 529 }
446 530
447 // 如果是没有帧头的情况下跳出的 531 // 如果是没有帧头的情况下跳出的
448 // 1、先检查 未经检查最后 最后4 3位 532 // 1、先检查 未经检查最后 最后4 3位
  533 + //如果还有4 或者 3 位未处理
449 for (; HaveReadLen < getbufLen - 2; HaveReadLen++) 534 for (; HaveReadLen < getbufLen - 2; HaveReadLen++)
450 { 535 {
451 if ((getbuf[HaveReadLen] == 0x5A && getbuf[HaveReadLen + 1] == 0x5A && getbuf[HaveReadLen + 2] == 0x77) || 536 if ((getbuf[HaveReadLen] == 0x5A && getbuf[HaveReadLen + 1] == 0x5A && getbuf[HaveReadLen + 2] == 0x77) ||
@@ -459,46 +544,58 @@ static int UartDeal_Recv_interface(int Uart_fd, unsigned char *getbuf, int getbu @@ -459,46 +544,58 @@ static int UartDeal_Recv_interface(int Uart_fd, unsigned char *getbuf, int getbu
459 HaveDealLen = HaveReadLen; 544 HaveDealLen = HaveReadLen;
460 } 545 }
461 546
  547 + printf("检查最后3 4位%d\n",(getbufLen - HaveDealLen));
  548 +
462 return (getbufLen - HaveDealLen); 549 return (getbufLen - HaveDealLen);
463 } 550 }
464 } 551 }
465 552
466 // 2、检查最后两位 553 // 2、检查最后两位
467 - if ((getbuf[HaveReadLen] == 0x5A && getbuf[HaveReadLen + 1] == 0x5A) || 554 + // 如果还有两位未处理
  555 + for (; HaveReadLen < getbufLen - 1; HaveReadLen++)
  556 + {
  557 + if ((getbuf[HaveReadLen] == 0x5A && getbuf[HaveReadLen + 1] == 0x5A) ||
468 (getbuf[HaveReadLen] == 0x5B && getbuf[HaveReadLen + 1] == 0x5B) || 558 (getbuf[HaveReadLen] == 0x5B && getbuf[HaveReadLen + 1] == 0x5B) ||
469 (getbuf[HaveReadLen] == 0x6A && getbuf[HaveReadLen + 1] == 0x6A) || 559 (getbuf[HaveReadLen] == 0x6A && getbuf[HaveReadLen + 1] == 0x6A) ||
470 (getbuf[HaveReadLen] == 0x6B && getbuf[HaveReadLen + 1] == 0x6B)) 560 (getbuf[HaveReadLen] == 0x6B && getbuf[HaveReadLen + 1] == 0x6B))
471 - {  
472 - if ((HaveReadLen - HaveDealLen) > 0)  
473 { 561 {
474 - UartDeal_Recv_Ouput(Uart_fd, &getbuf[HaveDealLen], (HaveReadLen - HaveDealLen));  
475 - HaveDealLen = HaveReadLen;  
476 - } 562 + if ((HaveReadLen - HaveDealLen) > 0)
  563 + {
  564 + UartDeal_Recv_Ouput(Uart_fd, &getbuf[HaveDealLen], (HaveReadLen - HaveDealLen));
  565 + HaveDealLen = HaveReadLen;
  566 + }
477 567
478 - return (getbufLen - HaveDealLen); 568 + printf("检查最后两位%d\n",(getbufLen - HaveDealLen));
  569 +
  570 + return (getbufLen - HaveDealLen);
  571 + }
479 } 572 }
480 - HaveReadLen++;  
481 573
482 - // 1、检查最后一位  
483 - if (getbuf[HaveReadLen] == 0x5A ||  
484 - getbuf[HaveReadLen] == 0x5B ||  
485 - getbuf[HaveReadLen] == 0x6A ||  
486 - getbuf[HaveReadLen] == 0x6B) 574 + // 2、检查最后一位
  575 + // 如果还有一位未处理
  576 + for (; HaveReadLen < getbufLen - 0; HaveReadLen++)
487 { 577 {
488 - if ((HaveReadLen - HaveDealLen) > 0) 578 + // 1、检查最后一位
  579 + if (getbuf[HaveReadLen] == 0x5A ||
  580 + getbuf[HaveReadLen] == 0x5B ||
  581 + getbuf[HaveReadLen] == 0x6A ||
  582 + getbuf[HaveReadLen] == 0x6B)
489 { 583 {
490 - UartDeal_Recv_Ouput(Uart_fd, &getbuf[HaveDealLen], (HaveReadLen - HaveDealLen));  
491 - HaveDealLen = HaveReadLen;  
492 - } 584 + if ((HaveReadLen - HaveDealLen) > 0)
  585 + {
  586 + UartDeal_Recv_Ouput(Uart_fd, &getbuf[HaveDealLen], (HaveReadLen - HaveDealLen));
  587 + HaveDealLen = HaveReadLen;
  588 + }
493 589
494 - return (getbufLen - HaveDealLen); 590 + printf("检查最后一位%d\n",(getbufLen - HaveDealLen));
  591 +
  592 + return (getbufLen - HaveDealLen);
  593 + }
495 } 594 }
496 - HaveReadLen++;  
497 595
498 // 都检查完了，还是没有帧头在里面, 将剩余的所有数据排出 596 // 都检查完了，还是没有帧头在里面, 将剩余的所有数据排出
499 UartDeal_Recv_Ouput(Uart_fd, &getbuf[HaveDealLen], (HaveReadLen - HaveDealLen)); 597 UartDeal_Recv_Ouput(Uart_fd, &getbuf[HaveDealLen], (HaveReadLen - HaveDealLen));
500 -  
501 - // printf("HaveReadLen:%d HaveDealLen%d getbufLen:%d\n",HaveReadLen,HaveDealLen,getbufLen); 598 + printf("检查完毕,排出剩余数据HaveReadLen:%d HaveDealLen%d getbufLen:%d\n",HaveReadLen,HaveDealLen,getbufLen);
502 599
503 return 0; 600 return 0;
504 } 601 }
1 #include <stdio.h> 1 #include <stdio.h>
2 #include <stdlib.h> 2 #include <stdlib.h>
3 #include <string.h> 3 #include <string.h>
  4 +#include <pthread.h>
4 5
5 6
6 #include "../CameraParameter.h" 7 #include "../CameraParameter.h"
@@ -23,8 +24,8 @@ extern int Camera_PushVideoInitFlag; @@ -23,8 +24,8 @@ extern int Camera_PushVideoInitFlag;
23 24
24 pthread_mutex_t FrameDealMutex; 25 pthread_mutex_t FrameDealMutex;
25 26
26 -  
27 -static void FrameDeal_PsdkPushFrame(char* h264_data, uint32_t data_len, int AudLength) 27 +//推流入口
  28 +static void CameraFeatures_PsdkPushFrame(char* h264_data, uint32_t data_len, int AudLength)
28 { 29 {
29 30
30 unsigned int FrameBufSize = 0; 31 unsigned int FrameBufSize = 0;
@@ -41,9 +42,10 @@ static void FrameDeal_PsdkPushFrame(char* h264_data, uint32_t data_len, int AudL @@ -41,9 +42,10 @@ static void FrameDeal_PsdkPushFrame(char* h264_data, uint32_t data_len, int AudL
41 { 42 {
42 //printf("普通h264\n"); 43 //printf("普通h264\n");
43 } 44 }
44 - 45 +
  46 + //放入到对应的传输函数
45 #if APP_VERSION == APP_PSDK 47 #if APP_VERSION == APP_PSDK
46 - //放入到对应的传输函数 48 + //大疆模式，往大疆入口推流
47 DJI_VideoDeal_Push_DJIH264Frame(h264_data, FrameBufSize); 49 DJI_VideoDeal_Push_DJIH264Frame(h264_data, FrameBufSize);
48 #endif 50 #endif
49 51
@@ -101,7 +103,7 @@ static void *JZsdk_CameraFrameDeal_thread(void *args) @@ -101,7 +103,7 @@ static void *JZsdk_CameraFrameDeal_thread(void *args)
101 //FrameDeal_ShootPhotoBurstDeal(FrameDealBuffer, FrameLength); 103 //FrameDeal_ShootPhotoBurstDeal(FrameDealBuffer, FrameLength);
102 104
103 //推送一帧 105 //推送一帧
104 - FrameDeal_PsdkPushFrame(FrameDealBuffer, FrameLength, AudLength); 106 + CameraFeatures_PsdkPushFrame(FrameDealBuffer, FrameLength, AudLength);
105 107
106 free(FrameDealBuffer); 108 free(FrameDealBuffer);
107 } 109 }
@@ -111,7 +113,7 @@ static void *JZsdk_CameraFrameDeal_thread(void *args) @@ -111,7 +113,7 @@ static void *JZsdk_CameraFrameDeal_thread(void *args)
111 pthread_exit(NULL); 113 pthread_exit(NULL);
112 } 114 }
113 115
114 -int JZsdk_CameraFrameDeal_thread_Init() 116 +T_JZsdkReturnCode CameraFeatures_FrameDeal_thread_Init()
115 { 117 {
116 pthread_mutex_init(&FrameDealMutex, NULL); // 创建互斥锁 118 pthread_mutex_init(&FrameDealMutex, NULL); // 创建互斥锁
117 119
@@ -120,7 +122,7 @@ int JZsdk_CameraFrameDeal_thread_Init() @@ -120,7 +122,7 @@ int JZsdk_CameraFrameDeal_thread_Init()
120 pthread_create(&FrameDeal_thread, NULL, JZsdk_CameraFrameDeal_thread, NULL); 122 pthread_create(&FrameDeal_thread, NULL, JZsdk_CameraFrameDeal_thread, NULL);
121 } 123 }
122 124
123 -int FrameDeal_FrameDealThread_UnlockFun() 125 +T_JZsdkReturnCode CameraFeatures_FrameDealThread_UnlockFun()
124 { 126 {
125 //解锁帧处理线程 127 //解锁帧处理线程
126 pthread_mutex_unlock(&FrameDealMutex); 128 pthread_mutex_unlock(&FrameDealMutex);
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 #define CAMERA_FEATURES_H 11 #define CAMERA_FEATURES_H
12 12
13 /* Includes ------------------------------------------------------------------*/ 13 /* Includes ------------------------------------------------------------------*/
  14 +#include "JZsdk_Base/JZsdk_Code/JZsdk_Code.h"
14 15
15 /* Exported constants --------------------------------------------------------*/ 16 /* Exported constants --------------------------------------------------------*/
16 /* 常亮定义*/ 17 /* 常亮定义*/
@@ -21,8 +22,11 @@ @@ -21,8 +22,11 @@
21 22
22 /* Exported functions --------------------------------------------------------*/ 23 /* Exported functions --------------------------------------------------------*/
23 T_JZsdkReturnCode V4L2_ShootPhotoDeal(char* h264_data, unsigned int data_len); 24 T_JZsdkReturnCode V4L2_ShootPhotoDeal(char* h264_data, unsigned int data_len);
24 -int FrameDeal_ShootPhoto_trans(int Count);  
25 25
26 int V4L2_RecordVedioDeal(char *h264_data, int dataLen); 26 int V4L2_RecordVedioDeal(char *h264_data, int dataLen);
27 - 27 +T_JZsdkReturnCode CameraFeatures_VideoRecord_SetMode(int mode);
  28 +T_JZsdkReturnCode CameraFeatures_FrameDealThread_UnlockFun();
  29 +T_JZsdkReturnCode CameraFeatures_FrameDeal_thread_Init();
  30 +// 单拍模式传递函数
  31 +T_JZsdkReturnCode FrameDeal_ShootPhoto_trans(int Count);
28 #endif 32 #endif
@@ -3,61 +3,114 @@ @@ -3,61 +3,114 @@
3 #include "../CameraParameter.h" 3 #include "../CameraParameter.h"
4 #include "../V4L2/V4L2_Record.h" 4 #include "../V4L2/V4L2_Record.h"
5 #include "JZsdkLib.h" 5 #include "JZsdkLib.h"
  6 +#include "../VideoTranscode/VideoTranscode.h"
  7 +#include "../Camera_InAndOut.h"
6 8
7 FILE *FrameDeal_RecordVideo_fp = NULL; 9 FILE *FrameDeal_RecordVideo_fp = NULL;
8 -static int FrameDeal_RecordVideo_mode = JZ_FLAGCODE_OFF;  
9 10
10 -extern int VideoTranscode_Flag ; //视频转码标志位，off为转码完毕，on为转码完成 11 +extern int g_CameraStatus;
11 12
12 /* 13 /*
13 14
14 录像部分 15 录像部分
15 16
16 */ 17 */
17 -  
18 -// 录像函数  
19 -static void FrameDeal_RecordVideo(char* h264_data, uint32_t data_len)  
20 -{  
21 - fwrite(h264_data, data_len, 1, FrameDeal_RecordVideo_fp);  
22 - //JZSDK_LOG_INFO("写入一帧");  
23 -}  
24 -  
25 //录像模式传递函数 18 //录像模式传递函数
26 -T_JZsdkReturnCode FrameDeal_RecordVideo_trans(int mode) 19 +static T_JZsdkReturnCode FrameDeal_RecordVideo_trans(int mode)
27 { 20 {
28 - JZSDK_LOG_INFO("录像传递函数被调用");  
29 -  
30 - //如果传来一个开始录像的指令，且当前没有打开录像, 且没在进行转码  
31 - if( mode == JZ_FLAGCODE_ON && FrameDeal_RecordVideo_mode == JZ_FLAGCODE_OFF && VideoTranscode_Flag == JZ_FLAGCODE_OFF) 21 + //如果传入的是录像开始
  22 + if (mode == JZ_FLAGCODE_ON)
32 { 23 {
33 - FrameDeal_RecordVideo_fp = fopen("/root/sdcard/DCIM/Videos/temp.h264","wb");  
34 - if (FrameDeal_RecordVideo_fp == NULL) 24 + //如果相机处于空闲状态
  25 + if (g_CameraStatus == CAMERA_IDLE)
  26 + {
  27 + //则为开启录像
  28 + FrameDeal_RecordVideo_fp = fopen("/root/sdcard/DCIM/Videos/temp.h264","wb");
  29 + if (FrameDeal_RecordVideo_fp == NULL)
  30 + {
  31 + JZSDK_LOG_ERROR("录像文件打开错误");
  32 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  33 + }
  34 +
  35 + g_CameraStatus = CAMERA_RECORD;
  36 + JZSDK_LOG_INFO("录像模式已开启");
  37 + }
  38 +
  39 + //如果处于录像中
  40 + else if (g_CameraStatus == CAMERA_RECORD)
35 { 41 {
36 - JZSDK_LOG_ERROR("录像文件打开错误"); 42 + JZSDK_LOG_ERROR("相机已经处于录像中，请勿重复打开录像功能");
37 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 43 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
38 } 44 }
39 -  
40 - FrameDeal_RecordVideo_mode = JZ_FLAGCODE_ON;  
41 - JZSDK_LOG_INFO("录像文件已经打开");  
42 -  
43 - }  
44 45
45 - else if(mode == JZ_FLAGCODE_OFF && FrameDeal_RecordVideo_mode == JZ_FLAGCODE_ON)  
46 - {  
47 - //关闭录像的文件  
48 - JZSDK_LOG_INFO("录像已保存");  
49 - fclose(FrameDeal_RecordVideo_fp);  
50 -  
51 - //转码  
52 - //录像转码解锁函数  
53 - ffmpeg_H264_tanscodeto(2);  
54 -  
55 - //关闭录像  
56 - FrameDeal_RecordVideo_mode = JZ_FLAGCODE_OFF; 46 + //如果处于拍摄中
  47 + else if (g_CameraStatus == CAMERA_SHOOTPHOTO)
  48 + {
  49 + JZSDK_LOG_ERROR("相机已经处于单拍中，请勿重复打开录像功能");
  50 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  51 + }
  52 +
  53 + //如果处于拍摄中
  54 + else if (g_CameraStatus == CAMERA_BRUSTSHOORPHOTO)
  55 + {
  56 + JZSDK_LOG_ERROR("相机已经处于连拍中，请勿重复打开录像功能");
  57 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  58 + }
  59 +
  60 + //如果处于转码中
  61 + else if (g_CameraStatus == CAMERA_BRUSTSHOORPHOTO)
  62 + {
  63 + JZSDK_LOG_ERROR("相机已经处于转码中，请勿重复打开录像功能");
  64 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  65 + }
57 } 66 }
  67 + //如果传入的是录像关闭
  68 + else if(mode == JZ_FLAGCODE_OFF)
  69 + {
  70 + //如果相机处于空闲状态
  71 + if (g_CameraStatus == CAMERA_IDLE)
  72 + {
  73 + JZSDK_LOG_ERROR("相机空闲中，无法关闭录像功能");
  74 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  75 + }
  76 +
  77 + //如果处于录像中
  78 + else if (g_CameraStatus == CAMERA_RECORD)
  79 + {
  80 + //关闭录像的文件
  81 + fclose(FrameDeal_RecordVideo_fp);
  82 + JZSDK_LOG_INFO("录像已保存");
  83 +
  84 + //转码
  85 + //录像转码解锁函数
  86 + Video_TansCode_Trans(VIDEO_TRANSCODE, 0);
  87 + }
  88 +
  89 + //如果处于拍摄中
  90 + else if (g_CameraStatus == CAMERA_SHOOTPHOTO)
  91 + {
  92 + JZSDK_LOG_ERROR("相机已经处于单拍中，无法关闭录像功能");
  93 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  94 + }
  95 +
  96 + //如果处于连拍中
  97 + else if (g_CameraStatus == CAMERA_BRUSTSHOORPHOTO)
  98 + {
  99 + JZSDK_LOG_ERROR("相机已经处于连拍中，无法关闭录像功能");
  100 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  101 + }
58 102
  103 + //如果处于转码中
  104 + else if (g_CameraStatus == CAMERA_TRANSCODE)
  105 + {
  106 + JZSDK_LOG_ERROR("相机已经处于转码中，无法关闭录像功能");
  107 + return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
  108 + }
  109 + }
  110 + //传入的是其他参数
59 else 111 else
60 { 112 {
  113 + JZSDK_LOG_ERROR("错误的录像开关状态");
61 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE; 114 return JZ_ERROR_SYSTEM_MODULE_CODE_FAILURE;
62 } 115 }
63 116
@@ -67,14 +120,26 @@ T_JZsdkReturnCode FrameDeal_RecordVideo_trans(int mode) @@ -67,14 +120,26 @@ T_JZsdkReturnCode FrameDeal_RecordVideo_trans(int mode)
67 120
68 int V4L2_RecordVedioDeal(char *h264_data, int dataLen) 121 int V4L2_RecordVedioDeal(char *h264_data, int dataLen)
69 { 122 {
70 -  
71 - if(FrameDeal_RecordVideo_mode == JZ_FLAGCODE_OFF) 123 + if(g_CameraStatus != CAMERA_RECORD)
72 { 124 {
73 return -1; 125 return -1;
74 } 126 }
75 127
  128 + //如果录像模式被打开，存入数据进临时h264文件
  129 +
76 //录像函数 130 //录像函数
77 - FrameDeal_RecordVideo( h264_data, dataLen); 131 + fwrite(h264_data, dataLen, 1, FrameDeal_RecordVideo_fp);
78 //JZSDK_LOG_INFO("录入一帧"); 132 //JZSDK_LOG_INFO("录入一帧");
79 } 133 }
80 134
  135 +
  136 +/**************
  137 + *
  138 + * 相机功能 录制功能传递函数
  139 + * 1开启录制 0关闭录制并进行转码
  140 + *
  141 + * ************/
  142 +T_JZsdkReturnCode CameraFeatures_VideoRecord_SetMode(int mode)
  143 +{
  144 + return FrameDeal_RecordVideo_trans(mode);
  145 +}