mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-01-22 15:07:23 +00:00
Apply fixes by clang-tidy
This commit is contained in:
parent
5485afd882
commit
54237770a6
@ -51,9 +51,9 @@ IncludeBlocks: Merge
|
|||||||
IncludeCategories:
|
IncludeCategories:
|
||||||
- Regex: '^.*.h"'
|
- Regex: '^.*.h"'
|
||||||
Priority: 1
|
Priority: 1
|
||||||
- Regex: '^.*(boost|gflags|glog|gtest|gnsssdr|gnuradio|pmt|uhd|volk)/'
|
- Regex: '^.*(boost|gflags|glog|gnsssdr|gpstk|gtest|gnuradio|pmt|uhd|volk)/'
|
||||||
Priority: 2
|
Priority: 2
|
||||||
- Regex: '^.*(armadillo|matio)'
|
- Regex: '^.*(armadillo|matio|pugixml)'
|
||||||
Priority: 2
|
Priority: 2
|
||||||
- Regex: '.*'
|
- Regex: '.*'
|
||||||
Priority: 3
|
Priority: 3
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
---
|
---
|
||||||
Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,google-runtime-references,llvm-header-guard,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-deprecated-headers,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-using,performance-faster-string-find,performance-move-const-arg,readability-named-parameter,readability-string-compare'
|
Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,google-runtime-references,llvm-header-guard,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-deprecated-headers,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-using,performance-faster-string-find,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-named-parameter,readability-string-compare'
|
||||||
HeaderFilterRegex: '.*'
|
HeaderFilterRegex: '.*'
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include "pcps_acquisition_fpga.h"
|
#include "pcps_acquisition_fpga.h"
|
||||||
#include <glog/logging.h>
|
#include <glog/logging.h>
|
||||||
#include <gnuradio/io_signature.h>
|
#include <gnuradio/io_signature.h>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
|
|
||||||
#define AQ_DOWNSAMPLING_DELAY 40 // delay due to the downsampling filter in the acquisition
|
#define AQ_DOWNSAMPLING_DELAY 40 // delay due to the downsampling filter in the acquisition
|
||||||
@ -50,7 +51,7 @@ using google::LogMessage;
|
|||||||
|
|
||||||
pcps_acquisition_fpga_sptr pcps_make_acquisition_fpga(pcpsconf_fpga_t conf_)
|
pcps_acquisition_fpga_sptr pcps_make_acquisition_fpga(pcpsconf_fpga_t conf_)
|
||||||
{
|
{
|
||||||
return pcps_acquisition_fpga_sptr(new pcps_acquisition_fpga(conf_));
|
return pcps_acquisition_fpga_sptr(new pcps_acquisition_fpga(std::move(conf_)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -61,7 +62,7 @@ pcps_acquisition_fpga::pcps_acquisition_fpga(pcpsconf_fpga_t conf_) : gr::block(
|
|||||||
// printf("acq constructor start\n");
|
// printf("acq constructor start\n");
|
||||||
this->message_port_register_out(pmt::mp("events"));
|
this->message_port_register_out(pmt::mp("events"));
|
||||||
|
|
||||||
acq_parameters = conf_;
|
acq_parameters = std::move(conf_);
|
||||||
d_sample_counter = 0ULL; // SAMPLE COUNTER
|
d_sample_counter = 0ULL; // SAMPLE COUNTER
|
||||||
d_active = false;
|
d_active = false;
|
||||||
d_state = 0;
|
d_state = 0;
|
||||||
@ -256,7 +257,7 @@ void pcps_acquisition_fpga::set_active(bool active)
|
|||||||
d_gnss_synchro->Acq_doppler_hz = static_cast<double>(doppler);
|
d_gnss_synchro->Acq_doppler_hz = static_cast<double>(doppler);
|
||||||
d_gnss_synchro->Acq_samplestamp_samples = d_sample_counter;
|
d_gnss_synchro->Acq_samplestamp_samples = d_sample_counter;
|
||||||
|
|
||||||
d_test_statistics = (d_mag / d_input_power); //* correction_factor;
|
d_test_statistics = (d_mag / d_input_power); // correction_factor;
|
||||||
}
|
}
|
||||||
|
|
||||||
// In the case of the FPGA the option of dumping the results of the acquisition to a file is not available
|
// In the case of the FPGA the option of dumping the results of the acquisition to a file is not available
|
||||||
|
@ -40,6 +40,7 @@
|
|||||||
#include <fcntl.h> // libraries used by the GIPO
|
#include <fcntl.h> // libraries used by the GIPO
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sys/mman.h> // libraries used by the GIPO
|
#include <sys/mman.h> // libraries used by the GIPO
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
|
|
||||||
#define PAGE_SIZE 0x10000 // default page size for the multicorrelator memory map
|
#define PAGE_SIZE 0x10000 // default page size for the multicorrelator memory map
|
||||||
@ -102,7 +103,7 @@ fpga_acquisition::fpga_acquisition(std::string device_name,
|
|||||||
|
|
||||||
//printf("AAA- vector_length = %d\n ", vector_length);
|
//printf("AAA- vector_length = %d\n ", vector_length);
|
||||||
// initial values
|
// initial values
|
||||||
d_device_name = device_name;
|
d_device_name = std::move(device_name);
|
||||||
//d_freq = freq;
|
//d_freq = freq;
|
||||||
d_fs_in = fs_in;
|
d_fs_in = fs_in;
|
||||||
d_vector_length = vector_length;
|
d_vector_length = vector_length;
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface* configuration,
|
Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface* configuration,
|
||||||
std::string role, unsigned int in_stream, unsigned int out_stream,
|
const std::string& role, unsigned int in_stream, unsigned int out_stream,
|
||||||
boost::shared_ptr<gr::msg_queue> queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(std::move(queue))
|
boost::shared_ptr<gr::msg_queue> queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(std::move(queue))
|
||||||
{
|
{
|
||||||
std::string default_item_type = "gr_complex";
|
std::string default_item_type = "gr_complex";
|
||||||
|
@ -45,7 +45,7 @@ class Ad9361FpgaSignalSource : public GNSSBlockInterface
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Ad9361FpgaSignalSource(ConfigurationInterface* configuration,
|
Ad9361FpgaSignalSource(ConfigurationInterface* configuration,
|
||||||
std::string role, unsigned int in_stream,
|
const std::string& role, unsigned int in_stream,
|
||||||
unsigned int out_stream, boost::shared_ptr<gr::msg_queue> queue);
|
unsigned int out_stream, boost::shared_ptr<gr::msg_queue> queue);
|
||||||
|
|
||||||
~Ad9361FpgaSignalSource();
|
~Ad9361FpgaSignalSource();
|
||||||
|
@ -43,7 +43,7 @@ using google::LogMessage;
|
|||||||
|
|
||||||
|
|
||||||
CustomUDPSignalSource::CustomUDPSignalSource(ConfigurationInterface* configuration,
|
CustomUDPSignalSource::CustomUDPSignalSource(ConfigurationInterface* configuration,
|
||||||
std::string role, unsigned int in_stream, unsigned int out_stream,
|
const std::string& role, unsigned int in_stream, unsigned int out_stream,
|
||||||
boost::shared_ptr<gr::msg_queue> queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(std::move(queue))
|
boost::shared_ptr<gr::msg_queue> queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(std::move(queue))
|
||||||
{
|
{
|
||||||
// DUMP PARAMETERS
|
// DUMP PARAMETERS
|
||||||
|
@ -54,7 +54,7 @@ class CustomUDPSignalSource : public GNSSBlockInterface
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
CustomUDPSignalSource(ConfigurationInterface* configuration,
|
CustomUDPSignalSource(ConfigurationInterface* configuration,
|
||||||
std::string role, unsigned int in_stream,
|
const std::string& role, unsigned int in_stream,
|
||||||
unsigned int out_stream, boost::shared_ptr<gr::msg_queue> queue);
|
unsigned int out_stream, boost::shared_ptr<gr::msg_queue> queue);
|
||||||
|
|
||||||
virtual ~CustomUDPSignalSource();
|
virtual ~CustomUDPSignalSource();
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
using google::LogMessage;
|
using google::LogMessage;
|
||||||
|
|
||||||
Fmcomms2SignalSource::Fmcomms2SignalSource(ConfigurationInterface* configuration,
|
Fmcomms2SignalSource::Fmcomms2SignalSource(ConfigurationInterface* configuration,
|
||||||
std::string role, unsigned int in_stream, unsigned int out_stream,
|
const std::string& role, unsigned int in_stream, unsigned int out_stream,
|
||||||
boost::shared_ptr<gr::msg_queue> queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(std::move(queue))
|
boost::shared_ptr<gr::msg_queue> queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(std::move(queue))
|
||||||
{
|
{
|
||||||
std::string default_item_type = "gr_complex";
|
std::string default_item_type = "gr_complex";
|
||||||
|
@ -46,7 +46,7 @@ class Fmcomms2SignalSource : public GNSSBlockInterface
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Fmcomms2SignalSource(ConfigurationInterface* configuration,
|
Fmcomms2SignalSource(ConfigurationInterface* configuration,
|
||||||
std::string role, unsigned int in_stream,
|
const std::string& role, unsigned int in_stream,
|
||||||
unsigned int out_stream, boost::shared_ptr<gr::msg_queue> queue);
|
unsigned int out_stream, boost::shared_ptr<gr::msg_queue> queue);
|
||||||
|
|
||||||
virtual ~Fmcomms2SignalSource();
|
virtual ~Fmcomms2SignalSource();
|
||||||
|
@ -44,7 +44,7 @@ using google::LogMessage;
|
|||||||
|
|
||||||
|
|
||||||
OsmosdrSignalSource::OsmosdrSignalSource(ConfigurationInterface* configuration,
|
OsmosdrSignalSource::OsmosdrSignalSource(ConfigurationInterface* configuration,
|
||||||
std::string role, unsigned int in_stream, unsigned int out_stream,
|
const std::string& role, unsigned int in_stream, unsigned int out_stream,
|
||||||
boost::shared_ptr<gr::msg_queue> queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(std::move(queue))
|
boost::shared_ptr<gr::msg_queue> queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(std::move(queue))
|
||||||
{
|
{
|
||||||
// DUMP PARAMETERS
|
// DUMP PARAMETERS
|
||||||
|
@ -52,7 +52,7 @@ class OsmosdrSignalSource : public GNSSBlockInterface
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
OsmosdrSignalSource(ConfigurationInterface* configuration,
|
OsmosdrSignalSource(ConfigurationInterface* configuration,
|
||||||
std::string role, unsigned int in_stream,
|
const std::string& role, unsigned int in_stream,
|
||||||
unsigned int out_stream, boost::shared_ptr<gr::msg_queue> queue);
|
unsigned int out_stream, boost::shared_ptr<gr::msg_queue> queue);
|
||||||
|
|
||||||
virtual ~OsmosdrSignalSource();
|
virtual ~OsmosdrSignalSource();
|
||||||
|
@ -41,7 +41,7 @@ using google::LogMessage;
|
|||||||
|
|
||||||
|
|
||||||
PlutosdrSignalSource::PlutosdrSignalSource(ConfigurationInterface* configuration,
|
PlutosdrSignalSource::PlutosdrSignalSource(ConfigurationInterface* configuration,
|
||||||
std::string role, unsigned int in_stream, unsigned int out_stream,
|
const std::string& role, unsigned int in_stream, unsigned int out_stream,
|
||||||
boost::shared_ptr<gr::msg_queue> queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(std::move(queue))
|
boost::shared_ptr<gr::msg_queue> queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(std::move(queue))
|
||||||
{
|
{
|
||||||
std::string default_item_type = "gr_complex";
|
std::string default_item_type = "gr_complex";
|
||||||
|
@ -48,7 +48,7 @@ class PlutosdrSignalSource : public GNSSBlockInterface
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
PlutosdrSignalSource(ConfigurationInterface* configuration,
|
PlutosdrSignalSource(ConfigurationInterface* configuration,
|
||||||
std::string role, unsigned int in_stream,
|
const std::string& role, unsigned int in_stream,
|
||||||
unsigned int out_stream, boost::shared_ptr<gr::msg_queue> queue);
|
unsigned int out_stream, boost::shared_ptr<gr::msg_queue> queue);
|
||||||
|
|
||||||
virtual ~PlutosdrSignalSource();
|
virtual ~PlutosdrSignalSource();
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
|
|
||||||
#include "gr_complex_ip_packet_source.h"
|
#include "gr_complex_ip_packet_source.h"
|
||||||
#include <gnuradio/io_signature.h>
|
#include <gnuradio/io_signature.h>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
|
|
||||||
const int FIFO_SIZE = 1472000;
|
const int FIFO_SIZE = 1472000;
|
||||||
@ -76,15 +77,15 @@ typedef struct gr_udp_header
|
|||||||
|
|
||||||
gr_complex_ip_packet_source::sptr
|
gr_complex_ip_packet_source::sptr
|
||||||
gr_complex_ip_packet_source::make(std::string src_device,
|
gr_complex_ip_packet_source::make(std::string src_device,
|
||||||
std::string origin_address,
|
const std::string& origin_address,
|
||||||
int udp_port,
|
int udp_port,
|
||||||
int udp_packet_size,
|
int udp_packet_size,
|
||||||
int n_baseband_channels,
|
int n_baseband_channels,
|
||||||
std::string wire_sample_type,
|
const std::string& wire_sample_type,
|
||||||
size_t item_size,
|
size_t item_size,
|
||||||
bool IQ_swap_)
|
bool IQ_swap_)
|
||||||
{
|
{
|
||||||
return gnuradio::get_initial_sptr(new gr_complex_ip_packet_source(src_device,
|
return gnuradio::get_initial_sptr(new gr_complex_ip_packet_source(std::move(src_device),
|
||||||
origin_address,
|
origin_address,
|
||||||
udp_port,
|
udp_port,
|
||||||
udp_packet_size,
|
udp_packet_size,
|
||||||
@ -99,11 +100,11 @@ gr_complex_ip_packet_source::make(std::string src_device,
|
|||||||
* The private constructor
|
* The private constructor
|
||||||
*/
|
*/
|
||||||
gr_complex_ip_packet_source::gr_complex_ip_packet_source(std::string src_device,
|
gr_complex_ip_packet_source::gr_complex_ip_packet_source(std::string src_device,
|
||||||
__attribute__((unused)) std::string origin_address,
|
__attribute__((unused)) const std::string& origin_address,
|
||||||
int udp_port,
|
int udp_port,
|
||||||
int udp_packet_size,
|
int udp_packet_size,
|
||||||
int n_baseband_channels,
|
int n_baseband_channels,
|
||||||
std::string wire_sample_type,
|
const std::string& wire_sample_type,
|
||||||
size_t item_size,
|
size_t item_size,
|
||||||
bool IQ_swap_)
|
bool IQ_swap_)
|
||||||
: gr::sync_block("gr_complex_ip_packet_source",
|
: gr::sync_block("gr_complex_ip_packet_source",
|
||||||
@ -129,7 +130,7 @@ gr_complex_ip_packet_source::gr_complex_ip_packet_source(std::string src_device,
|
|||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
std::cout << "d_wire_sample_type:" << d_wire_sample_type << std::endl;
|
std::cout << "d_wire_sample_type:" << d_wire_sample_type << std::endl;
|
||||||
d_src_device = src_device;
|
d_src_device = std::move(src_device);
|
||||||
d_udp_port = udp_port;
|
d_udp_port = udp_port;
|
||||||
d_udp_payload_size = udp_packet_size;
|
d_udp_payload_size = udp_packet_size;
|
||||||
d_fifo_full = false;
|
d_fifo_full = false;
|
||||||
|
@ -84,19 +84,19 @@ private:
|
|||||||
public:
|
public:
|
||||||
typedef boost::shared_ptr<gr_complex_ip_packet_source> sptr;
|
typedef boost::shared_ptr<gr_complex_ip_packet_source> sptr;
|
||||||
static sptr make(std::string src_device,
|
static sptr make(std::string src_device,
|
||||||
std::string origin_address,
|
const std::string& origin_address,
|
||||||
int udp_port,
|
int udp_port,
|
||||||
int udp_packet_size,
|
int udp_packet_size,
|
||||||
int n_baseband_channels,
|
int n_baseband_channels,
|
||||||
std::string wire_sample_type,
|
const std::string& wire_sample_type,
|
||||||
size_t item_size,
|
size_t item_size,
|
||||||
bool IQ_swap_);
|
bool IQ_swap_);
|
||||||
gr_complex_ip_packet_source(std::string src_device,
|
gr_complex_ip_packet_source(std::string src_device,
|
||||||
std::string origin_address,
|
const std::string& origin_address,
|
||||||
int udp_port,
|
int udp_port,
|
||||||
int udp_packet_size,
|
int udp_packet_size,
|
||||||
int n_baseband_channels,
|
int n_baseband_channels,
|
||||||
std::string wire_sample_type,
|
const std::string& wire_sample_type,
|
||||||
size_t item_size,
|
size_t item_size,
|
||||||
bool IQ_swap_);
|
bool IQ_swap_);
|
||||||
~gr_complex_ip_packet_source();
|
~gr_complex_ip_packet_source();
|
||||||
|
@ -179,9 +179,9 @@ bool cfg_ad9361_streaming_ch(struct iio_context *ctx, struct stream_cfg *cfg, en
|
|||||||
bool config_ad9361_rx_local(uint64_t bandwidth_,
|
bool config_ad9361_rx_local(uint64_t bandwidth_,
|
||||||
uint64_t sample_rate_,
|
uint64_t sample_rate_,
|
||||||
uint64_t freq_,
|
uint64_t freq_,
|
||||||
std::string rf_port_select_,
|
const std::string& rf_port_select_,
|
||||||
std::string gain_mode_rx1_,
|
const std::string& gain_mode_rx1_,
|
||||||
std::string gain_mode_rx2_,
|
const std::string& gain_mode_rx2_,
|
||||||
double rf_gain_rx1_,
|
double rf_gain_rx1_,
|
||||||
double rf_gain_rx2_)
|
double rf_gain_rx2_)
|
||||||
|
|
||||||
@ -291,13 +291,13 @@ bool config_ad9361_rx_local(uint64_t bandwidth_,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool config_ad9361_rx_remote(std::string remote_host,
|
bool config_ad9361_rx_remote(const std::string& remote_host,
|
||||||
uint64_t bandwidth_,
|
uint64_t bandwidth_,
|
||||||
uint64_t sample_rate_,
|
uint64_t sample_rate_,
|
||||||
uint64_t freq_,
|
uint64_t freq_,
|
||||||
std::string rf_port_select_,
|
const std::string& rf_port_select_,
|
||||||
std::string gain_mode_rx1_,
|
const std::string& gain_mode_rx1_,
|
||||||
std::string gain_mode_rx2_,
|
const std::string& gain_mode_rx2_,
|
||||||
double rf_gain_rx1_,
|
double rf_gain_rx1_,
|
||||||
double rf_gain_rx2_)
|
double rf_gain_rx2_)
|
||||||
{
|
{
|
||||||
@ -543,7 +543,7 @@ bool config_ad9361_lo_local(uint64_t bandwidth_,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool config_ad9361_lo_remote(std::string remote_host,
|
bool config_ad9361_lo_remote(const std::string& remote_host,
|
||||||
uint64_t bandwidth_,
|
uint64_t bandwidth_,
|
||||||
uint64_t sample_rate_,
|
uint64_t sample_rate_,
|
||||||
uint64_t freq_rf_tx_hz_,
|
uint64_t freq_rf_tx_hz_,
|
||||||
@ -680,7 +680,7 @@ bool config_ad9361_lo_remote(std::string remote_host,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool ad9361_disable_lo_remote(std::string remote_host)
|
bool ad9361_disable_lo_remote(const std::string& remote_host)
|
||||||
{
|
{
|
||||||
std::cout << "AD9361 Acquiring IIO REMOTE context in host " << remote_host << std::endl;
|
std::cout << "AD9361 Acquiring IIO REMOTE context in host " << remote_host << std::endl;
|
||||||
struct iio_context *ctx;
|
struct iio_context *ctx;
|
||||||
|
@ -92,19 +92,19 @@ bool cfg_ad9361_streaming_ch(struct iio_context *ctx, struct stream_cfg *cfg, en
|
|||||||
bool config_ad9361_rx_local(uint64_t bandwidth_,
|
bool config_ad9361_rx_local(uint64_t bandwidth_,
|
||||||
uint64_t sample_rate_,
|
uint64_t sample_rate_,
|
||||||
uint64_t freq_,
|
uint64_t freq_,
|
||||||
std::string rf_port_select_,
|
const std::string& rf_port_select_,
|
||||||
std::string gain_mode_rx1_,
|
const std::string& gain_mode_rx1_,
|
||||||
std::string gain_mode_rx2_,
|
const std::string& gain_mode_rx2_,
|
||||||
double rf_gain_rx1_,
|
double rf_gain_rx1_,
|
||||||
double rf_gain_rx2_);
|
double rf_gain_rx2_);
|
||||||
|
|
||||||
bool config_ad9361_rx_remote(std::string remote_host,
|
bool config_ad9361_rx_remote(const std::string& remote_host,
|
||||||
uint64_t bandwidth_,
|
uint64_t bandwidth_,
|
||||||
uint64_t sample_rate_,
|
uint64_t sample_rate_,
|
||||||
uint64_t freq_,
|
uint64_t freq_,
|
||||||
std::string rf_port_select_,
|
const std::string& rf_port_select_,
|
||||||
std::string gain_mode_rx1_,
|
const std::string& gain_mode_rx1_,
|
||||||
std::string gain_mode_rx2_,
|
const std::string& gain_mode_rx2_,
|
||||||
double rf_gain_rx1_,
|
double rf_gain_rx1_,
|
||||||
double rf_gain_rx2_);
|
double rf_gain_rx2_);
|
||||||
|
|
||||||
@ -115,7 +115,7 @@ bool config_ad9361_lo_local(uint64_t bandwidth_,
|
|||||||
int64_t freq_dds_tx_hz_,
|
int64_t freq_dds_tx_hz_,
|
||||||
double scale_dds_dbfs_);
|
double scale_dds_dbfs_);
|
||||||
|
|
||||||
bool config_ad9361_lo_remote(std::string remote_host,
|
bool config_ad9361_lo_remote(const std::string& remote_host,
|
||||||
uint64_t bandwidth_,
|
uint64_t bandwidth_,
|
||||||
uint64_t sample_rate_,
|
uint64_t sample_rate_,
|
||||||
uint64_t freq_rf_tx_hz_,
|
uint64_t freq_rf_tx_hz_,
|
||||||
@ -124,7 +124,7 @@ bool config_ad9361_lo_remote(std::string remote_host,
|
|||||||
double scale_dds_dbfs_);
|
double scale_dds_dbfs_);
|
||||||
|
|
||||||
|
|
||||||
bool ad9361_disable_lo_remote(std::string remote_host);
|
bool ad9361_disable_lo_remote(const std::string& remote_host);
|
||||||
|
|
||||||
bool ad9361_disable_lo_local();
|
bool ad9361_disable_lo_local();
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
const size_t PAGE_SIZE = 0x10000;
|
const size_t PAGE_SIZE = 0x10000;
|
||||||
const unsigned int TEST_REGISTER_TRACK_WRITEVAL = 0x55AA;
|
const unsigned int TEST_REGISTER_TRACK_WRITEVAL = 0x55AA;
|
||||||
|
|
||||||
fpga_switch::fpga_switch(std::string device_name)
|
fpga_switch::fpga_switch(const std::string& device_name)
|
||||||
{
|
{
|
||||||
if ((d_device_descriptor = open(device_name.c_str(), O_RDWR | O_SYNC)) == -1)
|
if ((d_device_descriptor = open(device_name.c_str(), O_RDWR | O_SYNC)) == -1)
|
||||||
{
|
{
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
class fpga_switch
|
class fpga_switch
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
fpga_switch(std::string device_name);
|
fpga_switch(const std::string& device_name);
|
||||||
~fpga_switch();
|
~fpga_switch();
|
||||||
void set_switch_position(int switch_position);
|
void set_switch_position(int switch_position);
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ void GalileoE1DllPllVemlTrackingFpga::stop_tracking()
|
|||||||
}
|
}
|
||||||
|
|
||||||
GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
|
GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
|
||||||
ConfigurationInterface* configuration, std::string role,
|
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)
|
||||||
{
|
{
|
||||||
//dllpllconf_t trk_param;
|
//dllpllconf_t trk_param;
|
||||||
|
@ -52,7 +52,7 @@ class GalileoE1DllPllVemlTrackingFpga : public TrackingInterface
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
GalileoE1DllPllVemlTrackingFpga(ConfigurationInterface* configuration,
|
GalileoE1DllPllVemlTrackingFpga(ConfigurationInterface* configuration,
|
||||||
std::string role,
|
const std::string& role,
|
||||||
unsigned int in_streams,
|
unsigned int in_streams,
|
||||||
unsigned int out_streams);
|
unsigned int out_streams);
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ void GalileoE5aDllPllTrackingFpga::stop_tracking()
|
|||||||
}
|
}
|
||||||
|
|
||||||
GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
|
GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
|
||||||
ConfigurationInterface *configuration, std::string role,
|
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)
|
||||||
{
|
{
|
||||||
//printf("creating the E5A tracking");
|
//printf("creating the E5A tracking");
|
||||||
|
@ -52,7 +52,7 @@ class GalileoE5aDllPllTrackingFpga : public TrackingInterface
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
GalileoE5aDllPllTrackingFpga(ConfigurationInterface* configuration,
|
GalileoE5aDllPllTrackingFpga(ConfigurationInterface* configuration,
|
||||||
std::string role,
|
const std::string& role,
|
||||||
unsigned int in_streams,
|
unsigned int in_streams,
|
||||||
unsigned int out_streams);
|
unsigned int out_streams);
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ void GpsL1CaDllPllTrackingFpga::stop_tracking()
|
|||||||
}
|
}
|
||||||
|
|
||||||
GpsL1CaDllPllTrackingFpga::GpsL1CaDllPllTrackingFpga(
|
GpsL1CaDllPllTrackingFpga::GpsL1CaDllPllTrackingFpga(
|
||||||
ConfigurationInterface* configuration, std::string role,
|
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)
|
||||||
{
|
{
|
||||||
Dll_Pll_Conf_Fpga trk_param_fpga = Dll_Pll_Conf_Fpga();
|
Dll_Pll_Conf_Fpga trk_param_fpga = Dll_Pll_Conf_Fpga();
|
||||||
|
@ -53,7 +53,7 @@ class GpsL1CaDllPllTrackingFpga : public TrackingInterface
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
GpsL1CaDllPllTrackingFpga(ConfigurationInterface* configuration,
|
GpsL1CaDllPllTrackingFpga(ConfigurationInterface* configuration,
|
||||||
std::string role,
|
const std::string& role,
|
||||||
unsigned int in_streams,
|
unsigned int in_streams,
|
||||||
unsigned int out_streams);
|
unsigned int out_streams);
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ void GpsL2MDllPllTrackingFpga::stop_tracking()
|
|||||||
}
|
}
|
||||||
|
|
||||||
GpsL2MDllPllTrackingFpga::GpsL2MDllPllTrackingFpga(
|
GpsL2MDllPllTrackingFpga::GpsL2MDllPllTrackingFpga(
|
||||||
ConfigurationInterface* configuration, std::string role,
|
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)
|
||||||
{
|
{
|
||||||
//dllpllconf_t trk_param;
|
//dllpllconf_t trk_param;
|
||||||
|
@ -52,7 +52,7 @@ class GpsL2MDllPllTrackingFpga : public TrackingInterface
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
GpsL2MDllPllTrackingFpga(ConfigurationInterface* configuration,
|
GpsL2MDllPllTrackingFpga(ConfigurationInterface* configuration,
|
||||||
std::string role,
|
const std::string& role,
|
||||||
unsigned int in_streams,
|
unsigned int in_streams,
|
||||||
unsigned int out_streams);
|
unsigned int out_streams);
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ void GpsL5DllPllTrackingFpga::stop_tracking()
|
|||||||
}
|
}
|
||||||
|
|
||||||
GpsL5DllPllTrackingFpga::GpsL5DllPllTrackingFpga(
|
GpsL5DllPllTrackingFpga::GpsL5DllPllTrackingFpga(
|
||||||
ConfigurationInterface *configuration, std::string role,
|
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)
|
||||||
{
|
{
|
||||||
//printf("L5 TRK CLASS CREATED\n");
|
//printf("L5 TRK CLASS CREATED\n");
|
||||||
|
@ -50,7 +50,7 @@ class GpsL5DllPllTrackingFpga : public TrackingInterface
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
GpsL5DllPllTrackingFpga(ConfigurationInterface* configuration,
|
GpsL5DllPllTrackingFpga(ConfigurationInterface* configuration,
|
||||||
std::string role,
|
const std::string& role,
|
||||||
unsigned int in_streams,
|
unsigned int in_streams,
|
||||||
unsigned int out_streams);
|
unsigned int out_streams);
|
||||||
|
|
||||||
|
@ -62,6 +62,7 @@
|
|||||||
|
|
||||||
// string manipulation
|
// string manipulation
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
// constants
|
// constants
|
||||||
#include "GPS_L1_CA.h"
|
#include "GPS_L1_CA.h"
|
||||||
@ -160,7 +161,7 @@ fpga_multicorrelator_8sc::fpga_multicorrelator_8sc(int32_t n_correlators,
|
|||||||
{
|
{
|
||||||
//printf("tracking fpga class created\n");
|
//printf("tracking fpga class created\n");
|
||||||
d_n_correlators = n_correlators;
|
d_n_correlators = n_correlators;
|
||||||
d_device_name = device_name;
|
d_device_name = std::move(device_name);
|
||||||
d_device_base = device_base;
|
d_device_base = device_base;
|
||||||
d_track_pilot = track_pilot;
|
d_track_pilot = track_pilot;
|
||||||
d_device_descriptor = 0;
|
d_device_descriptor = 0;
|
||||||
|
@ -32,8 +32,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "gnss_sdr_supl_client.h"
|
#include "gnss_sdr_supl_client.h"
|
||||||
#include <cmath>
|
|
||||||
#include <pugixml.hpp>
|
#include <pugixml.hpp>
|
||||||
|
#include <cmath>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
gnss_sdr_supl_client::gnss_sdr_supl_client()
|
gnss_sdr_supl_client::gnss_sdr_supl_client()
|
||||||
|
@ -67,6 +67,7 @@
|
|||||||
#include <sys/ipc.h>
|
#include <sys/ipc.h>
|
||||||
#include <sys/msg.h>
|
#include <sys/msg.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
|
|
||||||
extern concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
|
extern concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
|
||||||
@ -294,14 +295,14 @@ int ControlThread::run()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ControlThread::set_control_queue(gr::msg_queue::sptr control_queue)
|
void ControlThread::set_control_queue(const gr::msg_queue::sptr& control_queue)
|
||||||
{
|
{
|
||||||
if (flowgraph_->running())
|
if (flowgraph_->running())
|
||||||
{
|
{
|
||||||
LOG(WARNING) << "Unable to set control queue while flowgraph is running";
|
LOG(WARNING) << "Unable to set control queue while flowgraph is running";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
control_queue_ = control_queue;
|
control_queue_ = std::move(control_queue);
|
||||||
cmd_interface_.set_msg_queue(control_queue_);
|
cmd_interface_.set_msg_queue(control_queue_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ public:
|
|||||||
*
|
*
|
||||||
* \param[in] boost::shared_ptr<gr::msg_queue> control_queue
|
* \param[in] boost::shared_ptr<gr::msg_queue> control_queue
|
||||||
*/
|
*/
|
||||||
void set_control_queue(gr::msg_queue::sptr control_queue);
|
void set_control_queue(const gr::msg_queue::sptr& control_queue);
|
||||||
|
|
||||||
|
|
||||||
unsigned int processed_control_messages()
|
unsigned int processed_control_messages()
|
||||||
|
@ -50,6 +50,7 @@
|
|||||||
#include <exception>
|
#include <exception>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <set>
|
#include <set>
|
||||||
|
#include <utility>
|
||||||
#ifdef GR_GREATER_38
|
#ifdef GR_GREATER_38
|
||||||
#include <gnuradio/filter/fir_filter_blk.h>
|
#include <gnuradio/filter/fir_filter_blk.h>
|
||||||
#else
|
#else
|
||||||
@ -61,12 +62,12 @@
|
|||||||
|
|
||||||
using google::LogMessage;
|
using google::LogMessage;
|
||||||
|
|
||||||
GNSSFlowgraph::GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configuration, gr::msg_queue::sptr queue)
|
GNSSFlowgraph::GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configuration, const gr::msg_queue::sptr& queue)
|
||||||
{
|
{
|
||||||
connected_ = false;
|
connected_ = false;
|
||||||
running_ = false;
|
running_ = false;
|
||||||
configuration_ = configuration;
|
configuration_ = configuration;
|
||||||
queue_ = queue;
|
queue_ = std::move(queue);
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,7 +73,7 @@ public:
|
|||||||
/*!
|
/*!
|
||||||
* \brief Constructor that initializes the receiver flow graph
|
* \brief Constructor that initializes the receiver flow graph
|
||||||
*/
|
*/
|
||||||
GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configuration, gr::msg_queue::sptr queue);
|
GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configuration, const gr::msg_queue::sptr& queue);
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Destructor
|
* \brief Destructor
|
||||||
|
@ -837,7 +837,7 @@ void PositionSystemTest::print_results(const arma::mat& R_eb_enu)
|
|||||||
{
|
{
|
||||||
boost::filesystem::path p(gnuplot_executable);
|
boost::filesystem::path p(gnuplot_executable);
|
||||||
boost::filesystem::path dir = p.parent_path();
|
boost::filesystem::path dir = p.parent_path();
|
||||||
std::string gnuplot_path = dir.native();
|
const std::string& gnuplot_path = dir.native();
|
||||||
Gnuplot::set_GNUPlotPath(gnuplot_path);
|
Gnuplot::set_GNUPlotPath(gnuplot_path);
|
||||||
|
|
||||||
Gnuplot g1("points");
|
Gnuplot g1("points");
|
||||||
|
@ -70,15 +70,15 @@
|
|||||||
#include <gnuradio/blocks/null_sink.h>
|
#include <gnuradio/blocks/null_sink.h>
|
||||||
#include <gnuradio/filter/firdes.h>
|
#include <gnuradio/filter/firdes.h>
|
||||||
#include <gnuradio/top_block.h>
|
#include <gnuradio/top_block.h>
|
||||||
#include <gtest/gtest.h>
|
|
||||||
#include <matio.h>
|
|
||||||
#include <chrono>
|
|
||||||
#include <exception>
|
|
||||||
#include <gpstk/Rinex3ObsBase.hpp>
|
#include <gpstk/Rinex3ObsBase.hpp>
|
||||||
#include <gpstk/Rinex3ObsData.hpp>
|
#include <gpstk/Rinex3ObsData.hpp>
|
||||||
#include <gpstk/Rinex3ObsHeader.hpp>
|
#include <gpstk/Rinex3ObsHeader.hpp>
|
||||||
#include <gpstk/Rinex3ObsStream.hpp>
|
#include <gpstk/Rinex3ObsStream.hpp>
|
||||||
#include <gpstk/RinexUtilities.hpp>
|
#include <gpstk/RinexUtilities.hpp>
|
||||||
|
#include <gtest/gtest.h>
|
||||||
|
#include <matio.h>
|
||||||
|
#include <chrono>
|
||||||
|
#include <exception>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#ifdef GR_GREATER_38
|
#ifdef GR_GREATER_38
|
||||||
#include <gnuradio/filter/fir_filter_blk.h>
|
#include <gnuradio/filter/fir_filter_blk.h>
|
||||||
|
@ -58,6 +58,7 @@
|
|||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include <utility>
|
||||||
#ifdef GR_GREATER_38
|
#ifdef GR_GREATER_38
|
||||||
#include <gnuradio/analog/sig_source.h>
|
#include <gnuradio/analog/sig_source.h>
|
||||||
#else
|
#else
|
||||||
@ -69,7 +70,7 @@
|
|||||||
#define FIVE_SECONDS 5000000 // five seconds in microseconds
|
#define FIVE_SECONDS 5000000 // five seconds in microseconds
|
||||||
|
|
||||||
void send_tracking_gps_input_samples(FILE *rx_signal_file,
|
void send_tracking_gps_input_samples(FILE *rx_signal_file,
|
||||||
int num_remaining_samples, gr::top_block_sptr top_block)
|
int num_remaining_samples, const gr::top_block_sptr& top_block)
|
||||||
{
|
{
|
||||||
int num_samples_transferred = 0; // number of samples that have been transferred to the DMA so far
|
int num_samples_transferred = 0; // number of samples that have been transferred to the DMA so far
|
||||||
static int flowgraph_stopped = 0; // flag to indicate if the flowgraph is stopped already
|
static int flowgraph_stopped = 0; // flag to indicate if the flowgraph is stopped already
|
||||||
@ -142,7 +143,7 @@ void sending_thread(gr::top_block_sptr top_block, const char *file_name)
|
|||||||
usleep(FIVE_SECONDS); // wait for some time to give time to the other thread to program the device
|
usleep(FIVE_SECONDS); // wait for some time to give time to the other thread to program the device
|
||||||
|
|
||||||
//send_tracking_gps_input_samples(dma_descr, rx_signal_file, file_length);
|
//send_tracking_gps_input_samples(dma_descr, rx_signal_file, file_length);
|
||||||
send_tracking_gps_input_samples(rx_signal_file, file_length, top_block);
|
send_tracking_gps_input_samples(rx_signal_file, file_length, std::move(top_block));
|
||||||
|
|
||||||
fclose(rx_signal_file);
|
fclose(rx_signal_file);
|
||||||
}
|
}
|
||||||
@ -180,7 +181,7 @@ void GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_events(pmt::pmt_t msg)
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
int64_t message = pmt::to_long(msg);
|
int64_t message = pmt::to_long(std::move(msg));
|
||||||
rx_message = message;
|
rx_message = message;
|
||||||
}
|
}
|
||||||
catch (boost::bad_any_cast &e)
|
catch (boost::bad_any_cast &e)
|
||||||
@ -204,8 +205,7 @@ GpsL1CADllPllTrackingTestFpga_msg_rx::GpsL1CADllPllTrackingTestFpga_msg_rx() : g
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
GpsL1CADllPllTrackingTestFpga_msg_rx::~GpsL1CADllPllTrackingTestFpga_msg_rx()
|
GpsL1CADllPllTrackingTestFpga_msg_rx::~GpsL1CADllPllTrackingTestFpga_msg_rx() = default;
|
||||||
= default;
|
|
||||||
|
|
||||||
|
|
||||||
// ###########################################################
|
// ###########################################################
|
||||||
@ -242,8 +242,7 @@ public:
|
|||||||
gnss_synchro = Gnss_Synchro();
|
gnss_synchro = Gnss_Synchro();
|
||||||
}
|
}
|
||||||
|
|
||||||
~GpsL1CADllPllTrackingTestFpga()
|
~GpsL1CADllPllTrackingTestFpga() = default;
|
||||||
= default;
|
|
||||||
|
|
||||||
void configure_receiver();
|
void configure_receiver();
|
||||||
|
|
||||||
|
@ -42,10 +42,10 @@
|
|||||||
#include <boost/iostreams/filtering_streambuf.hpp>
|
#include <boost/iostreams/filtering_streambuf.hpp>
|
||||||
#include <boost/serialization/map.hpp>
|
#include <boost/serialization/map.hpp>
|
||||||
#include <gflags/gflags.h>
|
#include <gflags/gflags.h>
|
||||||
#include <cstdlib>
|
|
||||||
#include <gpstk/Rinex3NavData.hpp>
|
#include <gpstk/Rinex3NavData.hpp>
|
||||||
#include <gpstk/Rinex3NavHeader.hpp>
|
#include <gpstk/Rinex3NavHeader.hpp>
|
||||||
#include <gpstk/Rinex3NavStream.hpp>
|
#include <gpstk/Rinex3NavStream.hpp>
|
||||||
|
#include <cstdlib>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user