VladislavOstapov/terminal-web-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

патч для работающей настройки "Последовательность Голда"

Browse Source
This commit is contained in:
Vladislav Ostapov 2025-01-15 17:27:51 +03:00
parent 136d8dbb5b
commit e313027759
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/terminal_api_driver.cpp
View File

@ -880,7 +880,7 @@ std::string api_driver::ApiDriver::loadSettings() const {
result << ",\"txBaudrate\":" << modSettings.baudrate; result << ",\"txBaudrate\":" << modSettings.baudrate;
result << ",\"txRolloff\":" << static_cast<int>(modSettings.rollof * 100); result << ",\"txRolloff\":" << static_cast<int>(modSettings.rollof * 100);
#ifdef MODEM_IS_SCPC #ifdef MODEM_IS_SCPC
// result << ",\"txGoldan\":" << static_cast<int>(modSettings.qold_seq_is_active); // TODO обновить библиотеку result << ",\"txGoldan\":" << static_cast<int>(modSettings.qold_seq_is_active);
#endif #endif
result << ",\"txAttenuation\":"; writeDouble(result, modSettings.attenuation); result << ",\"txAttenuation\":"; writeDouble(result, modSettings.attenuation);
@ -919,7 +919,7 @@ std::string api_driver::ApiDriver::loadSettings() const {
result << ",\"rxBaudrate\":" << demodSettings.baudrate; result << ",\"rxBaudrate\":" << demodSettings.baudrate;
result << ",\"rxRolloff\":" << static_cast<int>(demodSettings.rollof * 100); result << ",\"rxRolloff\":" << static_cast<int>(demodSettings.rollof * 100);
#ifdef MODEM_IS_SCPC #ifdef MODEM_IS_SCPC
// result << ",\"txGoldan\":" << static_cast<int>(demodSettings.qold_seq_is_active); // TODO обновить библиотеку result << ",\"txGoldan\":" << static_cast<int>(demodSettings.qold_seq_is_active);
#endif #endif
// BUC LNB // BUC LNB
@ -1022,7 +1022,7 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
mod.baudrate = pt.get<uint32_t>("txBaudrate"); mod.baudrate = pt.get<uint32_t>("txBaudrate");
mod.rollof = pt.get<int>("txRolloff") / 100.0; mod.rollof = pt.get<int>("txRolloff") / 100.0;
#ifdef MODEM_IS_SCPC #ifdef MODEM_IS_SCPC
//mod.qold_seq_is_active = pt.get<bool>("isCinC"); mod.qold_seq_is_active = pt.get<bool>("txGoldan");
#endif #endif
mod.attenuation = pt.get<double>("txAttenuation"); mod.attenuation = pt.get<double>("txAttenuation");
@ -1038,6 +1038,9 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
demod.central_freq_in_kGz = pt.get<double>("rxCentralFreq"); demod.central_freq_in_kGz = pt.get<double>("rxCentralFreq");
demod.baudrate = pt.get<uint32_t>("rxBaudrate"); demod.baudrate = pt.get<uint32_t>("rxBaudrate");
demod.rollof = pt.get<int>("rxRolloff") / 100.0; demod.rollof = pt.get<int>("rxRolloff") / 100.0;
#ifdef MODEM_IS_SCPC
demod.qold_seq_is_active = pt.get<bool>("rxGoldan");
#endif
#ifdef MODEM_IS_SCPC #ifdef MODEM_IS_SCPC
// ACM // ACM