mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-31 07:13:03 +00:00
Code Issues Releases Wiki Activity

Fix building

Browse Source
This commit is contained in:
Carles Fernandez
2022-12-05 23:18:33 +01:00
parent 1aeaddaeab
commit 31b7a01c51
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
View File

@@ -55,7 +55,7 @@ GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition(
DLOG(INFO) << "role " << role; DLOG(INFO) << "role " << role;
item_type_ = configuration_->property(role + ".item_type", default_item_type); item_type_ = configuration_->property(role + ".item_type", default_item_type);
int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000LL); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000);
fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
if (FLAGS_doppler_max != 0) if (FLAGS_doppler_max != 0)

2
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc
View File

@@ -55,7 +55,7 @@ GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition(
item_type_ = configuration_->property(role + ".item_type", default_item_type); item_type_ = configuration_->property(role + ".item_type", default_item_type);
int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000LL); int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000);
fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
if (FLAGS_doppler_max != 0) if (FLAGS_doppler_max != 0)

25
src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
View File

@@ -34,29 +34,30 @@ RtlTcpSignalSource::RtlTcpSignalSource(const ConfigurationInterface* configurati
unsigned int in_stream, unsigned int in_stream,
unsigned int out_stream, unsigned int out_stream,
Concurrent_Queue<pmt::pmt_t>* queue) Concurrent_Queue<pmt::pmt_t>* queue)
: SignalSourceBase(configuration, role, "RtlTcp_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream) : SignalSourceBase(configuration, role, "RtlTcp_Signal_Source"s),
samples_(configuration->property(role + ".samples", static_cast<uint64_t>(0))),
rf_gain_(configuration->property(role + ".rf_gain", 40.0)),
sample_rate_(configuration->property(role + ".sampling_frequency", 2000000)),
freq_(configuration->property(role + ".freq", static_cast<int>(GPS_L1_FREQ_HZ))),
gain_(configuration->property(role + ".gain", 40)),
if_gain_(configuration->property(role + ".if_gain", 40)),
in_stream_(in_stream),
out_stream_(out_stream),
AGC_enabled_(configuration->property(role + ".AGC_enabled", true)),
flip_iq_(configuration->property(role + ".flip_iq", false)),
dump_(configuration->property(role + ".dump", false))
{ {
// DUMP PARAMETERS // DUMP PARAMETERS
const std::string default_dump_file("./data/signal_source.dat"); const std::string default_dump_file("./data/signal_source.dat");
const std::string default_item_type("gr_complex"); const std::string default_item_type("gr_complex");
samples_ = configuration->property(role + ".samples", static_cast<uint64_t>(0)); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file);
dump_ = configuration->property(role + ".dump", false);
dump_filename_ = configuration->property(role + ".dump_filename",
default_dump_file);
// rtl_tcp PARAMETERS // rtl_tcp PARAMETERS
const std::string default_address("127.0.0.1"); const std::string default_address("127.0.0.1");
const int16_t default_port = 1234; const int16_t default_port = 1234;
AGC_enabled_ = configuration->property(role + ".AGC_enabled", true);
freq_ = configuration->property(role + ".freq", static_cast<int>(GPS_L1_FREQ_HZ));
gain_ = configuration->property(role + ".gain", 40);
rf_gain_ = configuration->property(role + ".rf_gain", 40.0);
if_gain_ = configuration->property(role + ".if_gain", 40);
sample_rate_ = configuration->property(role + ".sampling_frequency", 2000000);
item_type_ = configuration->property(role + ".item_type", default_item_type); item_type_ = configuration->property(role + ".item_type", default_item_type);
address_ = configuration->property(role + ".address", default_address); address_ = configuration->property(role + ".address", default_address);
port_ = configuration->property(role + ".port", default_port); port_ = configuration->property(role + ".port", default_port);
flip_iq_ = configuration->property(role + ".flip_iq", false);
if (item_type_ == "short") if (item_type_ == "short")
{ {

2
src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
View File

@@ -78,11 +78,11 @@ private:
std::string address_; std::string address_;
size_t item_size_; size_t item_size_;
uint64_t samples_; uint64_t samples_;
double rf_gain_;
int sample_rate_; int sample_rate_;
int freq_; int freq_;
int gain_; int gain_;
int if_gain_; int if_gain_;
double rf_gain_;
unsigned int in_stream_; unsigned int in_stream_;
unsigned int out_stream_; unsigned int out_stream_;
int16_t port_; int16_t port_;