From cd91722d2fc008973dc9267477f2df72e076c904 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 27 Aug 2020 12:14:00 +0200 Subject: [PATCH] Parameter renaming to throttle_frequency_sps --- docs/changelog.md | 4 ++++ .../signal_source/adapters/labsat_signal_source.cc | 6 ++++-- .../signal_source/adapters/labsat_signal_source.h | 10 +++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index ce8bcd36d..f2a2492ca 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -42,6 +42,10 @@ SPDX-FileCopyrightText: 2011-2020 Carles Fernandez-Prades property(role + ".dump", false); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file); - sampling_frequency_ = configuration->property(role + ".sampling_frequency", static_cast(0)); enable_throttle_control_ = configuration->property(role + ".enable_throttle_control", false); + const int64_t sampling_frequency_deprecated = configuration->property(role + ".sampling_frequency", static_cast(16368000)); + const int64_t throttle_frequency_sps = configuration->property(role + ".throttle_frequency_sps", static_cast(sampling_frequency_deprecated)); + const int channel_selector = configuration->property(role + ".selected_channel", 1); const std::string default_filename("./example_capture.LS3"); @@ -63,7 +65,7 @@ LabsatSignalSource::LabsatSignalSource(const ConfigurationInterface* configurati if (enable_throttle_control_) { - throttle_ = gr::blocks::throttle::make(item_size_, sampling_frequency_); + throttle_ = gr::blocks::throttle::make(item_size_, throttle_frequency_sps); } if (in_stream_ > 0) diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.h b/src/algorithms/signal_source/adapters/labsat_signal_source.h index 83b331e94..e66fb62bf 100644 --- a/src/algorithms/signal_source/adapters/labsat_signal_source.h +++ b/src/algorithms/signal_source/adapters/labsat_signal_source.h @@ -70,19 +70,19 @@ public: private: gr::block_sptr labsat23_source_; gr::blocks::file_sink::sptr file_sink_; + gr::blocks::throttle::sptr throttle_; + std::string role_; std::string item_type_; std::string filename_; std::string dump_filename_; - - int64_t sampling_frequency_; - bool enable_throttle_control_; - gr::blocks::throttle::sptr throttle_; + size_t item_size_; unsigned int in_stream_; unsigned int out_stream_; - size_t item_size_; + + bool enable_throttle_control_; bool dump_; };