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("rxAgcEn"); - demod.gain = pt.get("rxManualGain"); + demod.gain = pt.get("rxManualGain"); demod.is_rvt_iq = pt.get("aupcEn"); demod.central_freq_in_kGz = pt.get("rxCentralFreq"); demod.baudrate = pt.get("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("dvbServicePacketPeriod"); - acm.enable_acm = pt.get("rxAgcEn"); + acm.enable_acm = pt.get("dvbIsAcm"); acm.min_modcod_acm = buildModcodFromPt(pt, "dvbAcmMin", acmIsShortFrame); acm.max_modcod_acm = buildModcodFromPt(pt, "dvbAcmMax", acmIsShortFrame); acm.snr_threashold_acm = pt.get("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 @@ @@ -216,7 +216,7 @@ - + +