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