diff --git a/src/api-driver/structs.cpp b/src/api-driver/structs.cpp index 3bc5031..9e90066 100644 --- a/src/api-driver/structs.cpp +++ b/src/api-driver/structs.cpp @@ -472,15 +472,16 @@ void api_driver::obj::TerminalDeviceState::updateCallback(proxy::CpProxy &cp) { fTempZynq = ds.pl_temp; fTempFpga = ds.zynq_temp; } -#ifdef MODEM_IS_TDMA - { - progress_msg ds{}; - cp.getUpdateStatus(ds); - fUpgradeStatus = ds.status; - fUpgradePercent = ds.dwl_percent; - fUpgradeImage = ds.cur_image; - } -#endif + // FIXME: тут происходит зависание по неизвестной причине +// #ifdef MODEM_IS_TDMA +// { +// progress_msg ds{}; +// cp.getUpdateStatus(ds); +// fUpgradeStatus = ds.status; +// fUpgradePercent = ds.dwl_percent; +// fUpgradeImage = ds.cur_image; +// } +// #endif struct sysinfo info{}; sysinfo(&info); @@ -735,7 +736,7 @@ void api_driver::obj::TerminalRxTxSettings::updateDpdiSettings(const nlohmann::j dpdi.max_delay = data.value("delayMax", dpdi.max_delay); #else dpdi.min_delay = 0; - dpdi.max_delay = data.value("dpdiDelay", dpdi.max_delay); + dpdi.max_delay = data.value("delay", dpdi.max_delay); #endif } void api_driver::obj::TerminalRxTxSettings::storeDpdiSettings(proxy::CpProxy &cp) { diff --git a/src/terminal_api_driver.cpp b/src/terminal_api_driver.cpp index 42e803d..88565b9 100644 --- a/src/terminal_api_driver.cpp +++ b/src/terminal_api_driver.cpp @@ -107,7 +107,7 @@ void api_driver::ApiDriver::setDpdiSettings(const nlohmann::json& data) { std::lock_guard _lapi(this->daemon->cpApiMutex); this->daemon->cp.setDmaDebug("begin_save_config", ""); - rxtx.storeMainSettings(this->daemon->cp); + rxtx.storeDpdiSettings(this->daemon->cp); this->daemon->cp.setDmaDebug("save_config", ""); rxtx.updateCallback(this->daemon->cp); {