Настройки сети
@@ -595,7 +586,6 @@
rxtx: false,
dpdi: false,
buclnb: false,
- tcpaccel: false,
network: false,
firmwareUpload: false,
firmwareUpgrade: false,
@@ -655,10 +645,6 @@
srvRefClk10M: false,
bucLnbAutoStart: false,
},
- paramTcpaccel: {
- accelEn: false,
- accelMaxConnections: 0,
- },
paramNetwork: {
netManagementIp: null,
netIsL2: false,
@@ -875,20 +861,6 @@
.catch((reason) => { alert(`Ошибка при применении настроек: ${reason}`) })
.finally(() => { this.submitStatus.buclnb = false })
},
- settingsSubmitTcpaccel() {
- if (this.submitStatus.tcpaccel) { return }
-
- let query = {
- "accelEn": this.paramTcpaccel.accelEn,
- "accelMaxConnections": this.paramTcpaccel.accelMaxConnections,
- }
-
- this.submitStatus.tcpaccel = true
- fetch('/api/set/tcpaccel', {method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify(query), credentials: 'same-origin' })
- .then(async (resp) => { let vals = await resp.json(); if (vals['status'] !== 'ok') { throw new Error(vals['error'] ? vals['error'] : "Server returns undefined error") } this.updateTcpaccelSettings(vals) })
- .catch((reason) => { alert(`Ошибка при применении настроек: ${reason}`) })
- .finally(() => { this.submitStatus.tcpaccel = false })
- },
settingsSubmitNetwork() {
if (this.submitStatus.network) { return }
{ if (!confirm("Применение этих настроек может сделать модем недоступным! Продолжить?")) return }
@@ -910,70 +882,65 @@
updateRxtxSettings(vals) {
this.submitStatus.rxtx = false
- this.paramRxtx.isCinC = vals["settings"]["isCinC"]
- this.paramRxtx.txEn = vals["settings"]["txEn"]
- this.paramRxtx.txAutoStart = vals["settings"]["txAutoStart"]
- this.paramRxtx.txModulatorIsTest = vals["settings"]["txModulatorIsTest"]
- this.paramRxtx.txIsTestInput = vals["settings"]["txIsTestInput"]
- this.paramRxtx.txCentralFreq = this.inputFormatNumber(vals["settings"]["txCentralFreq"], {min:950000,max:6000000,step:0.01})
- this.paramRxtx.txBaudrate = this.inputFormatNumber(vals["settings"]["txBaudrate"], {min:200000,max:54000000,})
- this.paramRxtx.txRolloff = vals["settings"]["txRolloff"]
- this.paramRxtx.txGoldan = vals["settings"]["txGoldan"]
- this.paramRxtx.txAttenuation = vals["settings"]["txAttenuation"]
- this.paramRxtx.dvbServicePacketPeriod = vals["settings"]["dvbServicePacketPeriod"]
- this.paramRxtx.dvbIsAcm = vals["settings"]["dvbIsAcm"]
- this.paramRxtx.txFrameSizeNormal = vals["settings"]["txFrameSizeNormal"]
- this.paramRxtx.txIsPilots = vals["settings"]["txIsPilots"]
- this.paramRxtx.dvbCcmModulation = vals["settings"]["dvbCcmModulation"]
- this.paramRxtx.dvbCcmSpeed = vals["settings"]["dvbCcmSpeed"]
- this.paramRxtx.dvbAcmMinModulation = vals["settings"]["dvbAcmMinModulation"]
- this.paramRxtx.dvbAcmMinSpeed = vals["settings"]["dvbAcmMinSpeed"]
- this.paramRxtx.dvbAcmMaxModulation = vals["settings"]["dvbAcmMaxModulation"]
- this.paramRxtx.dvbAcmMaxSpeed = vals["settings"]["dvbAcmMaxSpeed"]
- this.paramRxtx.dvbSnrReserve = vals["settings"]["dvbSnrReserve"]
- this.paramRxtx.aupcEn = vals["settings"]["aupcEn"]
- this.paramRxtx.aupcMinAttenuation = vals["settings"]["aupcMinAttenuation"]
- this.paramRxtx.aupcMaxAttenuation = vals["settings"]["aupcMaxAttenuation"]
- this.paramRxtx.aupcRequiredSnr = vals["settings"]["aupcRequiredSnr"]
- this.paramRxtx.rxAgcEn = vals["settings"]["rxAgcEn"]
- this.paramRxtx.rxManualGain = vals["settings"]["rxManualGain"]
- this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxSpectrumInversion"]
- this.paramRxtx.rxCentralFreq = this.inputFormatNumber(vals["settings"]["rxCentralFreq"], {min:950000,max:6000000,step:0.01})
- this.paramRxtx.rxBaudrate = this.inputFormatNumber(vals["settings"]["rxBaudrate"], {min:200000,max:54000000,})
- this.paramRxtx.rxRolloff = vals["settings"]["rxRolloff"]
- this.paramRxtx.rxGoldan = vals["settings"]["rxGoldan"]
+ this.paramRxtx.isCinC = vals["settings"]["rxtx"]["isCinC"]
+ this.paramRxtx.txEn = vals["settings"]["rxtx"]["txEn"]
+ this.paramRxtx.txAutoStart = vals["settings"]["rxtx"]["txAutoStart"]
+ this.paramRxtx.txModulatorIsTest = vals["settings"]["rxtx"]["txModulatorIsTest"]
+ this.paramRxtx.txIsTestInput = vals["settings"]["rxtx"]["txIsTestInput"]
+ this.paramRxtx.txCentralFreq = this.inputFormatNumber(vals["settings"]["rxtx"]["txCentralFreq"], {min:950000,max:6000000,step:0.01})
+ this.paramRxtx.txBaudrate = this.inputFormatNumber(vals["settings"]["rxtx"]["txBaudrate"], {min:200000,max:54000000,})
+ this.paramRxtx.txRolloff = vals["settings"]["rxtx"]["txRolloff"]
+ this.paramRxtx.txGoldan = vals["settings"]["rxtx"]["txGoldan"]
+ this.paramRxtx.txAttenuation = vals["settings"]["rxtx"]["txAttenuation"]
+ this.paramRxtx.dvbServicePacketPeriod = vals["settings"]["rxtx"]["dvbServicePacketPeriod"]
+ this.paramRxtx.dvbIsAcm = vals["settings"]["rxtx"]["dvbIsAcm"]
+ this.paramRxtx.txFrameSizeNormal = vals["settings"]["rxtx"]["txFrameSizeNormal"]
+ this.paramRxtx.txIsPilots = vals["settings"]["rxtx"]["txIsPilots"]
+ this.paramRxtx.dvbCcmModulation = vals["settings"]["rxtx"]["dvbCcmModulation"]
+ this.paramRxtx.dvbCcmSpeed = vals["settings"]["rxtx"]["dvbCcmSpeed"]
+ this.paramRxtx.dvbAcmMinModulation = vals["settings"]["rxtx"]["dvbAcmMinModulation"]
+ this.paramRxtx.dvbAcmMinSpeed = vals["settings"]["rxtx"]["dvbAcmMinSpeed"]
+ this.paramRxtx.dvbAcmMaxModulation = vals["settings"]["rxtx"]["dvbAcmMaxModulation"]
+ this.paramRxtx.dvbAcmMaxSpeed = vals["settings"]["rxtx"]["dvbAcmMaxSpeed"]
+ this.paramRxtx.dvbSnrReserve = vals["settings"]["rxtx"]["dvbSnrReserve"]
+ this.paramRxtx.aupcEn = vals["settings"]["rxtx"]["aupcEn"]
+ this.paramRxtx.aupcMinAttenuation = vals["settings"]["rxtx"]["aupcMinAttenuation"]
+ this.paramRxtx.aupcMaxAttenuation = vals["settings"]["rxtx"]["aupcMaxAttenuation"]
+ this.paramRxtx.aupcRequiredSnr = vals["settings"]["rxtx"]["aupcRequiredSnr"]
+ this.paramRxtx.rxAgcEn = vals["settings"]["rxtx"]["rxAgcEn"]
+ this.paramRxtx.rxManualGain = vals["settings"]["rxtx"]["rxManualGain"]
+ this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxtx"]["rxSpectrumInversion"]
+ this.paramRxtx.rxCentralFreq = this.inputFormatNumber(vals["settings"]["rxtx"]["rxCentralFreq"], {min:950000,max:6000000,step:0.01})
+ this.paramRxtx.rxBaudrate = this.inputFormatNumber(vals["settings"]["rxtx"]["rxBaudrate"], {min:200000,max:54000000,})
+ this.paramRxtx.rxRolloff = vals["settings"]["rxtx"]["rxRolloff"]
+ this.paramRxtx.rxGoldan = vals["settings"]["rxtx"]["rxGoldan"]
},
updateDpdiSettings(vals) {
this.submitStatus.dpdi = false
- this.paramDpdi.dpdiIsPositional = vals["settings"]["dpdiIsPositional"]
- this.paramDpdi.dpdiSearchBandwidth = vals["settings"]["dpdiSearchBandwidth"]
- this.paramDpdi.dpdiPositionStationLatitude = vals["settings"]["dpdiPositionStationLatitude"]
- this.paramDpdi.dpdiPositionStationLongitude = vals["settings"]["dpdiPositionStationLongitude"]
- this.paramDpdi.dpdiPositionSatelliteLongitude = vals["settings"]["dpdiPositionSatelliteLongitude"]
- this.paramDpdi.dpdiDelayMin = vals["settings"]["dpdiDelayMin"]
- this.paramDpdi.dpdiDelayMax = vals["settings"]["dpdiDelayMax"]
+ this.paramDpdi.dpdiIsPositional = vals["settings"]["dpdi"]["dpdiIsPositional"]
+ this.paramDpdi.dpdiSearchBandwidth = vals["settings"]["dpdi"]["dpdiSearchBandwidth"]
+ this.paramDpdi.dpdiPositionStationLatitude = vals["settings"]["dpdi"]["dpdiPositionStationLatitude"]
+ this.paramDpdi.dpdiPositionStationLongitude = vals["settings"]["dpdi"]["dpdiPositionStationLongitude"]
+ this.paramDpdi.dpdiPositionSatelliteLongitude = vals["settings"]["dpdi"]["dpdiPositionSatelliteLongitude"]
+ this.paramDpdi.dpdiDelayMin = vals["settings"]["dpdi"]["dpdiDelayMin"]
+ this.paramDpdi.dpdiDelayMax = vals["settings"]["dpdi"]["dpdiDelayMax"]
},
updateBuclnbSettings(vals) {
this.submitStatus.buclnb = false
- this.paramBuclnb.bucRefClk10M = vals["settings"]["bucRefClk10M"]
- this.paramBuclnb.bucPowering = vals["settings"]["bucPowering"]
- this.paramBuclnb.lnbRefClk10M = vals["settings"]["lnbRefClk10M"]
- this.paramBuclnb.lnbPowering = vals["settings"]["lnbPowering"]
- this.paramBuclnb.srvRefClk10M = vals["settings"]["srvRefClk10M"]
- this.paramBuclnb.bucLnbAutoStart = vals["settings"]["bucLnbAutoStart"]
- },
- updateTcpaccelSettings(vals) {
- this.submitStatus.tcpaccel = false
- this.paramTcpaccel.accelEn = vals["settings"]["accelEn"]
- this.paramTcpaccel.accelMaxConnections = vals["settings"]["accelMaxConnections"]
+ this.paramBuclnb.bucRefClk10M = vals["settings"]["buclnb"]["bucRefClk10M"]
+ this.paramBuclnb.bucPowering = vals["settings"]["buclnb"]["bucPowering"]
+ this.paramBuclnb.lnbRefClk10M = vals["settings"]["buclnb"]["lnbRefClk10M"]
+ this.paramBuclnb.lnbPowering = vals["settings"]["buclnb"]["lnbPowering"]
+ this.paramBuclnb.srvRefClk10M = vals["settings"]["buclnb"]["srvRefClk10M"]
+ this.paramBuclnb.bucLnbAutoStart = vals["settings"]["buclnb"]["bucLnbAutoStart"]
},
updateNetworkSettings(vals) {
this.submitStatus.network = false
- this.paramNetwork.netManagementIp = vals["settings"]["netManagementIp"]
- this.paramNetwork.netIsL2 = vals["settings"]["netIsL2"]
- this.paramNetwork.netDataIp = vals["settings"]["netDataIp"]
- this.paramNetwork.netDataMtu = vals["settings"]["netDataMtu"]
- this.paramNetwork.netServerName = vals["settings"]["netServerName"]
+ this.paramNetwork.netManagementIp = vals["settings"]["network"]["netManagementIp"]
+ this.paramNetwork.netIsL2 = vals["settings"]["network"]["netIsL2"]
+ this.paramNetwork.netDataIp = vals["settings"]["network"]["netDataIp"]
+ this.paramNetwork.netDataMtu = vals["settings"]["network"]["netDataMtu"]
+ this.paramNetwork.netServerName = vals["settings"]["network"]["netServerName"]
},
// ========== include end from 'common/all-params-methods.js.j2'
@@ -998,53 +965,52 @@
}
this.lastUpdateTime = new Date();
- this.initState = vals["mainState"]["initState"]
- this.isCinC = vals["mainState"]["isCinC"]
+ this.initState = vals["state"]["initState"]
+ this.testState = vals["state"]["testState"]
+ this.isCinC = vals["state"]["isCinC"]
- this.statRx.state = vals["mainState"]["rx.state"]
- this.statRx.sym_sync_lock = vals["mainState"]["rx.sym_sync_lock"]
- this.statRx.freq_search_lock = vals["mainState"]["rx.freq_search_lock"]
- this.statRx.afc_lock = vals["mainState"]["rx.afc_lock"]
- this.statRx.pkt_sync = vals["mainState"]["rx.pkt_sync"]
- this.statRx.snr = vals["mainState"]["rx.snr"]
- this.statRx.rssi = vals["mainState"]["rx.rssi"]
- this.statRx.modcod = modcodToStr(vals["mainState"]["rx.modcod"])
- this.statRx.frameSizeNormal = vals["mainState"]["rx.frameSizeNormal"]
- this.statRx.isPilots = vals["mainState"]["rx.isPilots"]
- this.statRx.symError = vals["mainState"]["rx.symError"]
- this.statRx.freqErr = vals["mainState"]["rx.freqErr"]
- this.statRx.freqErrAcc = vals["mainState"]["rx.freqErrAcc"]
- this.statRx.inputSignalLevel = vals["mainState"]["rx.inputSignalLevel"]
- this.statRx.pllError = vals["mainState"]["rx.pllError"]
- this.statRx.speedOnRxKbit = vals["mainState"]["rx.speedOnRxKbit"]
- this.statRx.speedOnIifKbit = vals["mainState"]["rx.speedOnIifKbit"]
- this.statRx.packetsOk = vals["mainState"]["rx.packetsOk"]
- this.statRx.packetsBad = vals["mainState"]["rx.packetsBad"]
- this.statRx.packetsDummy = vals["mainState"]["rx.packetsDummy"]
+ this.statRx.state = vals["state"]["rx"]["state"]
+ this.statRx.sym_sync_lock = vals["state"]["rx"]["sym_sync_lock"]
+ this.statRx.freq_search_lock = vals["state"]["rx"]["freq_search_lock"]
+ this.statRx.afc_lock = vals["state"]["rx"]["afc_lock"]
+ this.statRx.pkt_sync = vals["state"]["rx"]["pkt_sync"]
+ this.statRx.snr = vals["state"]["rx"]["snr"]
+ this.statRx.rssi = vals["state"]["rx"]["rssi"]
+ this.statRx.modcod = modcodToStr(vals["state"]["rx"]["modcod"])
+ 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.inputSignalLevel = vals["state"]["rx"]["inputSignalLevel"]
+ this.statRx.pllError = vals["state"]["rx"]["pllError"]
+ this.statRx.speedOnRxKbit = vals["state"]["rx"]["speedOnRxKbit"]
+ this.statRx.speedOnIifKbit = vals["state"]["rx"]["speedOnIifKbit"]
+ this.statRx.packetsOk = vals["state"]["rx"]["packetsOk"]
+ this.statRx.packetsBad = vals["state"]["rx"]["packetsBad"]
+ this.statRx.packetsDummy = vals["state"]["rx"]["packetsDummy"]
- this.statTx.state = vals["mainState"]["tx.state"]
- this.statTx.snr = vals["mainState"]["tx.snr"]
- this.statTx.modcod = modcodToStr(vals["mainState"]["tx.modcod"])
- this.statTx.frameSizeNormal = vals["mainState"]["tx.frameSizeNormal"]
- this.statTx.isPilots = vals["mainState"]["tx.isPilots"]
- this.statTx.speedOnTxKbit = vals["mainState"]["tx.speedOnTxKbit"]
- this.statTx.speedOnIifKbit = vals["mainState"]["tx.speedOnIifKbit"]
+ this.statTx.state = vals["state"]["tx"]["state"]
+ this.statTx.snr = vals["state"]["tx"]["snr"]
+ 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.statCinc.occ = vals["mainState"]["cinc.occ"]
- this.statCinc.correlator = vals["mainState"]["cinc.correlator"]
- this.statCinc.correlatorFails = vals["mainState"]["cinc.correlatorFails"]
- this.statCinc.freqErr = vals["mainState"]["cinc.freqErr"]
- this.statCinc.freqErrAcc = vals["mainState"]["cinc.freqErrAcc"]
- this.statCinc.channelDelay = vals["mainState"]["cinc.channelDelay"]
+ 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.channelDelay = vals["state"]["cinc"]["channelDelay"]
- this.statDevice.adrv = vals["mainState"]["device.adrv"]
- this.statDevice.zynq = vals["mainState"]["device.zynq"]
- this.statDevice.fpga = vals["mainState"]["device.fpga"]
-
- this.testState = vals["mainState"]["testState"]
+ this.statDevice.adrv = vals["state"]["device"]["adrv"]
+ this.statDevice.zynq = vals["state"]["device"]["zynq"]
+ this.statDevice.fpga = vals["state"]["device"]["fpga"]
// аптайм приходит в секундах, надо преобразовать его в человеко-читаемый вид
- let uptime = vals["sysinfo"]["uptime"]
+ let uptime = vals["state"]["device"]["uptime"]
if (uptime) {
let secs = uptime % 60; uptime = Math.floor(uptime / 60)
let mins = uptime % 60; uptime = Math.floor(uptime / 60)
@@ -1056,11 +1022,11 @@
} else {
this.statOs.uptime = '?'
}
- this.statOs.load1 = vals["sysinfo"]["load1min"]
- this.statOs.load5 = vals["sysinfo"]["load5min"]
- this.statOs.load15 = vals["sysinfo"]["load15min"]
- this.statOs.totalram = vals["sysinfo"]["totalram"]
- this.statOs.freeram = vals["sysinfo"]["freeram"]
+ this.statOs.load1 = vals["state"]["device"]["load1min"]
+ this.statOs.load5 = vals["state"]["device"]["load5min"]
+ this.statOs.load15 = vals["state"]["device"]["load15min"]
+ this.statOs.totalram = vals["state"]["device"]["totalram"]
+ this.statOs.freeram = vals["state"]["device"]["freeram"]
},
resetPacketsStatistics() {
@@ -1156,15 +1122,17 @@
}
let query = {
"en": this.paramQos.en,
- "rt1": [],
- "rt2": [],
- "rt3": [],
- "cd": []
+ "profile": {
+ "rt1": [],
+ "rt2": [],
+ "rt3": [],
+ "cd": []
+ }
}
- for (let i = 0; i < this.paramQos.rt1.length; i++) { query.rt1.push(_translateQosClass('rt', this.paramQos.rt1[i])) }
- for (let i = 0; i < this.paramQos.rt2.length; i++) { query.rt2.push(_translateQosClass('rt', this.paramQos.rt2[i])) }
- for (let i = 0; i < this.paramQos.rt3.length; i++) { query.rt3.push(_translateQosClass('rt', this.paramQos.rt3[i])) }
- for (let i = 0; i < this.paramQos.cd.length; i++) { query.cd.push(_translateQosClass('rt', this.paramQos.cd[i])) }
+ for (let i = 0; i < this.paramQos.rt1.length; i++) { query.profile.rt1.push(_translateQosClass('rt', this.paramQos.rt1[i])) }
+ for (let i = 0; i < this.paramQos.rt2.length; i++) { query.profile.rt2.push(_translateQosClass('rt', this.paramQos.rt2[i])) }
+ for (let i = 0; i < this.paramQos.rt3.length; i++) { query.profile.rt3.push(_translateQosClass('rt', this.paramQos.rt3[i])) }
+ for (let i = 0; i < this.paramQos.cd.length; i++) { query.profile.cd.push(_translateQosClass('rt', this.paramQos.cd[i])) }
//console.log(query)
fetch('/api/set/qos', {
@@ -1185,9 +1153,9 @@
updateQosSettings(vals) {
this.submitStatusQos = false
- this.paramQos.en = vals["settings"]["qosEnabled"]
+ this.paramQos.en = vals["settings"]["qos"]["en"]
- const qosProfile = vals["settings"]["qosProfile"]
+ const qosProfile = vals["settings"]["qos"]["profile"]
if (qosProfile !== null && qosProfile !== undefined) {
this.paramQos.rt1 = [] // .splice(0, this.paramQos.rt1.length)
this.paramQos.rt2 = [] // .splice(0, this.paramQos.rt2.length)
@@ -1406,7 +1374,6 @@
this.updateRxtxSettings(vals)
this.updateDpdiSettings(vals)
this.updateBuclnbSettings(vals)
- this.updateTcpaccelSettings(vals)
this.updateNetworkSettings(vals)
this.updateQosSettings(vals)
diff --git a/static/main-shps.html b/static/main-shps.html
index e1ecd63..d9ad6ee 100644
--- a/static/main-shps.html
+++ b/static/main-shps.html
@@ -513,33 +513,33 @@
updateRxtxSettings(vals) {
this.submitStatus.rxtx = false
- this.paramRxtx.txEn = vals["settings"]["txEn"]
- this.paramRxtx.txAutoStart = vals["settings"]["txAutoStart"]
- this.paramRxtx.txModulatorIsTest = vals["settings"]["txModulatorIsTest"]
- this.paramRxtx.txIsTestInput = vals["settings"]["txIsTestInput"]
- this.paramRxtx.txCentralFreq = vals["settings"]["txCentralFreq"]
- this.paramRxtx.txBaudrate = vals["settings"]["txBaudrate"]
- this.paramRxtx.txRolloff = vals["settings"]["txRolloff"]
- this.paramRxtx.txSpreadCoef = vals["settings"]["txSpreadCoef"]
- this.paramRxtx.txGoldan = vals["settings"]["txGoldan"]
- this.paramRxtx.txAttenuation = vals["settings"]["txAttenuation"]
- this.paramRxtx.rxAgcEn = vals["settings"]["rxAgcEn"]
- this.paramRxtx.rxManualGain = vals["settings"]["rxManualGain"]
- this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxSpectrumInversion"]
- this.paramRxtx.rxCentralFreq = vals["settings"]["rxCentralFreq"]
- this.paramRxtx.rxBaudrate = vals["settings"]["rxBaudrate"]
- this.paramRxtx.rxRolloff = vals["settings"]["rxRolloff"]
- this.paramRxtx.rxSpreadCoef = vals["settings"]["rxSpreadCoef"]
- this.paramRxtx.rxGoldan = vals["settings"]["rxGoldan"]
+ this.paramRxtx.txEn = vals["settings"]["rxtx"]["txEn"]
+ this.paramRxtx.txAutoStart = vals["settings"]["rxtx"]["txAutoStart"]
+ this.paramRxtx.txModulatorIsTest = vals["settings"]["rxtx"]["txModulatorIsTest"]
+ this.paramRxtx.txIsTestInput = vals["settings"]["rxtx"]["txIsTestInput"]
+ this.paramRxtx.txCentralFreq = vals["settings"]["rxtx"]["txCentralFreq"]
+ this.paramRxtx.txBaudrate = vals["settings"]["rxtx"]["txBaudrate"]
+ this.paramRxtx.txRolloff = vals["settings"]["rxtx"]["txRolloff"]
+ this.paramRxtx.txSpreadCoef = vals["settings"]["rxtx"]["txSpreadCoef"]
+ this.paramRxtx.txGoldan = vals["settings"]["rxtx"]["txGoldan"]
+ this.paramRxtx.txAttenuation = vals["settings"]["rxtx"]["txAttenuation"]
+ this.paramRxtx.rxAgcEn = vals["settings"]["rxtx"]["rxAgcEn"]
+ this.paramRxtx.rxManualGain = vals["settings"]["rxtx"]["rxManualGain"]
+ this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxtx"]["rxSpectrumInversion"]
+ this.paramRxtx.rxCentralFreq = vals["settings"]["rxtx"]["rxCentralFreq"]
+ this.paramRxtx.rxBaudrate = vals["settings"]["rxtx"]["rxBaudrate"]
+ this.paramRxtx.rxRolloff = vals["settings"]["rxtx"]["rxRolloff"]
+ this.paramRxtx.rxSpreadCoef = vals["settings"]["rxtx"]["rxSpreadCoef"]
+ this.paramRxtx.rxGoldan = vals["settings"]["rxtx"]["rxGoldan"]
},
updateBuclnbSettings(vals) {
this.submitStatus.buclnb = false
- this.paramBuclnb.bucRefClk10M = vals["settings"]["bucRefClk10M"]
- this.paramBuclnb.bucPowering = vals["settings"]["bucPowering"]
- this.paramBuclnb.lnbRefClk10M = vals["settings"]["lnbRefClk10M"]
- this.paramBuclnb.lnbPowering = vals["settings"]["lnbPowering"]
- this.paramBuclnb.srvRefClk10M = vals["settings"]["srvRefClk10M"]
- this.paramBuclnb.bucLnbAutoStart = vals["settings"]["bucLnbAutoStart"]
+ this.paramBuclnb.bucRefClk10M = vals["settings"]["buclnb"]["bucRefClk10M"]
+ this.paramBuclnb.bucPowering = vals["settings"]["buclnb"]["bucPowering"]
+ this.paramBuclnb.lnbRefClk10M = vals["settings"]["buclnb"]["lnbRefClk10M"]
+ this.paramBuclnb.lnbPowering = vals["settings"]["buclnb"]["lnbPowering"]
+ this.paramBuclnb.srvRefClk10M = vals["settings"]["buclnb"]["srvRefClk10M"]
+ this.paramBuclnb.bucLnbAutoStart = vals["settings"]["buclnb"]["bucLnbAutoStart"]
},
// ========== include end from 'common/all-params-methods.js.j2'
@@ -564,44 +564,43 @@
}
this.lastUpdateTime = new Date();
- this.initState = vals["mainState"]["initState"]
+ this.initState = vals["state"]["initState"]
+ this.testState = vals["state"]["testState"]
- this.statRx.state = vals["mainState"]["rx.state"]
- this.statRx.sym_sync_lock = vals["mainState"]["rx.sym_sync_lock"]
- this.statRx.freq_search_lock = vals["mainState"]["rx.freq_search_lock"]
- this.statRx.afc_lock = vals["mainState"]["rx.afc_lock"]
- this.statRx.pkt_sync = vals["mainState"]["rx.pkt_sync"]
- this.statRx.snr = vals["mainState"]["rx.snr"]
- this.statRx.rssi = vals["mainState"]["rx.rssi"]
- this.statRx.modcod = modcodToStr(vals["mainState"]["rx.modcod"])
- this.statRx.frameSizeNormal = vals["mainState"]["rx.frameSizeNormal"]
- this.statRx.isPilots = vals["mainState"]["rx.isPilots"]
- this.statRx.symError = vals["mainState"]["rx.symError"]
- this.statRx.freqErr = vals["mainState"]["rx.freqErr"]
- this.statRx.freqErrAcc = vals["mainState"]["rx.freqErrAcc"]
- this.statRx.inputSignalLevel = vals["mainState"]["rx.inputSignalLevel"]
- this.statRx.pllError = vals["mainState"]["rx.pllError"]
- this.statRx.speedOnRxKbit = vals["mainState"]["rx.speedOnRxKbit"]
- this.statRx.speedOnIifKbit = vals["mainState"]["rx.speedOnIifKbit"]
- this.statRx.packetsOk = vals["mainState"]["rx.packetsOk"]
- this.statRx.packetsBad = vals["mainState"]["rx.packetsBad"]
- this.statRx.packetsDummy = vals["mainState"]["rx.packetsDummy"]
+ this.statRx.state = vals["state"]["rx"]["state"]
+ this.statRx.sym_sync_lock = vals["state"]["rx"]["sym_sync_lock"]
+ this.statRx.freq_search_lock = vals["state"]["rx"]["freq_search_lock"]
+ this.statRx.afc_lock = vals["state"]["rx"]["afc_lock"]
+ this.statRx.pkt_sync = vals["state"]["rx"]["pkt_sync"]
+ this.statRx.snr = vals["state"]["rx"]["snr"]
+ this.statRx.rssi = vals["state"]["rx"]["rssi"]
+ this.statRx.modcod = modcodToStr(vals["state"]["rx"]["modcod"])
+ 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.inputSignalLevel = vals["state"]["rx"]["inputSignalLevel"]
+ this.statRx.pllError = vals["state"]["rx"]["pllError"]
+ this.statRx.speedOnRxKbit = vals["state"]["rx"]["speedOnRxKbit"]
+ this.statRx.speedOnIifKbit = vals["state"]["rx"]["speedOnIifKbit"]
+ this.statRx.packetsOk = vals["state"]["rx"]["packetsOk"]
+ this.statRx.packetsBad = vals["state"]["rx"]["packetsBad"]
+ this.statRx.packetsDummy = vals["state"]["rx"]["packetsDummy"]
- this.statTx.state = vals["mainState"]["tx.state"]
- this.statTx.modcod = modcodToStr(vals["mainState"]["tx.modcod"])
- this.statTx.speedOnTxKbit = vals["mainState"]["tx.speedOnTxKbit"]
- this.statTx.speedOnIifKbit = vals["mainState"]["tx.speedOnIifKbit"]
- this.statTx.centerFreq = vals["mainState"]["tx.centerFreq"]
- this.statTx.symSpeed = vals["mainState"]["tx.symSpeed"]
+ this.statTx.state = vals["state"]["tx"]["state"]
+ this.statTx.modcod = modcodToStr(vals["state"]["tx"]["modcod"])
+ this.statTx.speedOnTxKbit = vals["state"]["tx"]["speedOnTxKbit"]
+ this.statTx.speedOnIifKbit = vals["state"]["tx"]["speedOnIifKbit"]
+ this.statTx.centerFreq = vals["state"]["tx"]["centerFreq"]
+ this.statTx.symSpeed = vals["state"]["tx"]["symSpeed"]
- this.statDevice.adrv = vals["mainState"]["device.adrv"]
- this.statDevice.zynq = vals["mainState"]["device.zynq"]
- this.statDevice.fpga = vals["mainState"]["device.fpga"]
-
- this.testState = vals["mainState"]["testState"]
+ this.statDevice.adrv = vals["state"]["device"]["adrv"]
+ this.statDevice.zynq = vals["state"]["device"]["zynq"]
+ this.statDevice.fpga = vals["state"]["device"]["fpga"]
// аптайм приходит в секундах, надо преобразовать его в человеко-читаемый вид
- let uptime = vals["sysinfo"]["uptime"]
+ let uptime = vals["state"]["device"]["uptime"]
if (uptime) {
let secs = uptime % 60; uptime = Math.floor(uptime / 60)
let mins = uptime % 60; uptime = Math.floor(uptime / 60)
@@ -613,11 +612,11 @@
} else {
this.statOs.uptime = '?'
}
- this.statOs.load1 = vals["sysinfo"]["load1min"]
- this.statOs.load5 = vals["sysinfo"]["load5min"]
- this.statOs.load15 = vals["sysinfo"]["load15min"]
- this.statOs.totalram = vals["sysinfo"]["totalram"]
- this.statOs.freeram = vals["sysinfo"]["freeram"]
+ this.statOs.load1 = vals["state"]["device"]["load1min"]
+ this.statOs.load5 = vals["state"]["device"]["load5min"]
+ this.statOs.load15 = vals["state"]["device"]["load15min"]
+ this.statOs.totalram = vals["state"]["device"]["totalram"]
+ this.statOs.freeram = vals["state"]["device"]["freeram"]
},
resetPacketsStatistics() {
diff --git a/static/main-tdma.html b/static/main-tdma.html
index 6cd7102..6370a64 100644
--- a/static/main-tdma.html
+++ b/static/main-tdma.html
@@ -551,39 +551,39 @@
updateRxtxSettings(vals) {
this.submitStatus.rxtx = false
- this.paramRxtx.txEn = vals["settings"]["txEn"]
- this.paramRxtx.txModulatorIsTest = vals["settings"]["txModulatorIsTest"]
- this.paramRxtx.txCentralFreq = this.inputFormatNumber(vals["settings"]["txCentralFreq"], {min:900000,step:0.01})
- this.paramRxtx.txAttenuation = vals["settings"]["txAttenuation"]
- this.paramRxtx.rxAgcEn = vals["settings"]["rxAgcEn"]
- this.paramRxtx.rxManualGain = vals["settings"]["rxManualGain"]
- this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxSpectrumInversion"]
- this.paramRxtx.rxCentralFreq = this.inputFormatNumber(vals["settings"]["rxCentralFreq"], {min:900000,step:0.01})
- this.paramRxtx.rxBaudrate = this.inputFormatNumber(vals["settings"]["rxBaudrate"], {min:200000,max:54000000,step:1})
- this.paramRxtx.rxRolloff = vals["settings"]["rxRolloff"]
+ this.paramRxtx.txEn = vals["settings"]["rxtx"]["txEn"]
+ this.paramRxtx.txModulatorIsTest = vals["settings"]["rxtx"]["txModulatorIsTest"]
+ this.paramRxtx.txCentralFreq = this.inputFormatNumber(vals["settings"]["rxtx"]["txCentralFreq"], {min:900000,step:0.01})
+ this.paramRxtx.txAttenuation = vals["settings"]["rxtx"]["txAttenuation"]
+ this.paramRxtx.rxAgcEn = vals["settings"]["rxtx"]["rxAgcEn"]
+ this.paramRxtx.rxManualGain = vals["settings"]["rxtx"]["rxManualGain"]
+ this.paramRxtx.rxSpectrumInversion = vals["settings"]["rxtx"]["rxSpectrumInversion"]
+ this.paramRxtx.rxCentralFreq = this.inputFormatNumber(vals["settings"]["rxtx"]["rxCentralFreq"], {min:900000,step:0.01})
+ this.paramRxtx.rxBaudrate = this.inputFormatNumber(vals["settings"]["rxtx"]["rxBaudrate"], {min:200000,max:54000000,step:1})
+ this.paramRxtx.rxRolloff = vals["settings"]["rxtx"]["rxRolloff"]
},
updateBuclnbSettings(vals) {
this.submitStatus.buclnb = false
- this.paramBuclnb.bucRefClk10M = vals["settings"]["bucRefClk10M"]
- this.paramBuclnb.bucPowering = vals["settings"]["bucPowering"]
- this.paramBuclnb.lnbRefClk10M = vals["settings"]["lnbRefClk10M"]
- this.paramBuclnb.lnbPowering = vals["settings"]["lnbPowering"]
- this.paramBuclnb.srvRefClk10M = vals["settings"]["srvRefClk10M"]
- this.paramBuclnb.bucLnbAutoStart = vals["settings"]["bucLnbAutoStart"]
+ this.paramBuclnb.bucRefClk10M = vals["settings"]["buclnb"]["bucRefClk10M"]
+ this.paramBuclnb.bucPowering = vals["settings"]["buclnb"]["bucPowering"]
+ this.paramBuclnb.lnbRefClk10M = vals["settings"]["buclnb"]["lnbRefClk10M"]
+ this.paramBuclnb.lnbPowering = vals["settings"]["buclnb"]["lnbPowering"]
+ this.paramBuclnb.srvRefClk10M = vals["settings"]["buclnb"]["srvRefClk10M"]
+ this.paramBuclnb.bucLnbAutoStart = vals["settings"]["buclnb"]["bucLnbAutoStart"]
},
updateDpdiSettings(vals) {
this.submitStatus.dpdi = false
- this.paramDpdi.dpdiIsPositional = vals["settings"]["dpdiIsPositional"]
- this.paramDpdi.dpdiPositionStationLatitude = vals["settings"]["dpdiPositionStationLatitude"]
- this.paramDpdi.dpdiPositionStationLongitude = vals["settings"]["dpdiPositionStationLongitude"]
- this.paramDpdi.dpdiPositionSatelliteLongitude = vals["settings"]["dpdiPositionSatelliteLongitude"]
- this.paramDpdi.dpdiDelay = vals["settings"]["dpdiDelay"]
+ this.paramDpdi.dpdiIsPositional = vals["settings"]["dpdi"]["dpdiIsPositional"]
+ this.paramDpdi.dpdiPositionStationLatitude = vals["settings"]["dpdi"]["dpdiPositionStationLatitude"]
+ this.paramDpdi.dpdiPositionStationLongitude = vals["settings"]["dpdi"]["dpdiPositionStationLongitude"]
+ this.paramDpdi.dpdiPositionSatelliteLongitude = vals["settings"]["dpdi"]["dpdiPositionSatelliteLongitude"]
+ this.paramDpdi.dpdiDelay = vals["settings"]["dpdi"]["dpdiDelay"]
},
updateNetworkSettings(vals) {
this.submitStatus.network = false
- this.paramNetwork.netCesPassword = vals["settings"]["netCesPassword"]
- this.paramNetwork.netManagementIp = vals["settings"]["netManagementIp"]
- this.paramNetwork.netServerName = vals["settings"]["netServerName"]
+ this.paramNetwork.netCesPassword = vals["settings"]["network"]["netCesPassword"]
+ this.paramNetwork.netManagementIp = vals["settings"]["network"]["netManagementIp"]
+ this.paramNetwork.netServerName = vals["settings"]["network"]["netServerName"]
},
// ========== include end from 'common/all-params-methods.js.j2'
@@ -608,47 +608,46 @@
}
this.lastUpdateTime = new Date();
- this.initState = vals["mainState"]["initState"]
+ this.initState = vals["state"]["initState"]
+ this.testState = vals["state"]["testState"]
- this.statRx.state = vals["mainState"]["rx.state"]
- this.statRx.sym_sync_lock = vals["mainState"]["rx.sym_sync_lock"]
- this.statRx.freq_search_lock = vals["mainState"]["rx.freq_search_lock"]
- this.statRx.afc_lock = vals["mainState"]["rx.afc_lock"]
- this.statRx.pkt_sync = vals["mainState"]["rx.pkt_sync"]
- this.statRx.snr = vals["mainState"]["rx.snr"]
- this.statRx.rssi = vals["mainState"]["rx.rssi"]
- this.statRx.modcod = modcodToStr(vals["mainState"]["rx.modcod"])
- this.statRx.frameSizeNormal = vals["mainState"]["rx.frameSizeNormal"]
- this.statRx.isPilots = vals["mainState"]["rx.isPilots"]
- this.statRx.symError = vals["mainState"]["rx.symError"]
- this.statRx.freqErr = vals["mainState"]["rx.freqErr"]
- this.statRx.freqErrAcc = vals["mainState"]["rx.freqErrAcc"]
- this.statRx.inputSignalLevel = vals["mainState"]["rx.inputSignalLevel"]
- this.statRx.pllError = vals["mainState"]["rx.pllError"]
- this.statRx.speedOnRxKbit = vals["mainState"]["rx.speedOnRxKbit"]
- this.statRx.speedOnIifKbit = vals["mainState"]["rx.speedOnIifKbit"]
- this.statRx.packetsOk = vals["mainState"]["rx.packetsOk"]
- this.statRx.packetsBad = vals["mainState"]["rx.packetsBad"]
- this.statRx.packetsDummy = vals["mainState"]["rx.packetsDummy"]
+ this.statRx.state = vals["state"]["rx"]["state"]
+ this.statRx.sym_sync_lock = vals["state"]["rx"]["sym_sync_lock"]
+ this.statRx.freq_search_lock = vals["state"]["rx"]["freq_search_lock"]
+ this.statRx.afc_lock = vals["state"]["rx"]["afc_lock"]
+ this.statRx.pkt_sync = vals["state"]["rx"]["pkt_sync"]
+ this.statRx.snr = vals["state"]["rx"]["snr"]
+ this.statRx.rssi = vals["state"]["rx"]["rssi"]
+ this.statRx.modcod = modcodToStr(vals["state"]["rx"]["modcod"])
+ 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.inputSignalLevel = vals["state"]["rx"]["inputSignalLevel"]
+ this.statRx.pllError = vals["state"]["rx"]["pllError"]
+ this.statRx.speedOnRxKbit = vals["state"]["rx"]["speedOnRxKbit"]
+ this.statRx.speedOnIifKbit = vals["state"]["rx"]["speedOnIifKbit"]
+ this.statRx.packetsOk = vals["state"]["rx"]["packetsOk"]
+ this.statRx.packetsBad = vals["state"]["rx"]["packetsBad"]
+ this.statRx.packetsDummy = vals["state"]["rx"]["packetsDummy"]
- this.statTx.state = vals["mainState"]["tx.state"]
- this.statTx.modcod = modcodToStr(vals["mainState"]["tx.modcod"])
- this.statTx.speedOnTxKbit = vals["mainState"]["tx.speedOnTxKbit"]
- this.statTx.speedOnIifKbit = vals["mainState"]["tx.speedOnIifKbit"]
- this.statTx.centerFreq = vals["mainState"]["tx.centerFreq"]
- this.statTx.symSpeed = vals["mainState"]["tx.symSpeed"]
+ this.statTx.state = vals["state"]["tx"]["state"]
+ this.statTx.modcod = modcodToStr(vals["state"]["tx"]["modcod"])
+ this.statTx.speedOnTxKbit = vals["state"]["tx"]["speedOnTxKbit"]
+ this.statTx.speedOnIifKbit = vals["state"]["tx"]["speedOnIifKbit"]
+ this.statTx.centerFreq = vals["state"]["tx"]["centerFreq"]
+ this.statTx.symSpeed = vals["state"]["tx"]["symSpeed"]
- this.statDevice.adrv = vals["mainState"]["device.adrv"]
- this.statDevice.zynq = vals["mainState"]["device.zynq"]
- this.statDevice.fpga = vals["mainState"]["device.fpga"]
- this.statDevice.upgradeStatus = vals["mainState"]["device.upgradeStatus"]
- this.statDevice.upgradePercent = vals["mainState"]["device.upgradePercent"]
- this.statDevice.upgradeImage = vals["mainState"]["device.upgradeImage"]
-
- this.testState = vals["mainState"]["testState"]
+ this.statDevice.adrv = vals["state"]["device"]["adrv"]
+ this.statDevice.zynq = vals["state"]["device"]["zynq"]
+ this.statDevice.fpga = vals["state"]["device"]["fpga"]
+ this.statDevice.upgradeStatus = vals["state"]["device"]["upgradeStatus"]
+ this.statDevice.upgradePercent = vals["state"]["device"]["upgradePercent"]
+ this.statDevice.upgradeImage = vals["state"]["device"]["upgradeImage"]
// аптайм приходит в секундах, надо преобразовать его в человеко-читаемый вид
- let uptime = vals["sysinfo"]["uptime"]
+ let uptime = vals["state"]["device"]["uptime"]
if (uptime) {
let secs = uptime % 60; uptime = Math.floor(uptime / 60)
let mins = uptime % 60; uptime = Math.floor(uptime / 60)
@@ -660,11 +659,11 @@
} else {
this.statOs.uptime = '?'
}
- this.statOs.load1 = vals["sysinfo"]["load1min"]
- this.statOs.load5 = vals["sysinfo"]["load5min"]
- this.statOs.load15 = vals["sysinfo"]["load15min"]
- this.statOs.totalram = vals["sysinfo"]["totalram"]
- this.statOs.freeram = vals["sysinfo"]["freeram"]
+ this.statOs.load1 = vals["state"]["device"]["load1min"]
+ this.statOs.load5 = vals["state"]["device"]["load5min"]
+ this.statOs.load15 = vals["state"]["device"]["load15min"]
+ this.statOs.totalram = vals["state"]["device"]["totalram"]
+ this.statOs.freeram = vals["state"]["device"]["freeram"]
},
resetPacketsStatistics() {