From 6f62c3e1fa107ef8274535cd8aa7c20f2220c390 Mon Sep 17 00:00:00 2001 From: Vladislav Ostapov Date: Tue, 5 Nov 2024 17:19:17 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82?= =?UTF-8?q?=D0=B0=D1=82=D0=B8=D1=81=D1=82=D0=B8=D0=BA=D0=B8=20CinC=20?= =?UTF-8?q?=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=BA=D0=BE=D0=B3=D0=B4?= =?UTF-8?q?=D0=B0=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BC=20=D0=B2=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B6=D0=B8=D0=BC=D0=B5=20CinC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/terminal_api_driver.cpp | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/terminal_api_driver.cpp b/src/terminal_api_driver.cpp index 0eb6d6f..c868054 100644 --- a/src/terminal_api_driver.cpp +++ b/src/terminal_api_driver.cpp @@ -72,9 +72,6 @@ std::string api_driver::ApiDriver::loadTerminalState() { demodulator_state demodulator{}; CP_GetDemodulatorState(sid, demodulator); - CinC_state state_cinc{}; - CP_GetCinCState(sid,state_cinc); - device_state device{}; CP_GetDeviceState(sid, device); @@ -137,23 +134,29 @@ std::string api_driver::ApiDriver::loadTerminalState() { result << ",\"rx.packetsDummy\":" << demodulator.dummy_cnt; // формируем структуру для CinC - result << ",\"cinc.occ\":" << std::fixed << std::setprecision(3) << state_cinc.ratio_signal_signal; + if (isCinC) { + CinC_state state_cinc{}; + CP_GetCinCState(sid,state_cinc); - if (isCinC && modulator.is_tx_on) { - if (state_cinc.carrier_lock) { - result << R"(,"cinc.correlator":true)"; + if (modulator.is_tx_on) { + if (state_cinc.carrier_lock) { + result << R"(,"cinc.correlator":true)"; + } else { + result << R"(,"cinc.correlator":false)"; + } } else { - result << R"(,"cinc.correlator":false)"; + result << R"(,"cinc.correlator":null)"; } + + result << ",\"cinc.occ\":" << std::fixed << std::setprecision(3) << state_cinc.ratio_signal_signal; + result << ",\"cinc.correlatorFails\":" << state_cinc.cnt_bad_lock; + result << ",\"cinc.freqErr\":" << state_cinc.freq_error_offset; + result << ",\"cinc.freqErrAcc\":" << state_cinc.freq_fine_estimate; + result << ",\"cinc.channelDelay\":" << state_cinc.delay_dpdi; } else { result << R"(,"cinc.correlator":null)"; } - result << ",\"cinc.correlatorFails\":" << state_cinc.cnt_bad_lock; - result << ",\"cinc.freqErr\":" << state_cinc.freq_error_offset; - result << ",\"cinc.freqErrAcc\":" << state_cinc.freq_fine_estimate; - result << ",\"cinc.channelDelay\":" << state_cinc.delay_dpdi; - // структура температур девайса result << ",\"device.adrv\":" << std::fixed << std::setprecision(3) << device.adrv_temp; result << ",\"device.fpga\":" << std::fixed << std::setprecision(3) << device.pl_temp;