From e3130277593778093d653a8cba00d2718f3b2ede Mon Sep 17 00:00:00 2001 From: Vladislav Ostapov Date: Wed, 15 Jan 2025 17:27:51 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B0=D1=82=D1=87=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=8E=D1=89=D0=B5=D0=B9?= =?UTF-8?q?=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20"?= =?UTF-8?q?=D0=9F=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BE=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=93=D0=BE?= =?UTF-8?q?=D0=BB=D0=B4=D0=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/terminal_api_driver.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/terminal_api_driver.cpp b/src/terminal_api_driver.cpp index 758a97b..44a08b4 100644 --- a/src/terminal_api_driver.cpp +++ b/src/terminal_api_driver.cpp @@ -880,7 +880,7 @@ std::string api_driver::ApiDriver::loadSettings() const { result << ",\"txBaudrate\":" << modSettings.baudrate; result << ",\"txRolloff\":" << static_cast(modSettings.rollof * 100); #ifdef MODEM_IS_SCPC - // result << ",\"txGoldan\":" << static_cast(modSettings.qold_seq_is_active); // TODO обновить библиотеку + result << ",\"txGoldan\":" << static_cast(modSettings.qold_seq_is_active); #endif result << ",\"txAttenuation\":"; writeDouble(result, modSettings.attenuation); @@ -919,7 +919,7 @@ std::string api_driver::ApiDriver::loadSettings() const { result << ",\"rxBaudrate\":" << demodSettings.baudrate; result << ",\"rxRolloff\":" << static_cast(demodSettings.rollof * 100); #ifdef MODEM_IS_SCPC - // result << ",\"txGoldan\":" << static_cast(demodSettings.qold_seq_is_active); // TODO обновить библиотеку + result << ",\"txGoldan\":" << static_cast(demodSettings.qold_seq_is_active); #endif // BUC LNB @@ -1022,7 +1022,7 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) { mod.baudrate = pt.get("txBaudrate"); mod.rollof = pt.get("txRolloff") / 100.0; #ifdef MODEM_IS_SCPC - //mod.qold_seq_is_active = pt.get("isCinC"); + mod.qold_seq_is_active = pt.get("txGoldan"); #endif mod.attenuation = pt.get("txAttenuation"); @@ -1038,6 +1038,9 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) { demod.central_freq_in_kGz = pt.get("rxCentralFreq"); demod.baudrate = pt.get("rxBaudrate"); demod.rollof = pt.get("rxRolloff") / 100.0; +#ifdef MODEM_IS_SCPC + demod.qold_seq_is_active = pt.get("rxGoldan"); +#endif #ifdef MODEM_IS_SCPC // ACM