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

фикс: расчетная скорость показывала "не число"

Browse Source
This commit is contained in:
Vladislav Ostapov 2025-01-23 15:25:46 +03:00
parent fdc4935d8c
commit 73e1d281b2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
front-generator/template/common/setup-methods.js.j2
View File

@ -17,10 +17,11 @@
return '?' return '?'
}, },
calcInterfaceSpeedKb(baud, modulation, speed, frameSizeNormal) { calcInterfaceSpeedKb(baud, modulation, speed, frameSizeNormal) {
const mBaud = parseInt(baud.replace(/[^0-9]/g, ''))
const mMod = Math.max(2, ['', '', 'qpsk', '8psk', '16apsk', '32apsk'].indexOf(modulation)) const mMod = Math.max(2, ['', '', 'qpsk', '8psk', '16apsk', '32apsk'].indexOf(modulation))
const speedVals = {'1/4': 0.25, '1/3': 0.333, '2/5': 0.4, '1/2': 0.5, '3/5': 0.6, '2/3': 0.666, '3/4': 0.75, '4/5': 0.8, '5/6': 0.833, '8/9': 0.888, '9/10': 0.9} const speedVals = {'1/4': 0.25, '1/3': 0.333, '2/5': 0.4, '1/2': 0.5, '3/5': 0.6, '2/3': 0.666, '3/4': 0.75, '4/5': 0.8, '5/6': 0.833, '8/9': 0.888, '9/10': 0.9}
const mSpeed = speed in speedVals ? speedVals[speed] : 1 const mSpeed = speed in speedVals ? speedVals[speed] : 1
const result = (baud * mMod * mSpeed) / 1024 const result = (mBaud * mMod * mSpeed) / 1024
const calcSnr = this.calcRequiredSnr(frameSizeNormal, modulation, speed) const calcSnr = this.calcRequiredSnr(frameSizeNormal, modulation, speed)
let snr; let snr;
if (isNaN(calcSnr)) { snr = `ОСШ=?` } else { snr=`ОСШ=${calcSnr}` } if (isNaN(calcSnr)) { snr = `ОСШ=?` } else { snr=`ОСШ=${calcSnr}` }

3
static/main-scpc.html
View File

@ -1058,10 +1058,11 @@
return '?' return '?'
}, },
calcInterfaceSpeedKb(baud, modulation, speed, frameSizeNormal) { calcInterfaceSpeedKb(baud, modulation, speed, frameSizeNormal) {
const mBaud = parseInt(baud.replace(/[^0-9]/g, ''))
const mMod = Math.max(2, ['', '', 'qpsk', '8psk', '16apsk', '32apsk'].indexOf(modulation)) const mMod = Math.max(2, ['', '', 'qpsk', '8psk', '16apsk', '32apsk'].indexOf(modulation))
const speedVals = {'1/4': 0.25, '1/3': 0.333, '2/5': 0.4, '1/2': 0.5, '3/5': 0.6, '2/3': 0.666, '3/4': 0.75, '4/5': 0.8, '5/6': 0.833, '8/9': 0.888, '9/10': 0.9} const speedVals = {'1/4': 0.25, '1/3': 0.333, '2/5': 0.4, '1/2': 0.5, '3/5': 0.6, '2/3': 0.666, '3/4': 0.75, '4/5': 0.8, '5/6': 0.833, '8/9': 0.888, '9/10': 0.9}
const mSpeed = speed in speedVals ? speedVals[speed] : 1 const mSpeed = speed in speedVals ? speedVals[speed] : 1
const result = (baud * mMod * mSpeed) / 1024 const result = (mBaud * mMod * mSpeed) / 1024
const calcSnr = this.calcRequiredSnr(frameSizeNormal, modulation, speed) const calcSnr = this.calcRequiredSnr(frameSizeNormal, modulation, speed)
let snr; let snr;
if (isNaN(calcSnr)) { snr = `ОСШ=?` } else { snr=`ОСШ=${calcSnr}` } if (isNaN(calcSnr)) { snr = `ОСШ=?` } else { snr=`ОСШ=${calcSnr}` }