1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-07-05 03:13:15 +00:00

Merge branch 'vladisslav2011-simplify_configuration' into next

This commit is contained in:
Carles Fernandez 2022-07-15 19:25:17 +02:00
commit 2b3b5a1242
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 4 additions and 1 deletions

View File

@ -71,6 +71,8 @@ All notable changes to GNSS-SDR will be documented in this file.
`Osmosdr_Signal_Source` implementation of a `SignalSource`.
- The `Osmosdr_Signal_Source` implementation learned a new parameter `if_bw` to
manually set the bandwidth of the bandpass filter on the radio frontend.
- The new configuration parameter `Channels_XX.RF_channel_ID` allows to specify
the signal source per channel group.
See the definitions of concepts and metrics at
https://gnss-sdr.org/design-forces/

View File

@ -1010,7 +1010,8 @@ int GNSSFlowgraph::connect_signal_conditioners_to_channels()
try
{
selected_signal_conditioner_ID = configuration_->property("Channel" + std::to_string(i) + ".RF_channel_ID", 0);
selected_signal_conditioner_ID = configuration_->property("Channels_" + channels_.at(i)->get_signal().get_signal_str() + ".RF_channel_ID", 0);
selected_signal_conditioner_ID = configuration_->property("Channel" + std::to_string(i) + ".RF_channel_ID", selected_signal_conditioner_ID);
}
catch (const std::exception& e)
{