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

static/main-scpc.html

@@ -322,21 +322,21 @@
             <div class="settings-set-container" v-show="paramRxtx.isCinC">
                 <label>
                     <span>Метод расчета задержки</span>
-                    <select v-model="paramCinc.cincIsPositional">
+                    <select v-model="paramDpdi.dpdiIsPositional">
                         <option :value="true">Позиционированием</option>
                         <option :value="false">Окном задержки</option>
                     </select>
                 </label>
-                <label><span>Полоса поиска, КГц ±</span><input type="number" v-model="paramCinc.cincSearchBandwidth" max="100" step="1"/></label>
-                <h2 v-show="paramCinc.cincIsPositional === true">Настройки позиционирования</h2>
-                <label v-show="paramCinc.cincIsPositional === true"><span>Широта станции</span><input type="number" v-model="paramCinc.cincPositionStationLatitude" min="-180" max="180" step="1e-06"/></label>
-                <label v-show="paramCinc.cincIsPositional === true"><span>Долгота станции</span><input type="number" v-model="paramCinc.cincPositionStationLongitude" min="-180" max="180" step="1e-06"/></label>
-                <label v-show="paramCinc.cincIsPositional === true"><span>Подспутниковая точка</span><input type="number" v-model="paramCinc.cincPositionSatelliteLongitude" min="-180" max="180" step="1e-06"/></label>
-                <h2 v-show="paramCinc.cincIsPositional === false">Задержка до спутника</h2>
-                <label v-show="paramCinc.cincIsPositional === false"><span>от, мс</span><input type="number" v-model="paramCinc.cincDelayMin" max="400" step="0.1"/></label>
-                <label v-show="paramCinc.cincIsPositional === false"><span>до, мс</span><input type="number" v-model="paramCinc.cincDelayMax" max="400" step="0.1"/></label>
+                <label><span>Полоса поиска, КГц ±</span><input type="number" v-model="paramDpdi.dpdiSearchBandwidth" max="100" step="1"/></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>
+                <h2 v-show="paramDpdi.dpdiIsPositional === false">Задержка до спутника</h2>
+                <label v-show="paramDpdi.dpdiIsPositional === false"><span>от, мс</span><input type="number" v-model="paramDpdi.dpdiDelayMin" max="400" step="0.1"/></label>
+                <label v-show="paramDpdi.dpdiIsPositional === false"><span>до, мс</span><input type="number" v-model="paramDpdi.dpdiDelayMax" max="400" step="0.1"/></label>
             </div>
-            <button class="action-button" @click="settingsSubmitCinc()" v-show="paramRxtx.isCinC">Сохранить <span class="submit-spinner" v-show="submitStatus.cinc"></span></button>
+            <button class="action-button" @click="settingsSubmitDpdi()" v-show="paramRxtx.isCinC">Сохранить <span class="submit-spinner" v-show="submitStatus.dpdi"></span></button>
             <h2>Настройки питания и опорного генератора</h2>
             <div class="tabs-item-flex-container">
                 <div class="settings-set-container">
@@ -573,7 +573,7 @@
                 // false - означает что статистика не отправляется, true - отправляется
                 submitStatus: {
                     rxtx: false,
-                    cinc: false,
+                    dpdi: false,
                     buclnb: false,
                     tcpaccel: false,
                     network: false,
@@ -617,14 +617,14 @@
                     rxRolloff: 2,
                     rxGoldan: 0,
                 },
-                paramCinc: {
-                    cincIsPositional: true,
-                    cincSearchBandwidth: 0,
-                    cincPositionStationLatitude: -180,
-                    cincPositionStationLongitude: -180,
-                    cincPositionSatelliteLongitude: -180,
-                    cincDelayMin: 0,
-                    cincDelayMax: 0,
+                paramDpdi: {
+                    dpdiIsPositional: true,
+                    dpdiSearchBandwidth: 0,
+                    dpdiPositionStationLatitude: -180,
+                    dpdiPositionStationLongitude: -180,
+                    dpdiPositionSatelliteLongitude: -180,
+                    dpdiDelayMin: 0,
+                    dpdiDelayMax: 0,
                 },
                 paramBuclnb: {
                     bucRefClk10M: false,
@@ -815,24 +815,24 @@
                     .catch((reason) => { alert(`Ошибка при применении настроек: ${reason}`) })
                     .finally(() => { this.submitStatus.rxtx = false })
             },
-            settingsSubmitCinc() {
-                if (this.submitStatus.cinc) { return }
+            settingsSubmitDpdi() {
+                if (this.submitStatus.dpdi) { return }
 
                 let query = {
-                    "cincIsPositional": this.paramCinc.cincIsPositional,
-                    "cincSearchBandwidth": this.paramCinc.cincSearchBandwidth,
-                    "cincPositionStationLatitude": this.paramCinc.cincPositionStationLatitude,
-                    "cincPositionStationLongitude": this.paramCinc.cincPositionStationLongitude,
-                    "cincPositionSatelliteLongitude": this.paramCinc.cincPositionSatelliteLongitude,
-                    "cincDelayMin": this.paramCinc.cincDelayMin,
-                    "cincDelayMax": this.paramCinc.cincDelayMax,
+                    "dpdiIsPositional": this.paramDpdi.dpdiIsPositional,
+                    "dpdiSearchBandwidth": this.paramDpdi.dpdiSearchBandwidth,
+                    "dpdiPositionStationLatitude": this.paramDpdi.dpdiPositionStationLatitude,
+                    "dpdiPositionStationLongitude": this.paramDpdi.dpdiPositionStationLongitude,
+                    "dpdiPositionSatelliteLongitude": this.paramDpdi.dpdiPositionSatelliteLongitude,
+                    "dpdiDelayMin": this.paramDpdi.dpdiDelayMin,
+                    "dpdiDelayMax": this.paramDpdi.dpdiDelayMax,
                 }
 
-                this.submitStatus.cinc = true
-                fetch('/api/set/cinc', {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.updateCincSettings(vals) })
+                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.cinc = false })
+                    .finally(() => { this.submitStatus.dpdi = false })
             },
             settingsSubmitBuclnb() {
                 if (this.submitStatus.buclnb) { return }
@@ -920,15 +920,15 @@
                 this.paramRxtx.rxRolloff = vals["settings"]["rxRolloff"]
                 this.paramRxtx.rxGoldan = vals["settings"]["rxGoldan"]
             },
-            updateCincSettings(vals) {
-                this.submitStatus.cinc = false
-                this.paramCinc.cincIsPositional = vals["settings"]["cincIsPositional"]
-                this.paramCinc.cincSearchBandwidth = vals["settings"]["cincSearchBandwidth"]
-                this.paramCinc.cincPositionStationLatitude = vals["settings"]["cincPositionStationLatitude"]
-                this.paramCinc.cincPositionStationLongitude = vals["settings"]["cincPositionStationLongitude"]
-                this.paramCinc.cincPositionSatelliteLongitude = vals["settings"]["cincPositionSatelliteLongitude"]
-                this.paramCinc.cincDelayMin = vals["settings"]["cincDelayMin"]
-                this.paramCinc.cincDelayMax = vals["settings"]["cincDelayMax"]
+            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"]
             },
             updateBuclnbSettings(vals) {
                 this.submitStatus.buclnb = false
@@ -1381,7 +1381,7 @@
                     let vals = await d.json()
                     this.settingFetchComplete = true
                     this.updateRxtxSettings(vals)
-                    this.updateCincSettings(vals)
+                    this.updateDpdiSettings(vals)
                     this.updateBuclnbSettings(vals)
                     this.updateTcpaccelSettings(vals)
                     this.updateNetworkSettings(vals)

static/main-tdma.html

@@ -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']) {