diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2023-07-19 20:26:36 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2023-07-19 20:26:36 +0200 |
| commit | d521d4f0c5ad3b663a322453c5798626081cb1f3 (patch) | |
| tree | 1741d2a9d1ba69a351d034cc81815a73181a462a /src/output | |
| parent | 8a547d0c0a84ea5a3464c7bc82a45f78aaae81c0 (diff) | |
| download | dabmod-d521d4f0c5ad3b663a322453c5798626081cb1f3.tar.gz dabmod-d521d4f0c5ad3b663a322453c5798626081cb1f3.tar.bz2 dabmod-d521d4f0c5ad3b663a322453c5798626081cb1f3.zip | |
Change RC showjson command
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/SDR.cpp | 6 | ||||
| -rw-r--r-- | src/output/SDR.h | 2 | ||||
| -rw-r--r-- | src/output/SDRDevice.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/output/SDR.cpp b/src/output/SDR.cpp index 11321f2..4fc3277 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); + const auto& value = stat.at(parameter).data; if (std::holds_alternative<string>(value)) { ss << std::get<string>(value); } @@ -485,9 +485,9 @@ const string SDR::get_parameter(const string& parameter) const return ss.str(); } -const RemoteControllable::map_t SDR::get_all_values() const +const json::map_t SDR::get_all_values() const { - map_t stat = m_device->get_run_statistics(); + json::map_t stat = m_device->get_run_statistics(); stat["txgain"] = m_config.txgain; stat["rxgain"] = m_config.rxgain; diff --git a/src/output/SDR.h b/src/output/SDR.h index 94c972b..960de0c 100644 --- a/src/output/SDR.h +++ b/src/output/SDR.h @@ -67,7 +67,7 @@ class SDR : public ModOutput, public ModMetadata, public RemoteControllable { virtual const std::string get_parameter( const std::string& parameter) const override; - virtual const RemoteControllable::map_t get_all_values() const override; + virtual const json::map_t get_all_values() const override; private: void process_thread_entry(void); diff --git a/src/output/SDRDevice.h b/src/output/SDRDevice.h index f84b340..f728d8b 100644 --- a/src/output/SDRDevice.h +++ b/src/output/SDRDevice.h @@ -116,7 +116,7 @@ struct FrameData { // All SDR Devices must implement the SDRDevice interface class SDRDevice { public: - using run_statistics_t = RemoteControllable::map_t; + using run_statistics_t = json::map_t; virtual void tune(double lo_offset, double frequency) = 0; virtual double get_tx_freq(void) const = 0; |