From 33bbdafc3da22c3fe0aade041139e95b94cd3e9b Mon Sep 17 00:00:00 2001
From: Vladislav Ostapov <Vlados.ost.31@yandex.ru>
Date: Sat, 5 Jul 2025 15:10:09 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20tdma=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BD=D0=BE=D0=B5=20=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=BE=D0=BD=D0=B8=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=D0=B0=20=D1=81=D1=82=D0=B0=D1=82=D1=83?=
 =?UTF-8?q?=D1=81=D0=B0=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B8=20=D1=84=D0=B8=D0=BA=D1=81=20=D1=83=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=BD=D0=B0=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B5=D0=BA=20DPDI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api-driver/structs.cpp  | 21 +++++++++++----------
 src/terminal_api_driver.cpp |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

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