Compare commits

...

3 Commits

Author SHA1 Message Date
5597bfca0b add code 2026-02-28 15:32:42 +08:00
6b416e48d5 add code 2026-02-28 13:33:17 +08:00
8f2698b48f add code 2026-02-28 09:37:18 +08:00
3 changed files with 10 additions and 5 deletions

View File

@ -662,7 +662,12 @@ 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 / 1.28;
}else{
resolution = 1 / 1.6;
}
}else if(param.mMode == 1 && productNo == "02"){
resolution = 1 / 3.2;
}

View File

@ -453,7 +453,7 @@ int Uart::DealReviveDuration(uint16_t ushortAdd){
int next_taskID = 0;
bool z = false;
uint16_t next_duration = scheduler::instance().GetNextDuration(ushortAdd,z,next_taskID);
zlog_info(zct, "next_duration = %d next_taskID = %d", next_duration,next_taskID);
zlog_info(zct, "next_duration = %d next_taskID = %d,z = %d", next_duration,next_taskID,z);
scheduleTask.cmd = REVIVE_DURATION;
scheduleTask.shortAddr = ushortAdd;
scheduleTask.duration = next_duration;

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) { //过滤数据包结尾空数据