From 24cb1061a7179329bc40a56024963e6c19e666f8 Mon Sep 17 00:00:00 2001 From: Vladislav Ostapov Date: Sat, 28 Dec 2024 11:20:37 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=BD=D1=83?= =?UTF-8?q?=D1=8E=20=D1=81=D0=BA=D0=BE=D1=80=D0=BE=D1=81=D1=82=D1=8C=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=B4=D0=B0=203/5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/main-scpc.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/static/main-scpc.html b/static/main-scpc.html index 546c318..d412901 100644 --- a/static/main-scpc.html +++ b/static/main-scpc.html @@ -667,15 +667,13 @@ function modcodToStr(modcod) { // модкоды из раздела 5.5.2.2 https://www.etsi.org/deliver/etsi_en/302300_302399/302307/01.01.02_60/en_302307v010102p.pdf - - // NOTE модкоды со скоростью хода 3/5 не работают const modcods = [ "DUMMY", "QPSK 1/4", "QPSK 1/3", "QPSK 2/5", "QPSK 1/2", - "QPSK 3/5", // отключено + "QPSK 3/5", "QPSK 2/3", "QPSK 3/4", "QPSK 4/5", @@ -683,7 +681,7 @@ "QPSK 8/9", "QPSK 9/10", - "8PSK 3/5", // отключено + "8PSK 3/5", "8PSK 2/3", "8PSK 3/4", "8PSK 5/6", @@ -717,7 +715,7 @@ case '1/3': return 2 case '2/5': return 3 case '1/2': return 4 - case '3/5': return 5 // отключено + case '3/5': return 5 case '2/3': return 6 case '3/4': return 7 case '4/5': return 8 @@ -728,7 +726,7 @@ } case '8psk': switch (speed) { - case '3/5': return 12 // отключено + case '3/5': return 12 case '2/3': return 13 case '3/4': return 14 case '5/6': return 15 @@ -981,9 +979,9 @@ // NOTE модкоды со скоростью хода 3/5 не работают switch (modulation) { case 'qpsk': - return ['1/4', '1/3', '2/5', '1/2', /* '3/5',*/ '2/3', '3/4', '4/5', '5/6', '8/9', '9/10'] + return ['1/4', '1/3', '2/5', '1/2', '3/5', '2/3', '3/4', '4/5', '5/6', '8/9', '9/10'] case '8psk': - return [/* '3/5',*/ '2/3', '3/4', '5/6', '8/9', '9/10'] + return ['3/5', '2/3', '3/4', '5/6', '8/9', '9/10'] case '16apsk': return ['2/3', '3/4', '4/5', '5/6', '8/9', '9/10'] case '32apsk':