Parameter renaming to throttle_frequency_sps

This commit is contained in:
Carles Fernandez 2020-08-27 12:14:00 +02:00
parent 845385861d
commit cd91722d2f
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
3 changed files with 13 additions and 7 deletions

View File

@ -42,6 +42,10 @@ SPDX-FileCopyrightText: 2011-2020 Carles Fernandez-Prades <carles.fernandez@cttc
v0.0.13. This change recovers the old behavior.
- Fixed the termination of the receiver with `q` + `[Enter]` keys when using the
`Osmosdr_Signal_Source` implementation of the `SignalSource` block.
- The `Labsat_Signal_Source` implementation of the `SignalSource` block now can
be throttled with the new parameters `SignalSource.enable_throttle_control`
and `SignalSource.throttle_frequency_sps`, thus allowing the emulation of
real-time operation.
- Improved General Block diagram, both in content and in image resolution.
&nbsp;

View File

@ -34,9 +34,11 @@ LabsatSignalSource::LabsatSignalSource(const ConfigurationInterface* configurati
dump_ = configuration->property(role + ".dump", false);
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file);
sampling_frequency_ = configuration->property(role + ".sampling_frequency", static_cast<int64_t>(0));
enable_throttle_control_ = configuration->property(role + ".enable_throttle_control", false);
const int64_t sampling_frequency_deprecated = configuration->property(role + ".sampling_frequency", static_cast<int64_t>(16368000));
const int64_t throttle_frequency_sps = configuration->property(role + ".throttle_frequency_sps", static_cast<int64_t>(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)

View File

@ -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_;
};