отладочная версия веб-сервера, работает со статистикой и настройкой. Не показывает параметры прошивки
This commit is contained in:
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user