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

логика работы TDMA

Browse Source
This commit is contained in:
Vladislav Ostapov
2024-11-28 16:56:20 +03:00
parent 925fec6dda
commit 572a2583f0
5 changed files with 152 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
static/internet.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 303 KiB

After

Width:  |  Height:  |  Size: 72 KiB

32
static/main-tdma.html
View File

@@ -90,11 +90,11 @@
<table>
<tbody>
<tr><th>Передача</th><td><span :class="{ indicator_bad: stat_tx.state === false, indicator_good: stat_tx.state === true, indicator: true }"></span></td></tr>
<tr><th>Modcod</th><td class="value-bad">{{ stat_tx.modcod }}</td></tr>
<tr><th>Modcod</th><td>{{ stat_tx.modcod }}</td></tr>
<tr><th>Инф. скорость на передаче</th><td>{{ stat_tx.speedOnTxKbit }} kbit/s</td></tr>
<tr><th>Инф. скорость на интерфейсе</th><td>{{ stat_tx.speedOnIifKbit }} kbit/s</td></tr>
<tr><th>Центральная частота</th><td class="value-bad">N/A kHz</td></tr>
<tr><th>Символьная скорость</th><td class="value-bad">N/A ksymb</td></tr>
<tr><th>Центральная частота</th><td>{{ stat_tx.centerFreq }} kHz</td></tr>
<tr><th>Символьная скорость</th><td>{{ stat_tx.symSpeed }} ksymb</td></tr>
</tbody>
</table>
</div>
@@ -200,7 +200,6 @@
<select v-model="param.buc.powering">
<option value="0">выкл</option>
<option value="24">24В</option>
<option value="48">48В</option>
</select>
</label>
</div>
@@ -398,19 +397,15 @@
<span class="slider"></span>
</span>
</label>
<label v-if="param.debugSend.en">
<label v-show="param.debugSend.en">
<span>IP адрес получателя</span>
<input v-model="param.debugSend.receiverIp" required type="text" pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}">
</label>
<label>
<span>Порт для CinC</span>
<input v-model="param.debugSend.portCinC" type="number" min="0" max="65535">
</label>
<label>
<span>Порт для CinC</span>
<label v-show="param.debugSend.en">
<span>Порт для данных</span>
<input v-model="param.debugSend.portData" type="number" min="0" max="65535">
</label>
<label>
<label v-show="param.debugSend.en">
<span>Таймаут</span>
<input v-model="param.debugSend.timeout" type="number" pattern="^[0-9]+$">
</label>
@@ -430,6 +425,9 @@
<div>
<button class="dangerous-button" @click="doModemReboot()">Перезагрузить модем <span class="submit-spinner" v-show="submitStatus.modemReboot !== null"></span></button>
</div>
<div v-show="submitStatus.modemReboot !== null">
<img src="/internet.jpg" loading="lazy" alt="internet"/>
</div>
<div>
<button class="dangerous-button" onclick="fetch('/api/resetSettings', { method: 'POST' }).then((r) => { window.location.reload(); })">Сбросить модем до заводских настроек</button>
</div>
@@ -443,7 +441,6 @@
<button class="action-button" @click="settingsUploadUpdate()">Загрузить<span class="submit-spinner" v-show="submitStatus.firmwareUpload"></span></button>
<button class="dangerous-button" v-show="uploadFw.sha256 !== null" @click="settingsPerformFirmwareUpgrade()">Обновить встроенное ПО <span class="submit-spinner" v-show="submitStatus.firmwareUpgrade"></span></button>
</div>
<img src="/internet.jpg" loading="lazy" alt="internet" width="500px"/>
</div>
<p>Последнее обновление статистики: {{ lastUpdateTime }}</p>
</div>
@@ -639,7 +636,7 @@
state: '?',
// прочие поля
modcod: '?', speedOnTxKbit: '?', speedOnIifKbit: '?', centralFreq: '?', symSpeed: '?',
modcod: '?', speedOnTxKbit: '?', speedOnIifKbit: '?', centerFreq: '?', symSpeed: '?',
},
stat_device: { // температурные датчики
adrv: 0, zynq: 0, fpga: 0
@@ -685,7 +682,6 @@
debugSend: {
en: false,
receiverIp: '0.0.0.0', // 0.0.0.0
portCinC: 0,
portData: 0,
timeout: 0
},
@@ -745,7 +741,6 @@
updateStatistics(vals) {
this.lastUpdateTime = new Date();
this.initState = vals["mainState"]["initState"]
this.isCinC = vals["mainState"]["isCinC"]
this.stat_rx.state = vals["mainState"]["rx.state"]
this.stat_rx.sym_sync_lock = vals["mainState"]["rx.sym_sync_lock"]
@@ -772,7 +767,7 @@
this.stat_tx.modcod = modcodToStr(vals["mainState"]["tx.modcod"])
this.stat_tx.speedOnTxKbit = vals["mainState"]["tx.speedOnTxKbit"]
this.stat_tx.speedOnIifKbit = vals["mainState"]["tx.speedOnIifKbit"]
this.stat_tx.centralFreq = vals["mainState"]["tx.centralFreq"]
this.stat_tx.centerFreq = vals["mainState"]["tx.centerFreq"]
this.stat_tx.symSpeed = vals["mainState"]["tx.symSpeed"]
this.stat_device.adrv = vals["mainState"]["device.adrv"]
@@ -800,6 +795,7 @@
"tx.centerFreq": this.param.tx.centerFreq,
"tx.cymRate": this.param.tx.cymRate,
"tx.attenuation": this.param.tx.attenuation,
"rx.gainMode": this.param.rx.gainMode,
"rx.manualGain": this.param.rx.manualGain,
"rx.spectrumInversion": this.param.rx.spectrumInversion,
@@ -976,7 +972,6 @@
let query = {
"debugSend.en": this.param.debugSend.en,
"debugSend.receiverIp": this.param.debugSend.receiverIp,
"debugSend.portCinC": this.param.debugSend.portCinC,
"debugSend.portData": this.param.debugSend.portData,
"debugSend.timeout": this.param.debugSend.timeout
}
@@ -1156,7 +1151,6 @@
this.submitStatus.debugSend = false
this.param.debugSend.en = vals["settings"]["debugSend.en"]
this.param.debugSend.receiverIp = vals["settings"]["debugSend.receiverIp"]
this.param.debugSend.portCinC = vals["settings"]["debugSend.portCinC"]
this.param.debugSend.portData = vals["settings"]["debugSend.portData"]
this.param.debugSend.timeout = vals["settings"]["debugSend.timeout"]
},