mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-18 21:23:02 +00:00
Code Issues Releases Wiki Activity

configure the AD9361 digital filter on a per RX-channel basis. Keep the LO is the same for all RX channels in the same device.

Browse Source
This commit is contained in:
Marc Majoral 2022-05-17 10:49:13 +02:00
parent a1d8d8c19d
commit 38ed8ced4e
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/algorithms/signal_source/libs/ad9361_manager.cc
View File

@ -111,21 +111,12 @@ bool get_lo_chan(struct iio_context *ctx, enum iodev d, struct iio_channel **chn
/* applies streaming configuration through IIO */ /* applies streaming configuration through IIO */
bool cfg_ad9361_streaming_ch(struct iio_context *ctx, struct stream_cfg *cfg, enum iodev type, iio_channel *chn) void cfg_ad9361_streaming_ch(struct stream_cfg *cfg, enum iodev type, iio_channel *chn)
{ {
// Configure phy and lo channels // Configure phy and lo channels
wr_ch_str(chn, "rf_port_select", cfg->rfport); wr_ch_str(chn, "rf_port_select", cfg->rfport);
wr_ch_lli(chn, "rf_bandwidth", cfg->bw_hz); wr_ch_lli(chn, "rf_bandwidth", cfg->bw_hz);
wr_ch_lli(chn, "sampling_frequency", cfg->fs_hz); wr_ch_lli(chn, "sampling_frequency", cfg->fs_hz);
// Configure LO channel
std::cout << "* Acquiring LO channel " << (type == TX ? "TX" : "RX") << '\n';
if (!get_lo_chan(ctx, type, &chn))
{
return false;
}
wr_ch_lli(chn, "frequency", cfg->lo_hz);
return true;
} }
int setup_filter(std::string filter_source_, uint64_t bandwidth_, uint64_t sample_rate_, uint64_t freq_, const std::string &rf_port_select_, struct iio_context *ctx, int setup_filter(std::string filter_source_, uint64_t bandwidth_, uint64_t sample_rate_, uint64_t freq_, const std::string &rf_port_select_, struct iio_context *ctx,
@ -139,12 +130,7 @@ int setup_filter(std::string filter_source_, uint64_t bandwidth_, uint64_t sampl
rxcfg.fs_hz = sample_rate_; rxcfg.fs_hz = sample_rate_;
rxcfg.lo_hz = freq_; rxcfg.lo_hz = freq_;
rxcfg.rfport = rf_port_select_.c_str(); rxcfg.rfport = rf_port_select_.c_str();
cfg_ad9361_streaming_ch(&rxcfg, RX, rx_chan);
if (!cfg_ad9361_streaming_ch(ctx, &rxcfg, RX, rx_chan))
{
std::cout << "RX LO channel not found\n";
throw std::runtime_error("AD9361 IIO LO not found");
}
} }
else if (filter_source_ == "Auto") else if (filter_source_ == "Auto")
{ {
@ -388,6 +374,15 @@ bool config_ad9361_rx_local(uint64_t bandwidth_,
return false; return false;
} }
// Configure LO channel
std::cout << "* Acquiring LO channel RX\n";
if (!get_lo_chan(ctx, RX, &rx_chan0))
{
std::cout << "RX LO channel not found\n";
throw std::runtime_error("RX LO channel not found");
}
wr_ch_lli(rx_chan0, "frequency", freq0_);
if (enable_ad9361_b) if (enable_ad9361_b)
{ {
// set-up AD9361-B stream device // set-up AD9361-B stream device
@ -578,6 +573,15 @@ bool config_ad9361_rx_remote(const std::string &remote_host,
return false; return false;
} }
// Configure LO channel
std::cout << "* Acquiring LO channel RX\n";
if (!get_lo_chan(ctx, RX, &rx_chan0))
{
std::cout << "RX LO channel not found\n";
throw std::runtime_error("RX LO channel not found");
}
wr_ch_lli(rx_chan0, "frequency", freq_);
std::cout << "* Enabling IIO streaming channels\n"; std::cout << "* Enabling IIO streaming channels\n";
if (rx1_enable_) if (rx1_enable_)
{ {
@ -705,11 +709,16 @@ bool config_ad9361_lo_local(uint64_t bandwidth_,
throw std::runtime_error("TX channel 0 not found"); throw std::runtime_error("TX channel 0 not found");
} }
if (!cfg_ad9361_streaming_ch(ctx, &txcfg, TX, tx_chan)) cfg_ad9361_streaming_ch(&txcfg, TX, tx_chan);
// Configure LO channel
std::cout << "* Acquiring LO channel TX\n";
if (!get_lo_chan(ctx, TX, &tx_chan))
{ {
std::cout << "TX LO channel not found\n"; std::cout << "TX LO channel not found\n";
throw std::runtime_error("TX LO channel not found"); throw std::runtime_error("TX LO channel not found");
} }
wr_ch_lli(tx_chan, "frequency", txcfg.lo_hz);
int ret; int ret;
// set output amplifier attenuation // set output amplifier attenuation
@ -856,11 +865,17 @@ bool config_ad9361_lo_remote(const std::string &remote_host,
throw std::runtime_error("TX channel 0 not found"); throw std::runtime_error("TX channel 0 not found");
} }
if (!cfg_ad9361_streaming_ch(ctx, &txcfg, TX, tx_chan)) cfg_ad9361_streaming_ch(&txcfg, TX, tx_chan);
// Configure LO channel
std::cout << "* Acquiring LO channel TX\n";
if (!get_lo_chan(ctx, TX, &tx_chan))
{ {
std::cout << "TX LO channel not found\n"; std::cout << "TX LO channel not found\n";
throw std::runtime_error("TX LO channel not found"); throw std::runtime_error("TX LO channel not found");
} }
wr_ch_lli(tx_chan, "frequency", txcfg.lo_hz);
int ret; int ret;
// set output amplifier attenuation // set output amplifier attenuation
ret = iio_device_attr_write_double(ad9361_phy, "out_voltage0_hardwaregain", -std::abs(tx_attenuation_db_)); ret = iio_device_attr_write_double(ad9361_phy, "out_voltage0_hardwaregain", -std::abs(tx_attenuation_db_));