add code
This commit is contained in:
parent
6b416e48d5
commit
5597bfca0b
@ -664,7 +664,7 @@ std::string JsonData::JsonCmd_Cgi_30(Param_30 ¶m) {
|
|||||||
if(param.mMode == 0 && productNo == "02"){
|
if(param.mMode == 0 && productNo == "02"){
|
||||||
std::string::size_type comper = param.mChannelId.find("Z");
|
std::string::size_type comper = param.mChannelId.find("Z");
|
||||||
if (comper != std::string::npos) {
|
if (comper != std::string::npos) {
|
||||||
resolution = 1.0666;
|
resolution = 1 / 1.28;
|
||||||
}else{
|
}else{
|
||||||
resolution = 1 / 1.6;
|
resolution = 1 / 1.6;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -991,13 +991,13 @@ std::vector<float> Uart::DealData(int iChannel, float coe, unsigned int sampleRa
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}else if( version == 0){
|
}else if( version == 0){
|
||||||
if (vecData.size() == 8192 && iChannel == WAVE_X) { //过滤数据包结尾空数据
|
if (vecData.size() == 13108 && iChannel == WAVE_X) { //过滤数据包结尾空数据
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (vecData.size() == 8192 && iChannel == WAVE_Y) { //过滤数据包结尾空数据
|
if (vecData.size() == 13108 && iChannel == WAVE_Y) { //过滤数据包结尾空数据
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (vecData.size() == 24000 && iChannel == WAVE_Z) { //过滤数据包结尾空数据
|
if (vecData.size() == 30720 && iChannel == WAVE_Z) { //过滤数据包结尾空数据
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (vecData.size() == 13108 && iChannel == WAVE_LF_X) { //过滤数据包结尾空数据
|
if (vecData.size() == 13108 && iChannel == WAVE_LF_X) { //过滤数据包结尾空数据
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user