исправления для TDMA

src/api-driver/structs.cpp

@@ -11,9 +11,6 @@
 
 typedef boost::property_tree::ptree::path_type json_path;
 
-static constexpr const char* DEFAULT_QOS_CLASSES = R"({"rt1":[],"rt2":[],"rt3":[],"cd":[]})";
-// пороговое значение сна
-
 double translateCoordinates(uint8_t deg, uint8_t min) {
     return static_cast<double>(deg) + static_cast<double>(min) / 60;
 }
@@ -345,8 +342,8 @@ void api_driver::obj::TerminalState::updateCallback(proxy::CpProxy& cp) {
     fCincChannelDelay = cinc.delay_dpdi;
 #endif
 #ifdef MODEM_IS_TDMA
-    fStatTxCenterFreq = modSet.central_freq_in_kGz;
-    fStatTxSymSpeed = static_cast<double>(modSet.baudrate) / 1000.0;
+    fTxCenterFreq = modSet.central_freq_in_kGz;
+    fTxSymSpeed = static_cast<double>(modSet.baudrate) / 1000.0;
 #endif
 }
 
@@ -433,10 +430,10 @@ void api_driver::obj::TerminalDeviceState::updateCallback(proxy::CpProxy &cp) {
 #ifdef MODEM_IS_TDMA
     {
         progress_msg ds{};
-        logCpApiError("api_driver::TerminalApiDaemon::updateState()->CP_GetUpdateStatus()", CP_GetUpdateStatus(sid, ds));
-        fOtaStatus = ds.status;
-        fOtaPercent = ds.dwl_percent;
-        fOtaImage = ds.cur_image;
+        cp.getUpdateStatus(ds);
+        fUpgradeStatus = ds.status;
+        fUpgradePercent = ds.dwl_percent;
+        fUpgradeImage = ds.cur_image;
     }
 #endif