This commit is contained in:
zhangsheng 2026-02-28 15:32:42 +08:00
parent 6b416e48d5
commit 5597bfca0b
2 changed files with 4 additions and 4 deletions

View File

@ -664,7 +664,7 @@ std::string JsonData::JsonCmd_Cgi_30(Param_30 &param) {
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;
}

View File

@ -991,13 +991,13 @@ std::vector<float> 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) { //过滤数据包结尾空数据