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

Fix building

Browse Source
This commit is contained in:
Carles Fernandez 2022-12-05 22:37:49 +01:00
parent 6b614958ca
commit dde0667c6b
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
14 changed files with 65 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

14
src/algorithms/data_type_adapter/adapters/byte_to_short.cc
View File

@ -20,8 +20,13 @@
#include <utility>
ByteToShort::ByteToShort(const ConfigurationInterface* configuration, std::string role,
unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
ByteToShort::ByteToShort(const ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams) : role_(std::move(role)),
in_streams_(in_streams),
out_streams_(out_streams),
dump_(configuration->property(role + ".dump", false))
{
const std::string default_input_item_type("byte");
const std::string default_output_item_type("short");
@ -30,12 +35,8 @@ ByteToShort::ByteToShort(const ConfigurationInterface* configuration, std::strin
DLOG(INFO) << "role " << role_;
input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type);
dump_ = configuration->property(role_ + ".dump", false);
dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename);
const size_t item_size = sizeof(int16_t);
gr_char_to_short_ = gr::blocks::char_to_short::make();
DLOG(INFO) << "data_type_adapter_(" << gr_char_to_short_->unique_id() << ")";
@ -43,6 +44,7 @@ ByteToShort::ByteToShort(const ConfigurationInterface* configuration, std::strin
if (dump_)
{
DLOG(INFO) << "Dumping output into file " << dump_filename_;
const size_t item_size = sizeof(int16_t);
file_sink_ = gr::blocks::file_sink::make(item_size, dump_filename_.c_str());
}
if (in_streams_ > 1)

16
src/algorithms/data_type_adapter/adapters/ibyte_to_cbyte.cc
View File

@ -21,8 +21,14 @@
#include <volk/volk.h>
IbyteToCbyte::IbyteToCbyte(const ConfigurationInterface* configuration, const std::string& role,
unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
IbyteToCbyte::IbyteToCbyte(const ConfigurationInterface* configuration,
const std::string& role,
unsigned int in_streams,
unsigned int out_streams) : role_(role),
in_streams_(in_streams),
out_streams_(out_streams),
inverted_spectrum(configuration->property(role + ".inverted_spectrum", false)),
dump_(configuration->property(role + ".dump", false))
{
const std::string default_input_item_type("byte");
const std::string default_output_item_type("lv_8sc_t");
@ -31,12 +37,7 @@ IbyteToCbyte::IbyteToCbyte(const ConfigurationInterface* configuration, const st
DLOG(INFO) << "role " << role_;
input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type);
dump_ = configuration->property(role_ + ".dump", false);
dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename);
inverted_spectrum = configuration->property(role + ".inverted_spectrum", false);
const size_t item_size = sizeof(lv_8sc_t);
ibyte_to_cbyte_ = make_interleaved_byte_to_complex_byte();
@ -45,6 +46,7 @@ IbyteToCbyte::IbyteToCbyte(const ConfigurationInterface* configuration, const st
if (dump_)
{
DLOG(INFO) << "Dumping output into file " << dump_filename_;
const size_t item_size = sizeof(lv_8sc_t);
file_sink_ = gr::blocks::file_sink::make(item_size, dump_filename_.c_str());
}
if (inverted_spectrum)

13
src/algorithms/data_type_adapter/adapters/ibyte_to_complex.cc
View File

@ -20,7 +20,12 @@
IbyteToComplex::IbyteToComplex(const ConfigurationInterface* configuration, const std::string& role,
unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
unsigned int in_streams,
unsigned int out_streams) : role_(role),
in_streams_(in_streams),
out_streams_(out_streams),
inverted_spectrum(configuration->property(role + ".inverted_spectrum", false)),
dump_(configuration->property(role + ".dump", false))
{
const std::string default_input_item_type("byte");
const std::string default_output_item_type("gr_complex");
@ -29,12 +34,7 @@ IbyteToComplex::IbyteToComplex(const ConfigurationInterface* configuration, cons
DLOG(INFO) << "role " << role_;
input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type);
dump_ = configuration->property(role_ + ".dump", false);
dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename);
inverted_spectrum = configuration->property(role + ".inverted_spectrum", false);
const size_t item_size = sizeof(gr_complex);
gr_interleaved_char_to_complex_ = gr::blocks::interleaved_char_to_complex::make();
@ -47,6 +47,7 @@ IbyteToComplex::IbyteToComplex(const ConfigurationInterface* configuration, cons
if (dump_)
{
DLOG(INFO) << "Dumping output into file " << dump_filename_;
const size_t item_size = sizeof(gr_complex);
file_sink_ = gr::blocks::file_sink::make(item_size, dump_filename_.c_str());
}
if (in_streams_ > 1)

16
src/algorithms/data_type_adapter/adapters/ibyte_to_cshort.cc
View File

@ -21,8 +21,14 @@
#include <volk/volk.h>
IbyteToCshort::IbyteToCshort(const ConfigurationInterface* configuration, const std::string& role,
unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
IbyteToCshort::IbyteToCshort(const ConfigurationInterface* configuration,
const std::string& role,
unsigned int in_streams,
unsigned int out_streams) : role_(role),
in_streams_(in_streams),
out_streams_(out_streams),
inverted_spectrum(configuration->property(role + ".inverted_spectrum", false)),
dump_(configuration->property(role + ".dump", false))
{
const std::string default_input_item_type("byte");
const std::string default_output_item_type("cshort");
@ -31,12 +37,7 @@ IbyteToCshort::IbyteToCshort(const ConfigurationInterface* configuration, const
DLOG(INFO) << "role " << role_;
input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type);
dump_ = configuration->property(role_ + ".dump", false);
dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename);
inverted_spectrum = configuration->property(role + ".inverted_spectrum", false);
const size_t item_size = sizeof(lv_16sc_t);
interleaved_byte_to_complex_short_ = make_interleaved_byte_to_complex_short();
@ -45,6 +46,7 @@ IbyteToCshort::IbyteToCshort(const ConfigurationInterface* configuration, const
if (dump_)
{
DLOG(INFO) << "Dumping output into file " << dump_filename_;
const size_t item_size = sizeof(lv_16sc_t);
file_sink_ = gr::blocks::file_sink::make(item_size, dump_filename_.c_str());
}
if (inverted_spectrum)

16
src/algorithms/data_type_adapter/adapters/ishort_to_complex.cc
View File

@ -19,8 +19,14 @@
#include <glog/logging.h>
IshortToComplex::IshortToComplex(const ConfigurationInterface* configuration, const std::string& role,
unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
IshortToComplex::IshortToComplex(const ConfigurationInterface* configuration,
const std::string& role,
unsigned int in_streams,
unsigned int out_streams) : role_(role),
in_streams_(in_streams),
out_streams_(out_streams),
inverted_spectrum(configuration->property(role + ".inverted_spectrum", false)),
dump_(configuration->property(role + ".dump", false))
{
const std::string default_input_item_type("short");
const std::string default_output_item_type("gr_complex");
@ -29,12 +35,7 @@ IshortToComplex::IshortToComplex(const ConfigurationInterface* configuration, co
DLOG(INFO) << "role " << role_;
input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type);
dump_ = configuration->property(role_ + ".dump", false);
dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename);
inverted_spectrum = configuration->property(role + ".inverted_spectrum", false);
const size_t item_size = sizeof(gr_complex);
gr_interleaved_short_to_complex_ = gr::blocks::interleaved_short_to_complex::make();
@ -47,6 +48,7 @@ IshortToComplex::IshortToComplex(const ConfigurationInterface* configuration, co
if (dump_)
{
DLOG(INFO) << "Dumping output into file " << dump_filename_;
const size_t item_size = sizeof(gr_complex);
file_sink_ = gr::blocks::file_sink::make(item_size, dump_filename_.c_str());
}
if (in_streams_ > 1)

16
src/algorithms/data_type_adapter/adapters/ishort_to_cshort.cc
View File

@ -21,8 +21,14 @@
#include <volk/volk.h>
IshortToCshort::IshortToCshort(const ConfigurationInterface* configuration, const std::string& role,
unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
IshortToCshort::IshortToCshort(const ConfigurationInterface* configuration,
const std::string& role,
unsigned int in_streams,
unsigned int out_streams) : role_(role),
in_streams_(in_streams),
out_streams_(out_streams),
inverted_spectrum(configuration->property(role + ".inverted_spectrum", false)),
dump_(configuration->property(role + ".dump", false))
{
const std::string default_input_item_type("short");
const std::string default_output_item_type("cshort");
@ -31,12 +37,7 @@ IshortToCshort::IshortToCshort(const ConfigurationInterface* configuration, cons
DLOG(INFO) << "role " << role_;
input_item_type_ = configuration->property(role_ + ".input_item_type", default_input_item_type);
dump_ = configuration->property(role_ + ".dump", false);
dump_filename_ = configuration->property(role_ + ".dump_filename", default_dump_filename);
inverted_spectrum = configuration->property(role + ".inverted_spectrum", false);
const size_t item_size = sizeof(lv_16sc_t);
interleaved_short_to_complex_short_ = make_interleaved_short_to_complex_short();
@ -45,6 +46,7 @@ IshortToCshort::IshortToCshort(const ConfigurationInterface* configuration, cons
if (dump_)
{
DLOG(INFO) << "Dumping output into file " << dump_filename_;
const size_t item_size = sizeof(lv_16sc_t);
file_sink_ = gr::blocks::file_sink::make(item_size, dump_filename_.c_str());
}
if (inverted_spectrum)

4
src/algorithms/input_filter/adapters/beamformer_filter.cc
View File

@ -26,12 +26,12 @@ BeamformerFilter::BeamformerFilter(
unsigned int in_stream, unsigned int out_stream)
: role_(role),
in_stream_(in_stream),
out_stream_(out_stream)
out_stream_(out_stream),
dump_(configuration->property(role + ".dump", false))
{
const std::string default_item_type("gr_complex");
const std::string default_dump_file("./data/input_filter.dat");
item_type_ = configuration->property(role + ".item_type", default_item_type);
dump_ = configuration->property(role + ".dump", false);
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file);
DLOG(INFO) << "role " << role_;
if (item_type_ == "gr_complex")

4
src/algorithms/input_filter/adapters/notch_filter.cc
View File

@ -28,7 +28,8 @@ NotchFilter::NotchFilter(const ConfigurationInterface* configuration,
unsigned int out_streams)
: role_(role),
in_streams_(in_streams),
out_streams_(out_streams)
out_streams_(out_streams),
dump_(configuration->property(role + ".dump", false))
{
const std::string default_item_type("gr_complex");
const std::string default_dump_file("./data/input_filter.dat");
@ -46,7 +47,6 @@ NotchFilter::NotchFilter(const ConfigurationInterface* configuration,
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file);
item_type_ = configuration->property(role + ".item_type", default_item_type);
dump_ = configuration->property(role + ".dump", false);
DLOG(INFO) << "role " << role_;
if (item_type_ == "gr_complex")

5
src/algorithms/input_filter/adapters/notch_filter_lite.cc
View File

@ -29,7 +29,8 @@ NotchFilterLite::NotchFilterLite(const ConfigurationInterface* configuration,
unsigned int out_streams)
: role_(role),
in_streams_(in_streams),
out_streams_(out_streams)
out_streams_(out_streams),
dump_(configuration->property(role + ".dump", false))
{
const std::string default_item_type("gr_complex");
const std::string default_dump_file("./data/input_filter.dat");
@ -39,7 +40,6 @@ NotchFilterLite::NotchFilterLite(const ConfigurationInterface* configuration,
const int default_n_segments_reset = 5000000;
const int default_length_ = 32;
const int default_n_segments_est = 12500;
const float samp_freq = configuration->property("SignalSource.sampling_frequency", default_samp_freq);
const float default_coeff_rate = samp_freq * 0.1F;
const float p_c_factor = configuration->property(role + ".p_c_factor", default_p_c_factor);
@ -51,7 +51,6 @@ NotchFilterLite::NotchFilterLite(const ConfigurationInterface* configuration,
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file);
item_type_ = configuration->property(role + ".item_type", default_item_type);
dump_ = configuration->property(role + ".dump", false);
int n_segments_coeff = static_cast<int>((samp_freq / coeff_rate) / static_cast<float>(length_));
n_segments_coeff = std::max(1, n_segments_coeff);

6
src/algorithms/signal_generator/adapters/signal_generator.cc
View File

@ -33,7 +33,10 @@
SignalGenerator::SignalGenerator(const ConfigurationInterface* configuration,
const std::string& role, unsigned int in_stream,
unsigned int out_stream,
Concurrent_Queue<pmt::pmt_t>* queue __attribute__((unused))) : role_(role), in_stream_(in_stream), out_stream_(out_stream)
Concurrent_Queue<pmt::pmt_t>* queue __attribute__((unused))) : role_(role),
in_stream_(in_stream),
out_stream_(out_stream),
dump_(configuration->property(role + ".dump", false))
{
const std::string default_item_type("gr_complex");
const std::string default_dump_file("./data/gen_source.dat");
@ -41,7 +44,6 @@ SignalGenerator::SignalGenerator(const ConfigurationInterface* configuration,
const std::string default_signal("1C");
item_type_ = configuration->property(role + ".item_type", default_item_type);
dump_ = configuration->property(role + ".dump", false);
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file);
const unsigned int fs_in = configuration->property("SignalSource.fs_hz", static_cast<unsigned>(4e6));