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

Merge branch 'mmajoral-fix_dma_input_file_options' into next

Browse Source
This commit is contained in:
Carles Fernandez 2020-03-31 00:40:29 +02:00
commit 84fb6cca40
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
View File

@ -337,8 +337,23 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface *configura
{ {
enable_DMA_ = true; enable_DMA_ = true;
std::string empty_string; std::string empty_string;
filename_rx1 = configuration->property(role + ".filename_rx1", empty_string); filename_rx1 = configuration->property(role + ".filename", empty_string);
filename_rx2 = configuration->property(role + ".filename_rx2", empty_string);
// override value with commandline flag, if present
if (FLAGS_signal_source != "-")
{
filename_rx1 = FLAGS_signal_source;
}
if (FLAGS_s != "-")
{
filename_rx1 = FLAGS_s;
}
if (filename_rx1.empty())
{
filename_rx1 = configuration->property(role + ".filename0", empty_string);
filename_rx2 = configuration->property(role + ".filename1", empty_string);
}
int l1_band = configuration->property("Channels_1C.count", 0) + int l1_band = configuration->property("Channels_1C.count", 0) +
configuration->property("Channels_1B.count", 0); configuration->property("Channels_1B.count", 0);