VladislavOstapov/terminal-web-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

сделал получение статистики CinC только когда модем в режиме CinC

Browse Source
This commit is contained in:
Vladislav Ostapov 2024-11-05 17:19:17 +03:00
parent 40e12f1c67
commit 6f62c3e1fa
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/terminal_api_driver.cpp
View File

@ -72,9 +72,6 @@ std::string api_driver::ApiDriver::loadTerminalState() {
demodulator_state demodulator{}; demodulator_state demodulator{};
CP_GetDemodulatorState(sid, demodulator); CP_GetDemodulatorState(sid, demodulator);
CinC_state state_cinc{};
CP_GetCinCState(sid,state_cinc);
device_state device{}; device_state device{};
CP_GetDeviceState(sid, device); CP_GetDeviceState(sid, device);
@ -137,23 +134,29 @@ std::string api_driver::ApiDriver::loadTerminalState() {
result << ",\"rx.packetsDummy\":" << demodulator.dummy_cnt; result << ",\"rx.packetsDummy\":" << demodulator.dummy_cnt;
// формируем структуру для CinC // формируем структуру для 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 (modulator.is_tx_on) {
if (state_cinc.carrier_lock) { if (state_cinc.carrier_lock) {
result << R"(,"cinc.correlator":true)"; result << R"(,"cinc.correlator":true)";
} else {
result << R"(,"cinc.correlator":false)";
}
} else { } 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 { } else {
result << R"(,"cinc.correlator":null)"; 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.adrv\":" << std::fixed << std::setprecision(3) << device.adrv_temp;
result << ",\"device.fpga\":" << std::fixed << std::setprecision(3) << device.pl_temp; result << ",\"device.fpga\":" << std::fixed << std::setprecision(3) << device.pl_temp;