VladislavOstapov/terminal-web-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SCPC: костыль для исправления ошибки с occ в мониторинге

Browse Source
This commit is contained in:
Vladislav Ostapov
2025-10-31 15:58:43 +03:00
parent e963c3424d
commit 7a9faf237f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front-generator/template/common/monitoring-methods.js.j2
View File

@@ -54,7 +54,7 @@ updateStatistics(vals) {
this.statTx.speedOnTxKbit = Math.round(vals["state"]["tx"]["speedOnTxKbit"] * 100) / 100 this.statTx.speedOnTxKbit = Math.round(vals["state"]["tx"]["speedOnTxKbit"] * 100) / 100
this.statTx.speedOnIifKbit = Math.round(vals["state"]["tx"]["speedOnIifKbit"] * 100) / 100 this.statTx.speedOnIifKbit = Math.round(vals["state"]["tx"]["speedOnIifKbit"] * 100) / 100
this.statCinc.occ = vals["state"]["cinc"]["occ"] this.statCinc.occ = vals["state"]["cinc"]["occ_x1000"] / 1000
this.statCinc.correlator = vals["state"]["cinc"]["correlator"] this.statCinc.correlator = vals["state"]["cinc"]["correlator"]
this.statCinc.correlatorFails = vals["state"]["cinc"]["correlatorFails"] this.statCinc.correlatorFails = vals["state"]["cinc"]["correlatorFails"]
this.statCinc.freqErr = Math.round(vals["state"]["cinc"]["freqErr"] * 100) / 100 this.statCinc.freqErr = Math.round(vals["state"]["cinc"]["freqErr"] * 100) / 100

2
src/api-driver/structs.cpp
View File

@@ -453,7 +453,7 @@ nlohmann::json api_driver::obj::TerminalState::asJson() {
res["cinc"]["correlator"] = nullptr; res["cinc"]["correlator"] = nullptr;
} }
res["cinc"]["occ"] = fCincOcc; res["cinc"]["occ_x1000"] = static_cast<int>(fCincOcc * 1000);
res["cinc"]["correlatorFails"] = fCincCorrelatorFails; res["cinc"]["correlatorFails"] = fCincCorrelatorFails;
res["cinc"]["freqErr"] = fCincFreqErr; res["cinc"]["freqErr"] = fCincFreqErr;
res["cinc"]["freqErrAcc"] = fCincFreqErrAcc; res["cinc"]["freqErrAcc"] = fCincFreqErrAcc;

2
static/main-scpc.html
View File

@@ -1001,7 +1001,7 @@
this.statTx.speedOnTxKbit = Math.round(vals["state"]["tx"]["speedOnTxKbit"] * 100) / 100 this.statTx.speedOnTxKbit = Math.round(vals["state"]["tx"]["speedOnTxKbit"] * 100) / 100
this.statTx.speedOnIifKbit = Math.round(vals["state"]["tx"]["speedOnIifKbit"] * 100) / 100 this.statTx.speedOnIifKbit = Math.round(vals["state"]["tx"]["speedOnIifKbit"] * 100) / 100
this.statCinc.occ = vals["state"]["cinc"]["occ"] this.statCinc.occ = vals["state"]["cinc"]["occ_x1000"] / 1000
this.statCinc.correlator = vals["state"]["cinc"]["correlator"] this.statCinc.correlator = vals["state"]["cinc"]["correlator"]
this.statCinc.correlatorFails = vals["state"]["cinc"]["correlatorFails"] this.statCinc.correlatorFails = vals["state"]["cinc"]["correlatorFails"]
this.statCinc.freqErr = Math.round(vals["state"]["cinc"]["freqErr"] * 100) / 100 this.statCinc.freqErr = Math.round(vals["state"]["cinc"]["freqErr"] * 100) / 100