From f3454897d8caecd79fdc4814494827cca10867a2 Mon Sep 17 00:00:00 2001 From: Vladislav Ostapov Date: Tue, 24 Dec 2024 17:21:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20?= =?UTF-8?q?=D0=B2=20SCPC=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BC=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/terminal_api_driver.cpp | 6 ++++-- static/main-scpc.html | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/terminal_api_driver.cpp b/src/terminal_api_driver.cpp index dc1d8c0..c7eb252 100644 --- a/src/terminal_api_driver.cpp +++ b/src/terminal_api_driver.cpp @@ -524,7 +524,7 @@ public: void setQosSettings(bool enabled, const std::string& str, bool readback = true) { std::lock_guard lock(this->cpApiMutex); - logCpApiError("api_driver::TerminalApiDaemon::setQosSettings()->CP_SetDmaDebug()", CP_SetDmaDebug(sid, "begin_save_config", "")); + logCpApiError("api_driver::TerminalApiDaemon::setQosSettings()->CP_SetDmaDebug(begin_save_config)", CP_SetDmaDebug(sid, "begin_save_config", "")); logCpApiError("api_driver::TerminalApiDaemon::setQosSettings()->CP_SetQoSSettings()", CP_SetQoSSettings(this->sid, str, enabled)); if (readback) { bool tmp1; std::string tmp2; @@ -535,7 +535,7 @@ public: this->qosClassesJson = tmp2.empty() ? DEFAULT_QOS_CLASSES : tmp2; } } - logCpApiError("api_driver::TerminalApiDaemon::setQosSettings()->CP_SetDmaDebug()", CP_SetDmaDebug(sid, "save_config", "")); + logCpApiError("api_driver::TerminalApiDaemon::setQosSettings()->CP_SetDmaDebug(save_config)", CP_SetDmaDebug(sid, "save_config", "")); } void setNetworkSettings(TerminalNetworkSettings& s, bool readback = true) { @@ -985,6 +985,8 @@ void api_driver::ApiDriver::setCincSettings(boost::property_tree::ptree &pt) { s.max_delay = pt.get(json_path("cinc.delayMax", '/')); s.min_delay = pt.get(json_path("cinc.delayMin", '/')); + s.freq_offset = pt.get(json_path("cinc.searchBandwidth", '/')); + this->daemon->setSettingsCinc(s); } #endif diff --git a/static/main-scpc.html b/static/main-scpc.html index 5d507af..546c318 100644 --- a/static/main-scpc.html +++ b/static/main-scpc.html @@ -347,6 +347,10 @@ +

Настройки позиционирования