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