VladislavOstapov/terminal-web-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

изменил везде настройки CinC на настройки DPDI, что верно и что используется теперь в TDMA модеме

Browse Source
This commit is contained in:
Vladislav Ostapov
2025-04-01 17:18:34 +03:00
parent fe3b45dc9e
commit 1b6b8b5329
8 changed files with 198 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
static/main-tdma.html
View File

@@ -155,11 +155,23 @@
</label>
</div>
</div>
<div class="settings-set-container">
<h3>Настройки позиционирования</h3>
<label><span>Задержка до спутника, мс</span><input type="number" v-model="paramRxtx.rxTxSatDelay" max="600" step="1"/></label>
</div>
<button class="action-button" @click="settingsSubmitRxtx()">Сохранить <span class="submit-spinner" v-show="submitStatus.rxtx"></span></button>
<h2>Настройки DPDI</h2>
<div class="settings-set-container">
<label>
<span>Метод расчета задержки</span>
<select v-model="paramDpdi.dpdiIsPositional">
<option :value="true">Позиционированием</option>
<option :value="false">Окном задержки</option>
</select>
</label>
<h2 v-show="paramDpdi.dpdiIsPositional === true">Настройки позиционирования</h2>
<label v-show="paramDpdi.dpdiIsPositional === true"><span>Широта станции</span><input type="number" v-model="paramDpdi.dpdiPositionStationLatitude" min="-180" max="180" step="1e-06"/></label>
<label v-show="paramDpdi.dpdiIsPositional === true"><span>Долгота станции</span><input type="number" v-model="paramDpdi.dpdiPositionStationLongitude" min="-180" max="180" step="1e-06"/></label>
<label v-show="paramDpdi.dpdiIsPositional === true"><span>Подспутниковая точка</span><input type="number" v-model="paramDpdi.dpdiPositionSatelliteLongitude" min="-180" max="180" step="1e-06"/></label>
<label v-show="paramDpdi.dpdiIsPositional === false"><span>Задержка до спутника, мс</span><input type="number" v-model="paramDpdi.dpdiDelay" max="400" step="0.1"/></label>
</div>
<button class="action-button" @click="settingsSubmitDpdi()">Сохранить <span class="submit-spinner" v-show="submitStatus.dpdi"></span></button>
<h2>Настройки питания и опорного генератора</h2>
<div class="tabs-item-flex-container">
<div class="settings-set-container">
@@ -285,6 +297,7 @@
submitStatus: {
rxtx: false,
buclnb: false,
dpdi: false,
network: false,
firmwareUpload: false,
firmwareUpgrade: false,
@@ -304,7 +317,6 @@
rxCentralFreq: 900000,
rxBaudrate: 0,
rxRolloff: 2,
rxTxSatDelay: 0,
},
paramBuclnb: {
bucRefClk10M: false,
@@ -314,6 +326,13 @@
srvRefClk10M: false,
bucLnbAutoStart: false,
},
paramDpdi: {
dpdiIsPositional: true,
dpdiPositionStationLatitude: -180,
dpdiPositionStationLongitude: -180,
dpdiPositionSatelliteLongitude: -180,
dpdiDelay: 0,
},
paramNetwork: {
netManagementIp: null,
netIsL2: false,
@@ -445,7 +464,6 @@
"rxCentralFreq": this.paramRxtx.rxCentralFreq,
"rxBaudrate": this.paramRxtx.rxBaudrate,
"rxRolloff": this.paramRxtx.rxRolloff,
"rxTxSatDelay": this.paramRxtx.rxTxSatDelay,
}
this.submitStatus.rxtx = true
@@ -473,6 +491,23 @@
.catch((reason) => { alert(`Ошибка при применении настроек: ${reason}`) })
.finally(() => { this.submitStatus.buclnb = false })
},
settingsSubmitDpdi() {
if (this.submitStatus.dpdi) { return }
let query = {
"dpdiIsPositional": this.paramDpdi.dpdiIsPositional,
"dpdiPositionStationLatitude": this.paramDpdi.dpdiPositionStationLatitude,
"dpdiPositionStationLongitude": this.paramDpdi.dpdiPositionStationLongitude,
"dpdiPositionSatelliteLongitude": this.paramDpdi.dpdiPositionSatelliteLongitude,
"dpdiDelay": this.paramDpdi.dpdiDelay,
}
this.submitStatus.dpdi = true
fetch('/api/set/dpdi', {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.updateDpdiSettings(vals) })
.catch((reason) => { alert(`Ошибка при применении настроек: ${reason}`) })
.finally(() => { this.submitStatus.dpdi = false })
},
settingsSubmitNetwork() {
if (this.submitStatus.network) { return }
{ if (!confirm("Применение этих настроек может сделать модем недоступным! Продолжить?")) return }
@@ -504,7 +539,6 @@
this.paramRxtx.rxCentralFreq = vals["settings"]["rxCentralFreq"]
this.paramRxtx.rxBaudrate = vals["settings"]["rxBaudrate"]
this.paramRxtx.rxRolloff = vals["settings"]["rxRolloff"]
this.paramRxtx.rxTxSatDelay = vals["settings"]["rxTxSatDelay"]
},
updateBuclnbSettings(vals) {
this.submitStatus.buclnb = false
@@ -515,6 +549,14 @@
this.paramBuclnb.srvRefClk10M = vals["settings"]["srvRefClk10M"]
this.paramBuclnb.bucLnbAutoStart = vals["settings"]["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"]
},
updateNetworkSettings(vals) {
this.submitStatus.network = false
this.paramNetwork.netManagementIp = vals["settings"]["netManagementIp"]
@@ -688,6 +730,7 @@
this.settingFetchComplete = true
this.updateRxtxSettings(vals)
this.updateBuclnbSettings(vals)
this.updateDpdiSettings(vals)
this.updateNetworkSettings(vals)
if ('netServerName' in vals['settings']) {