From b67011b9a340d80dc3a2652e39bccde5200939b3 Mon Sep 17 00:00:00 2001 From: Vladislav Ostapov Date: Fri, 29 Nov 2024 17:37:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=B0=20=D0=B8=D0=B7=20API=20?= =?UTF-8?q?=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=B5=20=D1=81=D0=BE=20=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D1=82=D0=B8=D1=81=D1=82=D0=B8=D0=BA=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/terminal_api_driver.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/terminal_api_driver.cpp b/src/terminal_api_driver.cpp index cfce02a..518f3eb 100644 --- a/src/terminal_api_driver.cpp +++ b/src/terminal_api_driver.cpp @@ -9,7 +9,6 @@ #include #include -#include "../dependencies/control_system/common/protocol_commands.h" typedef boost::property_tree::ptree::path_type json_path; @@ -131,6 +130,10 @@ private: logCpApiError("api_driver::TerminalApiDaemon::updateState()->CP_GetModulatorState()", CP_GetModulatorState(sid, modulator)); logCpApiError("api_driver::TerminalApiDaemon::updateState()->CP_GetDemodulatorState()", CP_GetDemodulatorState(sid, demodulator)); logCpApiError("api_driver::TerminalApiDaemon::updateState()->CP_GetDeviceState()", CP_GetDeviceState(sid, device)); +#ifdef MODEM_IS_TDMA + std::string tmpDevState; + logCpApiError("api_driver::TerminalApiDaemon::updateState()->CP_GetDmaDebug(status_init)", CP_GetDmaDebug(sid, "status_init", &tmpDevState)); +#endif #ifdef MODEM_IS_SCPC bool isCinC = getIsCinC(); if (isCinC) { @@ -143,6 +146,9 @@ private: this->modState = modulator; this->demodState = demodulator; this->devState = device; +#ifdef MODEM_IS_TDMA + this->deviceInitState = tmpDevState; +#endif #ifdef MODEM_IS_SCPC this->cincState = cinc; #endif @@ -235,7 +241,7 @@ private: } std::string tmp; - logCpApiError("api_driver::TerminalApiDaemon::updateState()->CP_GetDmaDebug(status_init)", CP_GetDmaDebug(sid, "status_init", &tmp)); + logCpApiError("api_driver::TerminalApiDaemon::run()->CP_GetDmaDebug(status_init)", CP_GetDmaDebug(sid, "status_init", &tmp)); { std::lock_guard _lock(this->stateMutex); this->deviceInitState = tmp;