mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-31 07:13:03 +00:00
Code Issues Releases Wiki Activity

Build fix due to a change in the gr-iio v0.3 API

Browse Source 
A change in the API has removed the decimation parameter from sources
(see https://github.com/analogdevicesinc/gr-iio/issues/15 )

This commit fixes the build against the current master of
https://github.com/analogdevicesinc/gr-iio but it breaks compatibility
with older versions. Users with gr-iio already installed will need to
update it.
This commit is contained in:
Carles Fernandez
2018-01-20 11:56:17 +01:00
parent 0315746429
commit db938bb047
7 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc
View File

@@ -53,7 +53,6 @@ Fmcomms2SignalSource::Fmcomms2SignalSource(ConfigurationInterface* configuration
rx1_en_ = configuration->property(role + ".rx1_enable", true);
rx2_en_ = configuration->property(role + ".rx2_enable", false);
buffer_size_ = configuration->property(role + ".buffer_size", 0xA0000);
decimation_ = configuration->property(role + ".decimation", 1);
quadrature_ = configuration->property(role + ".quadrature", true);
rf_dc_ = configuration->property(role + ".rf_dc", true);
bb_dc_ = configuration->property(role + ".bb_dc", true);
@@ -79,7 +78,7 @@ Fmcomms2SignalSource::Fmcomms2SignalSource(ConfigurationInterface* configuration
{
fmcomms2_source_f32c_ = gr::iio::fmcomms2_source_f32c::make(
uri_.c_str(), freq_, sample_rate_,
decimation_, bandwidth_,
bandwidth_,
rx1_en_, rx2_en_,
buffer_size_, quadrature_, rf_dc_,
bb_dc_, gain_mode_rx1_.c_str(), rf_gain_rx1_,

1
src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
View File

@@ -83,7 +83,6 @@ private:
unsigned long sample_rate_;
unsigned long bandwidth_;
unsigned long buffer_size_; //reception buffer
unsigned int decimation_;
bool rx1_en_;
bool rx2_en_;
bool quadrature_;

3
src/algorithms/signal_source/adapters/plutosdr_signal_source.cc
View File

@@ -52,7 +52,6 @@ PlutosdrSignalSource::PlutosdrSignalSource(ConfigurationInterface* configuration
sample_rate_ = configuration->property(role + ".sampling_frequency", 3000000);
bandwidth_ = configuration->property(role + ".bandwidth", 2000000);
buffer_size_ = configuration->property(role + ".buffer_size", 0xA0000);
decimation_ = configuration->property(role + ".decimation", 1);
quadrature_ = configuration->property(role + ".quadrature", true);
rf_dc_ = configuration->property(role + ".rf_dc", true);
bb_dc_ = configuration->property(role + ".bb_dc", true);
@@ -81,7 +80,7 @@ PlutosdrSignalSource::PlutosdrSignalSource(ConfigurationInterface* configuration
std::cout << "item type: " << item_type_ << std::endl;
plutosdr_source_ = gr::iio::pluto_source::make(uri_, freq_, sample_rate_,
decimation_, bandwidth_, buffer_size_, quadrature_, rf_dc_, bb_dc_,
bandwidth_, buffer_size_, quadrature_, rf_dc_, bb_dc_,
gain_mode_.c_str(), rf_gain_,filter_file_.c_str(), filter_auto_);
if (samples_ != 0)

1
src/algorithms/signal_source/adapters/plutosdr_signal_source.h
View File

@@ -83,7 +83,6 @@ private:
unsigned long sample_rate_;
unsigned long bandwidth_;
unsigned long buffer_size_; // reception buffer
unsigned int decimation_;
bool quadrature_;
bool rf_dc_;
bool bb_dc_;