zhangwen/front_linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整了电压偏差上送方式，取上下偏差中绝对值较大的那一个指标

Browse Source
This commit is contained in:
zhangwen
2026-01-14 20:22:29 +08:00
parent 3e05e627d3
commit 1c76a9a1ce
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
LFtid1056/PQSMsg.h
View File

@@ -757,7 +757,10 @@ public:
// 12-14λ<34><CEBB>UU_Deviation<6F><6E>UL_Deviation<6F><6E><EFBFBD><EFBFBD>ȡǰ<C8A1><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1>Ϊ0<CEAA><30>ֵ
for (int i = 0; i < 3; ++i) {
float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i];
// ֱ<><D6B1>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǹ<EFBFBD><C7B8><EFBFBD><EFBFBD><EFBFBD>Ȼ<EFBFBD><C8BB><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7>ֵ<EFBFBD><D6B5>
float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i]))
? UU_Deviation[i]
: UL_Deviation[i];
float_buffer.push_back(val);
}
@@ -1032,7 +1035,10 @@ public:
// 9-11λ<31><CEBB>UU_Deviation<6F><6E>UL_Deviation<6F><6E><EFBFBD><EFBFBD>ȡǰ<C8A1><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1>Ϊ0<CEAA><30>ֵ
for (int i = 0; i < 3; ++i) {
float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i];
// ֱ<><D6B1>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ǹ<EFBFBD><C7B8><EFBFBD><EFBFBD><EFBFBD>Ȼ<EFBFBD><C8BB><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7>ֵ<EFBFBD><D6B5>
float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i]))
? UU_Deviation[i]
: UL_Deviation[i];
float_buffer.push_back(val);
}

2
LFtid1056/dealMsg.cpp
View File

@@ -490,7 +490,7 @@ void process_received_message(string mac, string id,const char* data, size_t len
std::string min_base64Str = min_data.ConvertToBase64(nPTType);
std::string avg_base64Str = avg_data.ConvertToBase64(nPTType);
std::string cp95_base64Str = cp95_data.ConvertToBase64(nPTType);
//std::cout << "New star base64Str0:" << max_base64Str << std::endl;
//std::cout << "New del base64Str1:" << avg_data.ConvertToBase64(1) << std::endl;
//lnk20250708使用接口发送
time_t data_time = ConvertToTimestamp(avg_data.time);