mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-09-28 23:10:51 +00:00
Code Issues Releases Wiki Activity

Merge branch 'IntoPa-usrp_additions' into next

Browse Source
This commit is contained in:
Carles Fernandez 2022-08-26 23:17:01 +02:00
commit 8044564117
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/CHANGELOG.md
View File

@ -78,6 +78,9 @@ All notable changes to GNSS-SDR will be documented in this file.
`Osmosdr_Signal_Source` implementation of a `SignalSource`. `Osmosdr_Signal_Source` implementation of a `SignalSource`.
- The `Osmosdr_Signal_Source` implementation learned a new parameter `if_bw` to - The `Osmosdr_Signal_Source` implementation learned a new parameter `if_bw` to
manually set the bandwidth of the bandpass filter on the radio frontend. manually set the bandwidth of the bandpass filter on the radio frontend.
- The `UHD_Signal_Source` learned two new optional parameters
`device_recv_frame_size` and `device_num_recv_frames` for overriding
[transport layer defaults](https://files.ettus.com/manual/page_transport.html).
- The new configuration parameter `Channels_XX.RF_channel_ID` allows to specify - The new configuration parameter `Channels_XX.RF_channel_ID` allows to specify
the signal source per channel group. the signal source per channel group.
- Allowed the CMake project to be a sub-project. - Allowed the CMake project to be a sub-project.

14
src/algorithms/signal_source/adapters/uhd_signal_source.cc
View File

@ -65,6 +65,20 @@ UhdSignalSource::UhdSignalSource(const ConfigurationInterface* configuration,
sample_rate_ = configuration->property(role + ".sampling_frequency", 4.0e6); sample_rate_ = configuration->property(role + ".sampling_frequency", 4.0e6);
item_type_ = configuration->property(role + ".item_type", default_item_type); item_type_ = configuration->property(role + ".item_type", default_item_type);
// UHD TRANSPORT PARAMETERS
// option to manually set device "num_recv_frames"
std::string device_num_recv_frames = configuration->property(role + ".device_num_recv_frames", empty);
if (empty != device_num_recv_frames) // if not empty
{
dev_addr["num_recv_frames"] = device_num_recv_frames;
}
// option to manually set device "recv_frame_size"
std::string device_recv_frame_size = configuration->property(role + ".device_recv_frame_size", empty);
if (empty != device_recv_frame_size) // if not empty
{
dev_addr["recv_frame_size"] = device_recv_frame_size;
}
if (RF_channels_ == 1) if (RF_channels_ == 1)
{ {
// Single RF channel UHD operation (backward compatible config file format) // Single RF channel UHD operation (backward compatible config file format)