diff --git a/front-generator/template/common/monitoring-methods.js.j2 b/front-generator/template/common/monitoring-methods.js.j2 index 589cabf..24255e3 100644 --- a/front-generator/template/common/monitoring-methods.js.j2 +++ b/front-generator/template/common/monitoring-methods.js.j2 @@ -35,10 +35,10 @@ this.statRx.frameSizeNormal = vals["state"]["rx"]["frameSizeNormal"] this.statRx.isPilots = vals["state"]["rx"]["isPilots"] this.statRx.symError = vals["state"]["rx"]["symError"] - this.statRx.freqErr = vals["state"]["rx"]["freqErr"] - this.statRx.freqErrAcc = vals["state"]["rx"]["freqErrAcc"] + this.statRx.freqErr = Math.round(vals["state"]["rx"]["freqErr"] * 100) / 100 + this.statRx.freqErrAcc = Math.round(vals["state"]["rx"]["freqErrAcc"] * 100) / 100 this.statRx.inputSignalLevel = vals["state"]["rx"]["inputSignalLevel"] - this.statRx.pllError = vals["state"]["rx"]["pllError"] + this.statRx.pllError = Math.round(vals["state"]["rx"]["pllError"] * 100) / 100 this.statRx.speedOnRxKbit = Math.round(vals["state"]["rx"]["speedOnRxKbit"] * 100) / 100 this.statRx.speedOnIifKbit = Math.round(vals["state"]["rx"]["speedOnIifKbit"] * 100) / 100 this.statRx.packetsOk = vals["state"]["rx"]["packetsOk"] @@ -47,18 +47,18 @@ {% if modem == 'scpc' %} this.statTx.state = vals["state"]["tx"]["state"] - this.statTx.snr = vals["state"]["tx"]["snr"] + this.statTx.snr = Math.round(vals["state"]["tx"]["snr"] * 100) / 100 this.statTx.modcod = modcodToStr(vals["state"]["tx"]["modcod"]) this.statTx.frameSizeNormal = vals["state"]["tx"]["frameSizeNormal"] this.statTx.isPilots = vals["state"]["tx"]["isPilots"] - this.statTx.speedOnTxKbit = vals["state"]["tx"]["speedOnTxKbit"] - this.statTx.speedOnIifKbit = vals["state"]["tx"]["speedOnIifKbit"] + 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.correlator = vals["state"]["cinc"]["correlator"] this.statCinc.correlatorFails = vals["state"]["cinc"]["correlatorFails"] - this.statCinc.freqErr = vals["state"]["cinc"]["freqErr"] - this.statCinc.freqErrAcc = vals["state"]["cinc"]["freqErrAcc"] + this.statCinc.freqErr = Math.round(vals["state"]["cinc"]["freqErr"] * 100) / 100 + this.statCinc.freqErrAcc = Math.round(vals["state"]["cinc"]["freqErrAcc"] * 100) / 100 this.statCinc.channelDelay = vals["state"]["cinc"]["channelDelay"] {% else %} this.statTx.state = vals["state"]["tx"]["state"] diff --git a/static/main-scpc.html b/static/main-scpc.html index 3da509e..6c1187b 100644 --- a/static/main-scpc.html +++ b/static/main-scpc.html @@ -982,10 +982,10 @@ this.statRx.frameSizeNormal = vals["state"]["rx"]["frameSizeNormal"] this.statRx.isPilots = vals["state"]["rx"]["isPilots"] this.statRx.symError = vals["state"]["rx"]["symError"] - this.statRx.freqErr = vals["state"]["rx"]["freqErr"] - this.statRx.freqErrAcc = vals["state"]["rx"]["freqErrAcc"] + this.statRx.freqErr = Math.round(vals["state"]["rx"]["freqErr"] * 100) / 100 + this.statRx.freqErrAcc = Math.round(vals["state"]["rx"]["freqErrAcc"] * 100) / 100 this.statRx.inputSignalLevel = vals["state"]["rx"]["inputSignalLevel"] - this.statRx.pllError = vals["state"]["rx"]["pllError"] + this.statRx.pllError = Math.round(vals["state"]["rx"]["pllError"] * 100) / 100 this.statRx.speedOnRxKbit = Math.round(vals["state"]["rx"]["speedOnRxKbit"] * 100) / 100 this.statRx.speedOnIifKbit = Math.round(vals["state"]["rx"]["speedOnIifKbit"] * 100) / 100 this.statRx.packetsOk = vals["state"]["rx"]["packetsOk"] @@ -993,18 +993,18 @@ this.statRx.packetsDummy = vals["state"]["rx"]["packetsDummy"] this.statTx.state = vals["state"]["tx"]["state"] - this.statTx.snr = vals["state"]["tx"]["snr"] + this.statTx.snr = Math.round(vals["state"]["tx"]["snr"] * 100) / 100 this.statTx.modcod = modcodToStr(vals["state"]["tx"]["modcod"]) this.statTx.frameSizeNormal = vals["state"]["tx"]["frameSizeNormal"] this.statTx.isPilots = vals["state"]["tx"]["isPilots"] - this.statTx.speedOnTxKbit = vals["state"]["tx"]["speedOnTxKbit"] - this.statTx.speedOnIifKbit = vals["state"]["tx"]["speedOnIifKbit"] + 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.correlator = vals["state"]["cinc"]["correlator"] this.statCinc.correlatorFails = vals["state"]["cinc"]["correlatorFails"] - this.statCinc.freqErr = vals["state"]["cinc"]["freqErr"] - this.statCinc.freqErrAcc = vals["state"]["cinc"]["freqErrAcc"] + this.statCinc.freqErr = Math.round(vals["state"]["cinc"]["freqErr"] * 100) / 100 + this.statCinc.freqErrAcc = Math.round(vals["state"]["cinc"]["freqErrAcc"] * 100) / 100 this.statCinc.channelDelay = vals["state"]["cinc"]["channelDelay"] this.statDevice.adrv = vals["state"]["device"]["adrv"] diff --git a/static/main-shps.html b/static/main-shps.html index aa80605..3ce3ece 100644 --- a/static/main-shps.html +++ b/static/main-shps.html @@ -641,10 +641,10 @@ this.statRx.frameSizeNormal = vals["state"]["rx"]["frameSizeNormal"] this.statRx.isPilots = vals["state"]["rx"]["isPilots"] this.statRx.symError = vals["state"]["rx"]["symError"] - this.statRx.freqErr = vals["state"]["rx"]["freqErr"] - this.statRx.freqErrAcc = vals["state"]["rx"]["freqErrAcc"] + this.statRx.freqErr = Math.round(vals["state"]["rx"]["freqErr"] * 100) / 100 + this.statRx.freqErrAcc = Math.round(vals["state"]["rx"]["freqErrAcc"] * 100) / 100 this.statRx.inputSignalLevel = vals["state"]["rx"]["inputSignalLevel"] - this.statRx.pllError = vals["state"]["rx"]["pllError"] + this.statRx.pllError = Math.round(vals["state"]["rx"]["pllError"] * 100) / 100 this.statRx.speedOnRxKbit = Math.round(vals["state"]["rx"]["speedOnRxKbit"] * 100) / 100 this.statRx.speedOnIifKbit = Math.round(vals["state"]["rx"]["speedOnIifKbit"] * 100) / 100 this.statRx.packetsOk = vals["state"]["rx"]["packetsOk"] diff --git a/static/main-tdma.html b/static/main-tdma.html index c5ff588..aa05685 100644 --- a/static/main-tdma.html +++ b/static/main-tdma.html @@ -624,10 +624,10 @@ this.statRx.frameSizeNormal = vals["state"]["rx"]["frameSizeNormal"] this.statRx.isPilots = vals["state"]["rx"]["isPilots"] this.statRx.symError = vals["state"]["rx"]["symError"] - this.statRx.freqErr = vals["state"]["rx"]["freqErr"] - this.statRx.freqErrAcc = vals["state"]["rx"]["freqErrAcc"] + this.statRx.freqErr = Math.round(vals["state"]["rx"]["freqErr"] * 100) / 100 + this.statRx.freqErrAcc = Math.round(vals["state"]["rx"]["freqErrAcc"] * 100) / 100 this.statRx.inputSignalLevel = vals["state"]["rx"]["inputSignalLevel"] - this.statRx.pllError = vals["state"]["rx"]["pllError"] + this.statRx.pllError = Math.round(vals["state"]["rx"]["pllError"] * 100) / 100 this.statRx.speedOnRxKbit = Math.round(vals["state"]["rx"]["speedOnRxKbit"] * 100) / 100 this.statRx.speedOnIifKbit = Math.round(vals["state"]["rx"]["speedOnIifKbit"] * 100) / 100 this.statRx.packetsOk = vals["state"]["rx"]["packetsOk"]