aboutsummaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2023-07-19 22:12:18 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2023-07-19 22:12:18 +0200
commit343df6eb8792b3efd33f4426766865ae03ccf316 (patch)
treeb2c05c7adb4774a88d15a46ae040c3428194ed64 /src/output
parentd521d4f0c5ad3b663a322453c5798626081cb1f3 (diff)
downloaddabmod-343df6eb8792b3efd33f4426766865ae03ccf316.tar.gz
dabmod-343df6eb8792b3efd33f4426766865ae03ccf316.tar.bz2
dabmod-343df6eb8792b3efd33f4426766865ae03ccf316.zip
Add events
Diffstat (limited to 'src/output')
-rw-r--r--src/output/Dexter.cpp16
-rw-r--r--src/output/SDR.cpp16
-rw-r--r--src/output/Soapy.cpp8
-rw-r--r--src/output/UHD.cpp16
4 files changed, 28 insertions, 28 deletions
diff --git a/src/output/Dexter.cpp b/src/output/Dexter.cpp
index 132636c..e52f774 100644
--- a/src/output/Dexter.cpp
+++ b/src/output/Dexter.cpp
@@ -470,20 +470,20 @@ SDRDevice::run_statistics_t Dexter::get_run_statistics(void) const
run_statistics_t rs;
{
std::unique_lock<std::mutex> lock(m_attr_thread_mutex);
- rs["underruns"] = underflows;
+ rs["underruns"].v = underflows;
}
- rs["latepackets"] = num_late;
- rs["frames"] = num_frames_modulated;
+ rs["latepackets"].v = num_late;
+ rs["frames"].v = num_frames_modulated;
- rs["in_holdover_since"] = 0;
+ rs["in_holdover_since"].v = 0;
switch (m_clock_state) {
case DexterClockState::Startup:
- rs["clock_state"] = "startup"; break;
+ rs["clock_state"].v = "startup"; break;
case DexterClockState::Normal:
- rs["clock_state"] = "normal"; break;
+ rs["clock_state"].v = "normal"; break;
case DexterClockState::Holdover:
- rs["clock_state"] = "holdover";
- rs["in_holdover_since"] = m_holdover_since_t;
+ rs["clock_state"].v = "holdover";
+ rs["in_holdover_since"].v = m_holdover_since_t;
break;
}
diff --git a/src/output/SDR.cpp b/src/output/SDR.cpp
index 4fc3277..6c03b53 100644
--- a/src/output/SDR.cpp
+++ b/src/output/SDR.cpp
@@ -450,7 +450,7 @@ const string SDR::get_parameter(const string& parameter) const
if (m_device) {
const auto stat = m_device->get_run_statistics();
try {
- const auto& value = stat.at(parameter).data;
+ const auto& value = stat.at(parameter).v;
if (std::holds_alternative<string>(value)) {
ss << std::get<string>(value);
}
@@ -489,19 +489,19 @@ const json::map_t SDR::get_all_values() const
{
json::map_t stat = m_device->get_run_statistics();
- stat["txgain"] = m_config.txgain;
- stat["rxgain"] = m_config.rxgain;
- stat["freq"] = m_config.frequency;
- stat["muting"] = m_config.muting;
- stat["temp"] = std::nullopt;
+ stat["txgain"].v = m_config.txgain;
+ stat["rxgain"].v = m_config.rxgain;
+ stat["freq"].v = m_config.frequency;
+ stat["muting"].v = m_config.muting;
+ stat["temp"].v = std::nullopt;
if (m_device) {
const std::optional<double> temp = m_device->get_temperature();
if (temp) {
- stat["temp"] = *temp;
+ stat["temp"].v = *temp;
}
}
- stat["queued_frames_ms"] = m_queue.size() *
+ stat["queued_frames_ms"].v = m_queue.size() *
(size_t)chrono::duration_cast<chrono::milliseconds>(transmission_frame_duration(m_config.dabMode))
.count();
diff --git a/src/output/Soapy.cpp b/src/output/Soapy.cpp
index 4d33e39..7931860 100644
--- a/src/output/Soapy.cpp
+++ b/src/output/Soapy.cpp
@@ -183,10 +183,10 @@ double Soapy::get_bandwidth(void) const
SDRDevice::run_statistics_t Soapy::get_run_statistics(void) const
{
run_statistics_t rs;
- rs["underruns"] = underflows;
- rs["overruns"] = overflows;
- rs["timeouts"] = timeouts;
- rs["frames"] = num_frames_modulated;
+ rs["underruns"].v = underflows;
+ rs["overruns"].v = overflows;
+ rs["timeouts"].v = timeouts;
+ rs["frames"].v = num_frames_modulated;
return rs;
}
diff --git a/src/output/UHD.cpp b/src/output/UHD.cpp
index 6638b6c..094e021 100644
--- a/src/output/UHD.cpp
+++ b/src/output/UHD.cpp
@@ -380,19 +380,19 @@ void UHD::transmit_frame(struct FrameData&& frame)
SDRDevice::run_statistics_t UHD::get_run_statistics(void) const
{
run_statistics_t rs;
- rs["underruns"] = num_underflows;
- rs["overruns"] = num_overflows;
- rs["late_packets"] = num_late_packets;
- rs["frames"] = num_frames_modulated;
+ rs["underruns"].v = num_underflows;
+ rs["overruns"].v = num_overflows;
+ rs["late_packets"].v = num_late_packets;
+ rs["frames"].v = num_frames_modulated;
if (m_device_time) {
const auto gpsdo_stat = m_device_time->get_gnss_stats();
- rs["gpsdo_holdover"] = gpsdo_stat.holdover;
- rs["gpsdo_num_sv"] = gpsdo_stat.num_sv;
+ rs["gpsdo_holdover"].v = gpsdo_stat.holdover;
+ rs["gpsdo_num_sv"].v = gpsdo_stat.num_sv;
}
else {
- rs["gpsdo_holdover"] = true;
- rs["gpsdo_num_sv"] = 0;
+ rs["gpsdo_holdover"].v = true;
+ rs["gpsdo_num_sv"].v = 0;
}
return rs;
}