From 90b1f221ea428f13ab529e795d86399f4ce0e9d3 Mon Sep 17 00:00:00 2001 From: Vladislav Ostapov Date: Tue, 12 Nov 2024 17:04:06 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BE=D1=88=D0=B8?= =?UTF-8?q?=D0=B1=D0=BE=D0=BA=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20rx/tx=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC?= =?UTF-8?q?=D0=B5=D1=82=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/terminal_api_driver.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/terminal_api_driver.cpp b/src/terminal_api_driver.cpp index ce42227..08cdfc4 100644 --- a/src/terminal_api_driver.cpp +++ b/src/terminal_api_driver.cpp @@ -554,8 +554,8 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) { // демодулятор tmp = pt.get(json_path("rx.gainMode", '/')); - if (tmp == "normal") { demod.is_aru_on = true; } - else if (tmp == "test") { demod.is_aru_on = false; } + if (tmp == "auto") { demod.is_aru_on = true; } + else if (tmp == "manual") { demod.is_aru_on = false; } else { throw std::runtime_error("api_driver::ApiDriver::setRxTxSettings(): Wrong gain mode: " + tmp); } demod.gain = pt.get(json_path("rx.manualGain", '/')); demod.baudrate = pt.get(json_path("rx.cymRate", '/')); @@ -570,9 +570,9 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) { acm.snr_treashold_acm = pt.get(json_path("dvbs2.snrReserve", '/')); // запас ОСШ acm.period_pack = pt.get(json_path("dvbs2.servicePacketPeriod", '/')); acm.enable_auto_atten = pt.get(json_path("acm.en", '/')); - acm.max_attenuation = pt.get(json_path("dvbs2.maxAttenuation", '/')); - acm.min_attenuation = pt.get(json_path("dvbs2.minAttenuation", '/')); - acm.snr_treashold = pt.get(json_path("dvbs2.requiredSnr", '/')); // требуемый ОСШ + acm.max_attenuation = pt.get(json_path("acm.maxAttenuation", '/')); + acm.min_attenuation = pt.get(json_path("acm.minAttenuation", '/')); + acm.snr_treashold = pt.get(json_path("acm.requiredSnr", '/')); // требуемый ОСШ daemon->setSettingsRxTx(mod, demod, acm); }