From 7a9faf237f5576a5c5e940461bb05ef5c65a6589 Mon Sep 17 00:00:00 2001 From: Vladislav Ostapov Date: Fri, 31 Oct 2025 15:58:43 +0300 Subject: [PATCH] =?UTF-8?q?SCPC:=20=D0=BA=D0=BE=D1=81=D1=82=D1=8B=D0=BB?= =?UTF-8?q?=D1=8C=20=D0=B4=D0=BB=D1=8F=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D1=88=D0=B8=D0=B1?= =?UTF-8?q?=D0=BA=D0=B8=20=D1=81=20occ=20=D0=B2=20=D0=BC=D0=BE=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front-generator/template/common/monitoring-methods.js.j2 | 2 +- src/api-driver/structs.cpp | 2 +- static/main-scpc.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/front-generator/template/common/monitoring-methods.js.j2 b/front-generator/template/common/monitoring-methods.js.j2 index 22d6af5..fae1aaa 100644 --- a/front-generator/template/common/monitoring-methods.js.j2 +++ b/front-generator/template/common/monitoring-methods.js.j2 @@ -54,7 +54,7 @@ updateStatistics(vals) { this.statTx.speedOnTxKbit = Math.round(vals["state"]["tx"]["speedOnTxKbit"] * 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.correlatorFails = vals["state"]["cinc"]["correlatorFails"] this.statCinc.freqErr = Math.round(vals["state"]["cinc"]["freqErr"] * 100) / 100 diff --git a/src/api-driver/structs.cpp b/src/api-driver/structs.cpp index 81659c3..cedf5a7 100644 --- a/src/api-driver/structs.cpp +++ b/src/api-driver/structs.cpp @@ -453,7 +453,7 @@ nlohmann::json api_driver::obj::TerminalState::asJson() { res["cinc"]["correlator"] = nullptr; } - res["cinc"]["occ"] = fCincOcc; + res["cinc"]["occ_x1000"] = static_cast(fCincOcc * 1000); res["cinc"]["correlatorFails"] = fCincCorrelatorFails; res["cinc"]["freqErr"] = fCincFreqErr; res["cinc"]["freqErrAcc"] = fCincFreqErrAcc; diff --git a/static/main-scpc.html b/static/main-scpc.html index a061cf3..5a87cfd 100644 --- a/static/main-scpc.html +++ b/static/main-scpc.html @@ -1001,7 +1001,7 @@ this.statTx.speedOnTxKbit = Math.round(vals["state"]["tx"]["speedOnTxKbit"] * 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.correlatorFails = vals["state"]["cinc"]["correlatorFails"] this.statCinc.freqErr = Math.round(vals["state"]["cinc"]["freqErr"] * 100) / 100