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

fix: tdma временное отключение мониторинга статуса обновления и фикс установки настроек DPDI

Browse Source
This commit is contained in:
Vladislav Ostapov
2025-07-05 15:10:09 +03:00
parent bfcdc88da9
commit 33bbdafc3d
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/api-driver/structs.cpp
View File

@@ -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) {

2
src/terminal_api_driver.cpp
View File

@@ -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);
{