diff --git a/src/api-driver/daemon.cpp b/src/api-driver/daemon.cpp index e2201d6..135e83a 100644 --- a/src/api-driver/daemon.cpp +++ b/src/api-driver/daemon.cpp @@ -92,7 +92,7 @@ void api_driver::TerminalApiDaemon::run() { CpUpdatebleObject uo; std::string updaterName; } updaters[] = { -#ifdef API_OBJECT_NETWORK_SETTINGS_ENABLE +#ifdef API_OBJECT_DEBUG_METRICS_ENABLE // обновление логов {.uo = CpUpdatebleObject([this]() { this->statsLogs.updateCallback(cp); diff --git a/src/api-driver/proxy.h b/src/api-driver/proxy.h index 70349a3..4fcf217 100644 --- a/src/api-driver/proxy.h +++ b/src/api-driver/proxy.h @@ -51,6 +51,10 @@ namespace api_driver::proxy { void getDebugMetrics(debug_metrics& dest); #endif +#ifdef MODEM_IS_TDMA + void getUpdateStatus(progress_msg& dest); +#endif + ~CpProxy(); }; } diff --git a/src/api-driver/structs.cpp b/src/api-driver/structs.cpp index c84a542..44e2229 100644 --- a/src/api-driver/structs.cpp +++ b/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(deg) + static_cast(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(modSet.baudrate) / 1000.0; + fTxCenterFreq = modSet.central_freq_in_kGz; + fTxSymSpeed = static_cast(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 diff --git a/src/api-driver/structs.h b/src/api-driver/structs.h index 76f6bc4..6fc063b 100644 --- a/src/api-driver/structs.h +++ b/src/api-driver/structs.h @@ -180,8 +180,8 @@ namespace api_driver::obj { float fCincChannelDelay; #endif #ifdef MODEM_IS_TDMA - TODO fTxCenterFreq; - TODO fTxSymSpeed; + double fTxCenterFreq; + double fTxSymSpeed; #endif TerminalState(); diff --git a/src/main.cpp b/src/main.cpp index cfec476..08698ea 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -83,19 +83,19 @@ class ServerResources { cmd += " "; cmd += FIRMWARE_LOCATION; system(cmd.c_str()); - cp.setDmaDebug("begin_save_config", ""); + cp.setDmaDebug("save_config", ""); }); } #ifdef MODEM_IS_TDMA void doTerminalUpgradeOta() const { - api->executeInApi([&](proxy::CpProxy&) { - CP_SetDmaDebug(sid, "begin_save_config", ""); + api->executeInApi([&](auto& cp) { + cp.setDmaDebug("begin_save_config", ""); std::string cmd(UPGRADE_COMMAND); cmd += " "; cmd += api->getOtaFileLocation(); system(cmd.c_str()); - CP_SetDmaDebug(sid, "save_config", ""); + cp.setDmaDebug("save_config", ""); }); } #endif diff --git a/src/terminal_api_driver.cpp b/src/terminal_api_driver.cpp index b8a3911..8e09ad9 100644 --- a/src/terminal_api_driver.cpp +++ b/src/terminal_api_driver.cpp @@ -197,7 +197,9 @@ void api_driver::ApiDriver::executeInApi(const std::functiongetState().otaImage; + obj::TerminalDeviceState ds; + daemon->getDeviceState(ds); + return ds.fUpgradeImage; } #endif