From eb56367f0526f87e24dfdfaddbbe075702fe5ea4 Mon Sep 17 00:00:00 2001 From: Vladisslav P Date: Sun, 26 Jun 2022 00:05:25 +0300 Subject: [PATCH 1/2] Simplify multiple signal source configuration Make it possible to specify signal sorce per channel group. Example: ;Set GPS L1 C/A channels RF channel ID to 1 Channels_1C.RF_channel_ID=1 instead of ;Set GPS L1 C/A channels RF channel ID to 1 Channel0.RF_channel_ID=1 Channel1.RF_channel_ID=1 Channel2.RF_channel_ID=1 .... Signed-off-by: Vladisslav P --- src/core/receiver/gnss_flowgraph.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index 990780e3d..eaf193c76 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -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) { From 3862b5afade28705fddb783f7051580afe2ca48d Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 15 Jul 2022 19:24:50 +0200 Subject: [PATCH 2/2] Update changelog --- docs/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 58424ff05..2f49b2f7a 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -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/