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-13 16:27:50 +08:00
parent a87504cee9
commit c97b83d83d
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
LFtid1056/PQSMsg.h
View File

@@ -599,10 +599,10 @@ public:
for (int j = 0; j < 4; j++) { for (int j = 0; j < 4; j++) {
if (i == 0) { // <20><>ѹ if (i == 0) { // <20><>ѹ
if (j == 2) { // <20><><EFBFBD><EFBFBD> if (j == 2) { // <20><><EFBFBD><EFBFBD>
UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]) * fPT; UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);// *fPT;
} }
else if (j < 3) { else if (j < 3) {
UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]) * fPT; UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);// *fPT;
} }
else { else {
UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]); UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);
@@ -610,7 +610,7 @@ public:
} }
else { // <20><><EFBFBD><EFBFBD> else { // <20><><EFBFBD><EFBFBD>
if (j < 3) { if (j < 3) {
UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]) * fCT; UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);// *fCT;
} }
else { else {
UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]); UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);
@@ -635,16 +635,16 @@ public:
// <20>ܹ<EFBFBD><DCB9><EFBFBD> // <20>ܹ<EFBFBD><DCB9><EFBFBD>
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
for (int j = 0; j < 3; j++) { for (int j = 0; j < 3; j++) {
Total_Power[i][j] = IntToFloat(SrcData.Total_Power[i][j]) * fPT * fCT; Total_Power[i][j] = IntToFloat(SrcData.Total_Power[i][j]);// *fPT* fCT;
} }
} }
// г<><D0B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD> // г<><D0B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
for (int j = 0; j < HARMNUM; j++) { for (int j = 0; j < HARMNUM; j++) {
Harm_Power[i][j].P = IntToFloat(SrcData.Harm_Power[i][j].P) * fPT * fCT; Harm_Power[i][j].P = IntToFloat(SrcData.Harm_Power[i][j].P);// * fPT * fCT;
Harm_Power[i][j].Q = IntToFloat(SrcData.Harm_Power[i][j].Q) * fPT * fCT; Harm_Power[i][j].Q = IntToFloat(SrcData.Harm_Power[i][j].Q);// *fPT* fCT;
Harm_Power[i][j].S = IntToFloat(SrcData.Harm_Power[i][j].S) * fPT * fCT; Harm_Power[i][j].S = IntToFloat(SrcData.Harm_Power[i][j].S);// *fPT* fCT;
} }
} }
@@ -656,10 +656,10 @@ public:
for (int j = 0; j < HARMNUM; j++) { for (int j = 0; j < HARMNUM; j++) {
if (i < 3) { // <20><>ѹг<D1B9><D0B3> if (i < 3) { // <20><>ѹг<D1B9><D0B3>
FuHarm[i][j] = IntToFloat(SrcData.FuHarm[i][j]) * fPT; FuHarm[i][j] = IntToFloat(SrcData.FuHarm[i][j]);// *fPT;
} }
else { // <20><><EFBFBD><EFBFBD>г<EFBFBD><D0B3> else { // <20><><EFBFBD><EFBFBD>г<EFBFBD><D0B3>
FuHarm[i][j] = IntToFloat(SrcData.FuHarm[i][j]) * fCT; FuHarm[i][j] = IntToFloat(SrcData.FuHarm[i][j]);// *fCT;
} }
FuHarmPhase[i][j] = IntToFloat(SrcData.FuHarmPhase[i][j]); FuHarmPhase[i][j] = IntToFloat(SrcData.FuHarmPhase[i][j]);
@@ -671,10 +671,10 @@ public:
// RMSֵ // RMSֵ
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
if (i > 2 && i < 6) { // <20><><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD>3,4,5) if (i > 2 && i < 6) { // <20><><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD>3,4,5)
Rms[i] = IntToFloat(SrcData.Rms[i]) * fCT; Rms[i] = IntToFloat(SrcData.Rms[i]);// *fCT;
} }
else { // <20><>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD> else { // <20><>ѹ<EFBFBD><D1B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
Rms[i] = IntToFloat(SrcData.Rms[i]) * fPT; Rms[i] = IntToFloat(SrcData.Rms[i]);// *fPT;
} }
} }
} }