From 5597bfca0bbd7c783d020c540b3583b3b2c71f26 Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Sat, 28 Feb 2026 15:32:42 +0800 Subject: [PATCH] add code --- jsonparse/web_cmd_parse2.cpp | 2 +- uart/uart_feature_parse.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jsonparse/web_cmd_parse2.cpp b/jsonparse/web_cmd_parse2.cpp index 1e2c5e0..b80a9ad 100644 --- a/jsonparse/web_cmd_parse2.cpp +++ b/jsonparse/web_cmd_parse2.cpp @@ -664,7 +664,7 @@ std::string JsonData::JsonCmd_Cgi_30(Param_30 ¶m) { if(param.mMode == 0 && productNo == "02"){ std::string::size_type comper = param.mChannelId.find("Z"); if (comper != std::string::npos) { - resolution = 1.0666; + resolution = 1 / 1.28; }else{ resolution = 1 / 1.6; } diff --git a/uart/uart_feature_parse.cpp b/uart/uart_feature_parse.cpp index 7e77b0e..7541fc0 100644 --- a/uart/uart_feature_parse.cpp +++ b/uart/uart_feature_parse.cpp @@ -991,13 +991,13 @@ std::vector Uart::DealData(int iChannel, float coe, unsigned int sampleRa break; } }else if( version == 0){ - if (vecData.size() == 8192 && iChannel == WAVE_X) { //过滤数据包结尾空数据 + if (vecData.size() == 13108 && iChannel == WAVE_X) { //过滤数据包结尾空数据 break; } - if (vecData.size() == 8192 && iChannel == WAVE_Y) { //过滤数据包结尾空数据 + if (vecData.size() == 13108 && iChannel == WAVE_Y) { //过滤数据包结尾空数据 break; } - if (vecData.size() == 24000 && iChannel == WAVE_Z) { //过滤数据包结尾空数据 + if (vecData.size() == 30720 && iChannel == WAVE_Z) { //过滤数据包结尾空数据 break; } if (vecData.size() == 13108 && iChannel == WAVE_LF_X) { //过滤数据包结尾空数据