From a5a9b0c4e596d2dcda5b003a74b02025338f6e78 Mon Sep 17 00:00:00 2001
From: Vladislav Ostapov <Vlados.ost.31@yandex.ru>
Date: Thu, 16 Jan 2025 14:15:16 +0300
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D1=83=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=BF=D0=B0=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=B2=20+=20=D1=84=D0=B8=D0=BA?=
 =?UTF-8?q?=D1=81=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D1=85?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front-generator/render-params.json | 5 +++--
 src/terminal_api_driver.cpp        | 4 ++--
 static/main-scpc.html              | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/front-generator/render-params.json b/front-generator/render-params.json
index 4e0e623..0eb05bf 100644
--- a/front-generator/render-params.json
+++ b/front-generator/render-params.json
@@ -155,7 +155,7 @@
                   },
                   {
                     "widget": "select", "label": "Входные данные", "name": "txIsTestInput",
-                    "values": [{"label": "SCPC", "value": "false"}, {"label": "Тест", "value": "true"}]
+                    "values": [{"label": "Ethernet", "value": "false"}, {"label": "Тест", "value": "true"}]
                   },
                   {"widget": "h3", "label": "Параметры передачи"},
                   {"widget": "number", "label": "Центральная частота, КГц", "name": "txCentralFreq", "min": 900000, "step": 0.01},
@@ -186,7 +186,7 @@
                   },
                   {"widget": "modulation-modcod", "label": "Модуляция", "name": "dvbCcm", "v_show": "paramRxtx.dvbIsAcm === false"},
                   {"widget": "modulation-speed", "label": "Скорость кода", "name": "dvbCcm", "v_show": "paramRxtx.dvbIsAcm === false"},
-                  {"widget": "watch", "label": "Текущий модкод", "model": "statRx.modcod", "v_show": "paramRxtx.dvbIsAcm === true"},
+                  {"widget": "watch", "label": "Текущий модкод", "model": "statTx.modcod", "v_show": "paramRxtx.dvbIsAcm === true"},
                   {"widget": "modulation-modcod", "label": "Модуляция (мин. режим)", "name": "dvbAcmMin", "v_show": "paramRxtx.dvbIsAcm === true"},
                   {"widget": "modulation-speed", "label": "Скорость кода (мин. режим)", "name": "dvbAcmMin", "v_show": "paramRxtx.dvbIsAcm === true"},
                   {"widget": "modulation-modcod", "label": "Модуляция (макс. режим)", "name": "dvbAcmMax", "v_show": "paramRxtx.dvbIsAcm === true"},
@@ -213,6 +213,7 @@
                     "values": [{"label": "РРУ", "value": "false"}, {"label": "АРУ", "value": "true"}]
                   },
                   {"widget": "number", "label": "Усиление, дБ", "name": "rxManualGain", "min": -40, "step": 0.01, "max": 40, "v_show": "paramRxtx.rxAgcEn === false"},
+                  {"widget": "watch", "label": "Текущее усиление", "model": "rxManualGain", "v_show": "paramRxtx.rxAgcEn === true"},
                   {"widget": "checkbox", "label": "Инверсия спектра", "name": "rxSpectrumInversion"},
                   {"widget": "number", "label": "Центральная частота, КГц", "name": "rxCentralFreq", "min": 900000, "step": 0.01},
                   {"widget": "number", "label": "Символьная скорость, Бод", "name": "rxBaudrate", "min": 0, "step": 1},
diff --git a/src/terminal_api_driver.cpp b/src/terminal_api_driver.cpp
index ed657af..fed97ed 100644
--- a/src/terminal_api_driver.cpp
+++ b/src/terminal_api_driver.cpp
@@ -1034,7 +1034,7 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
 
     // демодулятор
     demod.is_aru_on = pt.get<bool>("rxAgcEn");
-    demod.gain = pt.get<bool>("rxManualGain");
+    demod.gain = pt.get<double>("rxManualGain");
     demod.is_rvt_iq = pt.get<bool>("aupcEn");
     demod.central_freq_in_kGz = pt.get<double>("rxCentralFreq");
     demod.baudrate = pt.get<uint32_t>("rxBaudrate");
@@ -1046,7 +1046,7 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
 #ifdef MODEM_IS_SCPC
     // ACM
     acm.period_pack_acm = pt.get<uint32_t>("dvbServicePacketPeriod");
-    acm.enable_acm = pt.get<bool>("rxAgcEn");
+    acm.enable_acm = pt.get<bool>("dvbIsAcm");
     acm.min_modcod_acm = buildModcodFromPt(pt, "dvbAcmMin", acmIsShortFrame);
     acm.max_modcod_acm = buildModcodFromPt(pt, "dvbAcmMax", acmIsShortFrame);
     acm.snr_threashold_acm = pt.get<double>("dvbSnrReserve"); // запас ОСШ
diff --git a/static/main-scpc.html b/static/main-scpc.html
index d802238..9b173d8 100644
--- a/static/main-scpc.html
+++ b/static/main-scpc.html
@@ -157,7 +157,7 @@
                     <label>
                         <span>Входные данные</span>
                         <select v-model="paramRxtx.txIsTestInput">
-                            <option :value="false">SCPC</option>
+                            <option :value="false">Ethernet</option>
                             <option :value="true">Тест</option>
                         </select>
                     </label>
@@ -216,7 +216,7 @@
                             <option v-for="speed in getAvailableModcods(paramRxtx.dvbCcmModulation)" v-bind:value="speed">{{ speed }}</option>
                         </select>
                     </label>
-                    <label v-show="paramRxtx.dvbIsAcm === true"><span>Текущий модкод</span><input type="text" readonly v-model="statRx.modcod"/></label>
+                    <label v-show="paramRxtx.dvbIsAcm === true"><span>Текущий модкод</span><input type="text" readonly v-model="statTx.modcod"/></label>
                     <label v-show="paramRxtx.dvbIsAcm === true">
                         <span>Модуляция (мин. режим)</span>
                         <select v-model="paramRxtx.dvbAcmMinModulation" @change="paramRxtx.dvbAcmMinSpeed = correctModcodSpeed(paramRxtx.dvbAcmMinModulation, paramRxtx.dvbAcmMinSpeed)">
@@ -269,6 +269,7 @@
                         </select>
                     </label>
                     <label v-show="paramRxtx.rxAgcEn === false"><span>Усиление, дБ</span><input type="number" v-model="paramRxtx.rxManualGain" min="-40" max="40" step="0.01"/></label>
+                    <label v-show="paramRxtx.rxAgcEn === true"><span>Текущее усиление</span><input type="text" readonly v-model="rxManualGain"/></label>
                     <label>
                         <span>Инверсия спектра</span>
                         <span class="toggle-input"><input type="checkbox" v-model="paramRxtx.rxSpectrumInversion" /><span class="slider"></span></span>