mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-09-10 06:19:48 +00:00
Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next
This commit is contained in:
commit
5f8107458d
@ -407,7 +407,7 @@ set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
|
|||||||
set(GNSSSDR_GPSTK_LOCAL_VERSION "2.12")
|
set(GNSSSDR_GPSTK_LOCAL_VERSION "2.12")
|
||||||
set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.17")
|
set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.17")
|
||||||
set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.10")
|
set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.10")
|
||||||
set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.9.2")
|
set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.10.0")
|
||||||
|
|
||||||
if(CMAKE_VERSION VERSION_LESS "3.0.2") # Fix for CentOS 7
|
if(CMAKE_VERSION VERSION_LESS "3.0.2") # Fix for CentOS 7
|
||||||
set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.1")
|
set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.1")
|
||||||
|
@ -305,9 +305,9 @@ $ sudo apt-get install autoconf automake libtool curl make g++ unzip
|
|||||||
and then:
|
and then:
|
||||||
|
|
||||||
~~~~~~
|
~~~~~~
|
||||||
$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.9.2/protobuf-cpp-3.9.2.tar.gz
|
$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.10.0/protobuf-cpp-3.10.0.tar.gz
|
||||||
$ tar xvfz protobuf-cpp-3.9.2.tar.gz
|
$ tar xvfz protobuf-cpp-3.10.0.tar.gz
|
||||||
$ cd protobuf-3.9.2
|
$ cd protobuf-3.10.0
|
||||||
$ ./autogen.sh
|
$ ./autogen.sh
|
||||||
$ ./configure
|
$ ./configure
|
||||||
$ make
|
$ make
|
||||||
|
@ -74,8 +74,6 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
|
|||||||
doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
|
doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
|
||||||
if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
|
if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
|
||||||
acq_parameters.doppler_max = doppler_max_;
|
acq_parameters.doppler_max = doppler_max_;
|
||||||
uint32_t sampled_ms = configuration_->property(role + ".coherent_integration_time_ms", 4);
|
|
||||||
acq_parameters.sampled_ms = sampled_ms;
|
|
||||||
|
|
||||||
acquire_pilot_ = configuration_->property(role + ".acquire_pilot", false); // could be true in future versions
|
acquire_pilot_ = configuration_->property(role + ".acquire_pilot", false); // could be true in future versions
|
||||||
|
|
||||||
@ -92,7 +90,6 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
|
|||||||
std::string default_device_name = "/dev/uio0";
|
std::string default_device_name = "/dev/uio0";
|
||||||
std::string device_name = configuration_->property(role + ".devicename", default_device_name);
|
std::string device_name = configuration_->property(role + ".devicename", default_device_name);
|
||||||
acq_parameters.device_name = device_name;
|
acq_parameters.device_name = device_name;
|
||||||
acq_parameters.samples_per_ms = nsamples_total / sampled_ms;
|
|
||||||
acq_parameters.samples_per_code = nsamples_total;
|
acq_parameters.samples_per_code = nsamples_total;
|
||||||
acq_parameters.excludelimit = static_cast<unsigned int>(1 + ceil((1.0 / GALILEO_E1_CODE_CHIP_RATE_CPS) * static_cast<float>(fs_in)));
|
acq_parameters.excludelimit = static_cast<unsigned int>(1 + ceil((1.0 / GALILEO_E1_CODE_CHIP_RATE_CPS) * static_cast<float>(fs_in)));
|
||||||
|
|
||||||
|
@ -72,9 +72,6 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf
|
|||||||
if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
|
if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
|
||||||
acq_parameters.doppler_max = doppler_max_;
|
acq_parameters.doppler_max = doppler_max_;
|
||||||
|
|
||||||
uint32_t sampled_ms = configuration_->property(role + ".coherent_integration_time_ms", 1);
|
|
||||||
acq_parameters.sampled_ms = sampled_ms;
|
|
||||||
|
|
||||||
acq_pilot_ = configuration_->property(role + ".acquire_pilot", false);
|
acq_pilot_ = configuration_->property(role + ".acquire_pilot", false);
|
||||||
acq_iq_ = configuration_->property(role + ".acquire_iq", false);
|
acq_iq_ = configuration_->property(role + ".acquire_iq", false);
|
||||||
if (acq_iq_)
|
if (acq_iq_)
|
||||||
@ -93,7 +90,6 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf
|
|||||||
std::string default_device_name = "/dev/uio0";
|
std::string default_device_name = "/dev/uio0";
|
||||||
std::string device_name = configuration_->property(role + ".devicename", default_device_name);
|
std::string device_name = configuration_->property(role + ".devicename", default_device_name);
|
||||||
acq_parameters.device_name = device_name;
|
acq_parameters.device_name = device_name;
|
||||||
acq_parameters.samples_per_ms = nsamples_total / sampled_ms;
|
|
||||||
acq_parameters.samples_per_code = nsamples_total;
|
acq_parameters.samples_per_code = nsamples_total;
|
||||||
|
|
||||||
acq_parameters.excludelimit = static_cast<unsigned int>(1 + ceil((1.0 / GALILEO_E5A_CODE_CHIP_RATE_CPS) * static_cast<float>(fs_in)));
|
acq_parameters.excludelimit = static_cast<unsigned int>(1 + ceil((1.0 / GALILEO_E5A_CODE_CHIP_RATE_CPS) * static_cast<float>(fs_in)));
|
||||||
|
@ -73,8 +73,6 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga(
|
|||||||
doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
|
doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
|
||||||
if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
|
if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
|
||||||
acq_parameters.doppler_max = doppler_max_;
|
acq_parameters.doppler_max = doppler_max_;
|
||||||
uint32_t sampled_ms = configuration_->property(role + ".coherent_integration_time_ms", 1);
|
|
||||||
acq_parameters.sampled_ms = sampled_ms;
|
|
||||||
auto code_length = static_cast<uint32_t>(std::round(static_cast<double>(fs_in) / (GPS_L1_CA_CODE_RATE_CPS / GPS_L1_CA_CODE_LENGTH_CHIPS)));
|
auto code_length = static_cast<uint32_t>(std::round(static_cast<double>(fs_in) / (GPS_L1_CA_CODE_RATE_CPS / GPS_L1_CA_CODE_LENGTH_CHIPS)));
|
||||||
acq_parameters.code_length = code_length;
|
acq_parameters.code_length = code_length;
|
||||||
// The FPGA can only use FFT lengths that are a power of two.
|
// The FPGA can only use FFT lengths that are a power of two.
|
||||||
@ -85,7 +83,6 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga(
|
|||||||
std::string default_device_name = "/dev/uio0";
|
std::string default_device_name = "/dev/uio0";
|
||||||
std::string device_name = configuration_->property(role + ".devicename", default_device_name);
|
std::string device_name = configuration_->property(role + ".devicename", default_device_name);
|
||||||
acq_parameters.device_name = device_name;
|
acq_parameters.device_name = device_name;
|
||||||
acq_parameters.samples_per_ms = nsamples_total / sampled_ms;
|
|
||||||
acq_parameters.samples_per_code = nsamples_total;
|
acq_parameters.samples_per_code = nsamples_total;
|
||||||
acq_parameters.excludelimit = static_cast<unsigned int>(1 + ceil(GPS_L1_CA_CHIP_PERIOD_S * static_cast<float>(fs_in)));
|
acq_parameters.excludelimit = static_cast<unsigned int>(1 + ceil(GPS_L1_CA_CHIP_PERIOD_S * static_cast<float>(fs_in)));
|
||||||
|
|
||||||
|
@ -71,7 +71,6 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga(
|
|||||||
if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
|
if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
|
||||||
acq_parameters.doppler_max = doppler_max_;
|
acq_parameters.doppler_max = doppler_max_;
|
||||||
|
|
||||||
acq_parameters.sampled_ms = 20;
|
|
||||||
unsigned int code_length = std::round(static_cast<double>(fs_in_) / (GPS_L2_M_CODE_RATE_CPS / static_cast<double>(GPS_L2_M_CODE_LENGTH_CHIPS)));
|
unsigned int code_length = std::round(static_cast<double>(fs_in_) / (GPS_L2_M_CODE_RATE_CPS / static_cast<double>(GPS_L2_M_CODE_LENGTH_CHIPS)));
|
||||||
acq_parameters.code_length = code_length;
|
acq_parameters.code_length = code_length;
|
||||||
// The FPGA can only use FFT lengths that are a power of two.
|
// The FPGA can only use FFT lengths that are a power of two.
|
||||||
@ -82,7 +81,6 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga(
|
|||||||
std::string default_device_name = "/dev/uio0";
|
std::string default_device_name = "/dev/uio0";
|
||||||
std::string device_name = configuration_->property(role + ".devicename", default_device_name);
|
std::string device_name = configuration_->property(role + ".devicename", default_device_name);
|
||||||
acq_parameters.device_name = device_name;
|
acq_parameters.device_name = device_name;
|
||||||
acq_parameters.samples_per_ms = nsamples_total / acq_parameters.sampled_ms;
|
|
||||||
acq_parameters.samples_per_code = nsamples_total;
|
acq_parameters.samples_per_code = nsamples_total;
|
||||||
|
|
||||||
acq_parameters.downsampling_factor = configuration_->property(role + ".downsampling_factor", 1.0);
|
acq_parameters.downsampling_factor = configuration_->property(role + ".downsampling_factor", 1.0);
|
||||||
|
@ -75,8 +75,6 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga(
|
|||||||
doppler_max_ = configuration->property(role + ".doppler_max", 5000);
|
doppler_max_ = configuration->property(role + ".doppler_max", 5000);
|
||||||
if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
|
if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
|
||||||
acq_parameters.doppler_max = doppler_max_;
|
acq_parameters.doppler_max = doppler_max_;
|
||||||
uint32_t sampled_ms = configuration_->property(role + ".coherent_integration_time_ms", 1);
|
|
||||||
acq_parameters.sampled_ms = sampled_ms;
|
|
||||||
|
|
||||||
// -- Find number of samples per spreading code -------------------------
|
// -- Find number of samples per spreading code -------------------------
|
||||||
auto code_length = static_cast<uint32_t>(std::round(static_cast<double>(fs_in) / (GPS_L5I_CODE_RATE_CPS / static_cast<double>(GPS_L5I_CODE_LENGTH_CHIPS))));
|
auto code_length = static_cast<uint32_t>(std::round(static_cast<double>(fs_in) / (GPS_L5I_CODE_RATE_CPS / static_cast<double>(GPS_L5I_CODE_LENGTH_CHIPS))));
|
||||||
@ -89,7 +87,6 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga(
|
|||||||
std::string default_device_name = "/dev/uio0";
|
std::string default_device_name = "/dev/uio0";
|
||||||
std::string device_name = configuration_->property(role + ".devicename", default_device_name);
|
std::string device_name = configuration_->property(role + ".devicename", default_device_name);
|
||||||
acq_parameters.device_name = device_name;
|
acq_parameters.device_name = device_name;
|
||||||
acq_parameters.samples_per_ms = nsamples_total / sampled_ms;
|
|
||||||
acq_parameters.samples_per_code = nsamples_total;
|
acq_parameters.samples_per_code = nsamples_total;
|
||||||
|
|
||||||
acq_parameters.excludelimit = static_cast<unsigned int>(1 + ceil((1.0 / GPS_L5I_CODE_RATE_CPS) * static_cast<float>(fs_in)));
|
acq_parameters.excludelimit = static_cast<unsigned int>(1 + ceil((1.0 / GPS_L5I_CODE_RATE_CPS) * static_cast<float>(fs_in)));
|
||||||
|
@ -79,7 +79,7 @@ pcps_acquisition_fpga::pcps_acquisition_fpga(pcpsconf_fpga_t conf_)
|
|||||||
d_max_num_acqs = acq_parameters.max_num_acqs;
|
d_max_num_acqs = acq_parameters.max_num_acqs;
|
||||||
|
|
||||||
acquisition_fpga = std::make_shared<Fpga_Acquisition>(acq_parameters.device_name, acq_parameters.code_length, acq_parameters.doppler_max, d_fft_size,
|
acquisition_fpga = std::make_shared<Fpga_Acquisition>(acq_parameters.device_name, acq_parameters.code_length, acq_parameters.doppler_max, d_fft_size,
|
||||||
acq_parameters.fs_in, acq_parameters.sampled_ms, acq_parameters.select_queue_Fpga, acq_parameters.all_fft_codes, acq_parameters.excludelimit);
|
acq_parameters.fs_in, acq_parameters.select_queue_Fpga, acq_parameters.all_fft_codes, acq_parameters.excludelimit);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -54,16 +54,13 @@ class Gnss_Synchro;
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
/* pcps acquisition configuration */
|
/* pcps acquisition configuration */
|
||||||
uint32_t sampled_ms;
|
|
||||||
uint32_t doppler_max;
|
uint32_t doppler_max;
|
||||||
int64_t fs_in;
|
int64_t fs_in;
|
||||||
int32_t samples_per_ms;
|
|
||||||
int32_t samples_per_code;
|
int32_t samples_per_code;
|
||||||
int32_t code_length;
|
int32_t code_length;
|
||||||
uint32_t select_queue_Fpga;
|
uint32_t select_queue_Fpga;
|
||||||
std::string device_name;
|
std::string device_name;
|
||||||
uint32_t* all_fft_codes; // pointer to memory that contains all the code ffts
|
uint32_t* all_fft_codes; // pointer to memory that contains all the code ffts
|
||||||
// float downsampling_factor;
|
|
||||||
uint32_t downsampling_factor;
|
uint32_t downsampling_factor;
|
||||||
uint32_t total_block_exp;
|
uint32_t total_block_exp;
|
||||||
uint32_t excludelimit;
|
uint32_t excludelimit;
|
||||||
|
@ -63,7 +63,6 @@ Fpga_Acquisition::Fpga_Acquisition(std::string device_name,
|
|||||||
uint32_t doppler_max,
|
uint32_t doppler_max,
|
||||||
uint32_t nsamples_total,
|
uint32_t nsamples_total,
|
||||||
int64_t fs_in,
|
int64_t fs_in,
|
||||||
uint32_t sampled_ms __attribute__((unused)),
|
|
||||||
uint32_t select_queue,
|
uint32_t select_queue,
|
||||||
uint32_t *all_fft_codes,
|
uint32_t *all_fft_codes,
|
||||||
uint32_t excludelimit)
|
uint32_t excludelimit)
|
||||||
|
@ -54,7 +54,6 @@ public:
|
|||||||
uint32_t doppler_max,
|
uint32_t doppler_max,
|
||||||
uint32_t nsamples_total,
|
uint32_t nsamples_total,
|
||||||
int64_t fs_in,
|
int64_t fs_in,
|
||||||
uint32_t sampled_ms,
|
|
||||||
uint32_t select_queue,
|
uint32_t select_queue,
|
||||||
uint32_t *all_fft_codes,
|
uint32_t *all_fft_codes,
|
||||||
uint32_t excludelimit);
|
uint32_t excludelimit);
|
||||||
|
@ -38,15 +38,245 @@
|
|||||||
#include <glog/logging.h>
|
#include <glog/logging.h>
|
||||||
#include <iio.h>
|
#include <iio.h>
|
||||||
#include <exception>
|
#include <exception>
|
||||||
|
#include <fcntl.h> // for open, O_WRONLY
|
||||||
|
#include <fstream> // for std::ifstream
|
||||||
#include <iostream> // for cout, endl
|
#include <iostream> // for cout, endl
|
||||||
|
#include <string> // for string manipulation
|
||||||
|
#include <unistd.h> // for write
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
|
||||||
|
void run_DMA_process(const std::string &FreqBand, const std::string &Filename1, const std::string &Filename2, const bool &enable_DMA)
|
||||||
|
{
|
||||||
|
const int MAX_INPUT_SAMPLES_TOTAL = 8192;
|
||||||
|
int max_value = 0;
|
||||||
|
int tx_fd; // DMA descriptor
|
||||||
|
std::ifstream infile1;
|
||||||
|
infile1.exceptions(std::ifstream::failbit | std::ifstream::badbit);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
infile1.open(Filename1, std::ios::binary);
|
||||||
|
}
|
||||||
|
catch (const std::ifstream::failure &e)
|
||||||
|
{
|
||||||
|
std::cerr << "Exception opening file " << Filename1 << std::endl;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::ifstream infile2;
|
||||||
|
infile2.exceptions(std::ifstream::failbit | std::ifstream::badbit);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
infile2.open(Filename2, std::ios::binary);
|
||||||
|
}
|
||||||
|
catch (const std::ifstream::failure &e)
|
||||||
|
{
|
||||||
|
// could not exist
|
||||||
|
}
|
||||||
|
|
||||||
|
// rx signal
|
||||||
|
std::vector<int8_t> input_samples(MAX_INPUT_SAMPLES_TOTAL * 2);
|
||||||
|
std::vector<int8_t> input_samples2(MAX_INPUT_SAMPLES_TOTAL * 2);
|
||||||
|
std::vector<int8_t> input_samples_dma(MAX_INPUT_SAMPLES_TOTAL * 2 * 2);
|
||||||
|
|
||||||
|
int nread_elements;
|
||||||
|
int nread_elements2;
|
||||||
|
int file_completed = 0;
|
||||||
|
int num_transferred_bytes;
|
||||||
|
|
||||||
|
//**************************************************************************
|
||||||
|
// Open DMA device
|
||||||
|
//**************************************************************************
|
||||||
|
tx_fd = open("/dev/loop_tx", O_WRONLY);
|
||||||
|
if (tx_fd < 0)
|
||||||
|
{
|
||||||
|
std::cout << "Cannot open loop device" << std::endl;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
//**************************************************************************
|
||||||
|
// Open input file
|
||||||
|
//**************************************************************************
|
||||||
|
int nsamples = 0;
|
||||||
|
|
||||||
|
while ((file_completed == 0) && (enable_DMA == true))
|
||||||
|
{
|
||||||
|
unsigned int dma_index = 0;
|
||||||
|
|
||||||
|
if (FreqBand == "L1")
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
infile1.read(reinterpret_cast<char *>(input_samples.data()), MAX_INPUT_SAMPLES_TOTAL * 2);
|
||||||
|
}
|
||||||
|
catch (const std::ifstream::failure &e)
|
||||||
|
{
|
||||||
|
std::cerr << "Exception reading file " << Filename1 << std::endl;
|
||||||
|
}
|
||||||
|
if (infile1)
|
||||||
|
{
|
||||||
|
nread_elements = MAX_INPUT_SAMPLES_TOTAL * 2;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
nread_elements = 0;
|
||||||
|
}
|
||||||
|
nsamples += (nread_elements / 2);
|
||||||
|
|
||||||
|
for (int index0 = 0; index0 < (nread_elements); index0 += 2)
|
||||||
|
{
|
||||||
|
// channel 1 (queue 1)
|
||||||
|
input_samples_dma[dma_index] = 0;
|
||||||
|
input_samples_dma[dma_index + 1] = 0;
|
||||||
|
// channel 0 (queue 0)
|
||||||
|
input_samples_dma[dma_index + 2] = input_samples[index0];
|
||||||
|
input_samples_dma[dma_index + 3] = input_samples[index0 + 1];
|
||||||
|
|
||||||
|
dma_index += 4;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (FreqBand == "L2")
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
infile1.read(reinterpret_cast<char *>(input_samples.data()), MAX_INPUT_SAMPLES_TOTAL * 2);
|
||||||
|
}
|
||||||
|
catch (const std::ifstream::failure &e)
|
||||||
|
{
|
||||||
|
std::cerr << "Exception reading file " << Filename1 << std::endl;
|
||||||
|
}
|
||||||
|
if (infile1)
|
||||||
|
{
|
||||||
|
nread_elements = MAX_INPUT_SAMPLES_TOTAL * 2;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
nread_elements = 0;
|
||||||
|
}
|
||||||
|
nsamples += (nread_elements / 2);
|
||||||
|
|
||||||
|
for (int index0 = 0; index0 < (nread_elements); index0 += 2)
|
||||||
|
{
|
||||||
|
// channel 1 (queue 1)
|
||||||
|
input_samples_dma[dma_index] = input_samples[index0];
|
||||||
|
input_samples_dma[dma_index + 1] = input_samples[index0 + 1];
|
||||||
|
// channel 0 (queue 0)
|
||||||
|
input_samples_dma[dma_index + 2] = 0;
|
||||||
|
input_samples_dma[dma_index + 3] = 0;
|
||||||
|
|
||||||
|
dma_index += 4;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (FreqBand == "L1L2")
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
infile1.read(reinterpret_cast<char *>(input_samples.data()), MAX_INPUT_SAMPLES_TOTAL * 2);
|
||||||
|
}
|
||||||
|
catch (const std::ifstream::failure &e)
|
||||||
|
{
|
||||||
|
std::cerr << "Exception reading file " << Filename1 << std::endl;
|
||||||
|
}
|
||||||
|
if (infile1)
|
||||||
|
{
|
||||||
|
nread_elements = MAX_INPUT_SAMPLES_TOTAL * 2;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
nread_elements = 0;
|
||||||
|
}
|
||||||
|
try
|
||||||
|
{
|
||||||
|
infile2.read(reinterpret_cast<char *>(input_samples2.data()), MAX_INPUT_SAMPLES_TOTAL * 2);
|
||||||
|
}
|
||||||
|
catch (const std::ifstream::failure &e)
|
||||||
|
{
|
||||||
|
std::cerr << "Exception reading file " << Filename1 << std::endl;
|
||||||
|
}
|
||||||
|
if (infile2)
|
||||||
|
{
|
||||||
|
nread_elements2 = MAX_INPUT_SAMPLES_TOTAL * 2;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
nread_elements2 = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (nread_elements > nread_elements2)
|
||||||
|
{
|
||||||
|
nread_elements = nread_elements2; // take the smallest
|
||||||
|
}
|
||||||
|
|
||||||
|
nsamples += (nread_elements / 2);
|
||||||
|
|
||||||
|
for (int index0 = 0; index0 < (nread_elements); index0 += 2)
|
||||||
|
{
|
||||||
|
input_samples[index0] = input_samples[index0];
|
||||||
|
input_samples[index0 + 1] = input_samples[index0 + 1];
|
||||||
|
|
||||||
|
if (input_samples[index0] > max_value)
|
||||||
|
{
|
||||||
|
max_value = input_samples[index0];
|
||||||
|
}
|
||||||
|
else if (-input_samples[index0] > max_value)
|
||||||
|
{
|
||||||
|
max_value = -input_samples[index0];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (input_samples[index0 + 1] > max_value)
|
||||||
|
{
|
||||||
|
max_value = input_samples[index0 + 1];
|
||||||
|
}
|
||||||
|
else if (-input_samples[index0 + 1] > max_value)
|
||||||
|
{
|
||||||
|
max_value = -input_samples[index0 + 1];
|
||||||
|
}
|
||||||
|
|
||||||
|
// channel 1 (queue 1)
|
||||||
|
input_samples_dma[dma_index] = input_samples2[index0];
|
||||||
|
input_samples_dma[dma_index + 1] = input_samples2[index0 + 1];
|
||||||
|
// channel 0 (queue 0)
|
||||||
|
input_samples_dma[dma_index + 2] = input_samples[index0];
|
||||||
|
input_samples_dma[dma_index + 3] = input_samples[index0 + 1];
|
||||||
|
|
||||||
|
dma_index += 4;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (nread_elements > 0)
|
||||||
|
{
|
||||||
|
num_transferred_bytes = nread_elements * 2;
|
||||||
|
int num_bytes_sent = write(tx_fd, input_samples_dma.data(), nread_elements * 2);
|
||||||
|
if (num_bytes_sent != num_transferred_bytes)
|
||||||
|
{
|
||||||
|
std::cerr << "Error: DMA could not send all the required samples " << std::endl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (nread_elements != MAX_INPUT_SAMPLES_TOTAL * 2)
|
||||||
|
{
|
||||||
|
file_completed = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
infile1.close();
|
||||||
|
infile2.close();
|
||||||
|
}
|
||||||
|
catch (const std::ifstream::failure &e)
|
||||||
|
{
|
||||||
|
std::cerr << "Exception closing files " << Filename1 << " and " << Filename2 << std::endl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface *configuration,
|
Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface *configuration,
|
||||||
const std::string &role, unsigned int in_stream, unsigned int out_stream,
|
const std::string &role, unsigned int in_stream, unsigned int out_stream,
|
||||||
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(std::move(queue))
|
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(std::move(queue))
|
||||||
{
|
{
|
||||||
std::string default_dump_file = "./data/signal_source.dat";
|
|
||||||
freq_ = configuration->property(role + ".freq", GPS_L1_FREQ_HZ);
|
freq_ = configuration->property(role + ".freq", GPS_L1_FREQ_HZ);
|
||||||
sample_rate_ = configuration->property(role + ".sampling_frequency", 12500000);
|
sample_rate_ = configuration->property(role + ".sampling_frequency", 12500000);
|
||||||
bandwidth_ = configuration->property(role + ".bandwidth", 12500000);
|
bandwidth_ = configuration->property(role + ".bandwidth", 12500000);
|
||||||
@ -64,9 +294,6 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface* configura
|
|||||||
filter_file_ = configuration->property(role + ".filter_file", std::string(""));
|
filter_file_ = configuration->property(role + ".filter_file", std::string(""));
|
||||||
filter_auto_ = configuration->property(role + ".filter_auto", true);
|
filter_auto_ = configuration->property(role + ".filter_auto", true);
|
||||||
samples_ = configuration->property(role + ".samples", 0);
|
samples_ = configuration->property(role + ".samples", 0);
|
||||||
dump_ = configuration->property(role + ".dump", false);
|
|
||||||
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_file);
|
|
||||||
|
|
||||||
enable_dds_lo_ = configuration->property(role + ".enable_dds_lo", false);
|
enable_dds_lo_ = configuration->property(role + ".enable_dds_lo", false);
|
||||||
freq_rf_tx_hz_ = configuration->property(role + ".freq_rf_tx_hz", GPS_L1_FREQ_HZ - GPS_L2_FREQ_HZ - 1000);
|
freq_rf_tx_hz_ = configuration->property(role + ".freq_rf_tx_hz", GPS_L1_FREQ_HZ - GPS_L2_FREQ_HZ - 1000);
|
||||||
freq_dds_tx_hz_ = configuration->property(role + ".freq_dds_tx_hz", 1000);
|
freq_dds_tx_hz_ = configuration->property(role + ".freq_dds_tx_hz", 1000);
|
||||||
@ -74,12 +301,48 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface* configura
|
|||||||
phase_dds_deg_ = configuration->property(role + ".phase_dds_deg", 0.0);
|
phase_dds_deg_ = configuration->property(role + ".phase_dds_deg", 0.0);
|
||||||
tx_attenuation_db_ = configuration->property(role + ".tx_attenuation_db", 0.0);
|
tx_attenuation_db_ = configuration->property(role + ".tx_attenuation_db", 0.0);
|
||||||
|
|
||||||
|
// turn switch to A/D position
|
||||||
|
std::string default_device_name = "/dev/uio1";
|
||||||
|
std::string device_name = configuration->property(role + ".devicename", default_device_name);
|
||||||
|
switch_position = configuration->property(role + ".switch_position", 0);
|
||||||
|
switch_fpga = std::make_shared<Fpga_Switch>(device_name);
|
||||||
|
switch_fpga->set_switch_position(switch_position);
|
||||||
|
|
||||||
item_size_ = sizeof(gr_complex);
|
item_size_ = sizeof(gr_complex);
|
||||||
|
|
||||||
std::cout << "device address: " << uri_ << std::endl;
|
std::cout << "Sample rate: " << sample_rate_ << " Sps" << std::endl;
|
||||||
std::cout << "LO frequency : " << freq_ << " Hz" << std::endl;
|
|
||||||
std::cout << "sample rate: " << sample_rate_ << " Hz" << std::endl;
|
|
||||||
|
|
||||||
|
if (switch_position == 0) // Inject file(s) via DMA
|
||||||
|
{
|
||||||
|
enable_DMA_ = true;
|
||||||
|
std::string empty_string;
|
||||||
|
filename_rx1 = configuration->property(role + ".filename_rx1", empty_string);
|
||||||
|
filename_rx2 = configuration->property(role + ".filename_rx2", empty_string);
|
||||||
|
int l1_band = configuration->property("Channels_1C.count", 0) +
|
||||||
|
configuration->property("Channels_1B.count", 0);
|
||||||
|
|
||||||
|
int l2_band = configuration->property("Channels_L5.count", 0) +
|
||||||
|
configuration->property("Channels_5X.count", 0) +
|
||||||
|
configuration->property("Channels_2S.count", 0);
|
||||||
|
|
||||||
|
if (l1_band != 0)
|
||||||
|
{
|
||||||
|
freq_band = "L1";
|
||||||
|
}
|
||||||
|
if (l2_band != 0 && l1_band == 0)
|
||||||
|
{
|
||||||
|
freq_band = "L2";
|
||||||
|
}
|
||||||
|
if (l1_band != 0 && l2_band != 0)
|
||||||
|
{
|
||||||
|
freq_band = "L1L2";
|
||||||
|
}
|
||||||
|
|
||||||
|
thread_file_to_dma = std::thread([&] { run_DMA_process(freq_band, filename_rx1, filename_rx2, enable_DMA_); });
|
||||||
|
}
|
||||||
|
if (switch_position == 2) // Real-time via AD9361
|
||||||
|
{
|
||||||
|
std::cout << "LO frequency : " << freq_ << " Hz" << std::endl;
|
||||||
config_ad9361_rx_local(bandwidth_,
|
config_ad9361_rx_local(bandwidth_,
|
||||||
sample_rate_,
|
sample_rate_,
|
||||||
freq_,
|
freq_,
|
||||||
@ -99,13 +362,11 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface* configura
|
|||||||
freq_dds_tx_hz_,
|
freq_dds_tx_hz_,
|
||||||
scale_dds_dbfs_);
|
scale_dds_dbfs_);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// turn switch to A/D position
|
if (switch_position != 0 && switch_position != 2)
|
||||||
std::string default_device_name = "/dev/uio1";
|
{
|
||||||
std::string device_name = configuration->property(role + ".devicename", default_device_name);
|
std::cout << "SignalSource.switch_position configuration parameter must be either 0: read from file(s) via DMA, or 2: read from AD9361" << std::endl;
|
||||||
int32_t switch_position = configuration->property(role + ".switch_position", 0);
|
}
|
||||||
switch_fpga = std::make_shared<Fpga_Switch>(device_name);
|
|
||||||
switch_fpga->set_switch_position(switch_position);
|
|
||||||
if (in_stream_ > 0)
|
if (in_stream_ > 0)
|
||||||
{
|
{
|
||||||
LOG(ERROR) << "A signal source does not have an input stream";
|
LOG(ERROR) << "A signal source does not have an input stream";
|
||||||
@ -120,10 +381,13 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface* configura
|
|||||||
Ad9361FpgaSignalSource::~Ad9361FpgaSignalSource()
|
Ad9361FpgaSignalSource::~Ad9361FpgaSignalSource()
|
||||||
{
|
{
|
||||||
/* cleanup and exit */
|
/* cleanup and exit */
|
||||||
|
|
||||||
// std::cout<<"* AD9361 Disabling streaming channels\n";
|
// std::cout<<"* AD9361 Disabling streaming channels\n";
|
||||||
// if (rx0_i) { iio_channel_disable(rx0_i); }
|
// if (rx0_i) { iio_channel_disable(rx0_i); }
|
||||||
// if (rx0_q) { iio_channel_disable(rx0_q); }
|
// if (rx0_q) { iio_channel_disable(rx0_q); }
|
||||||
|
|
||||||
|
enable_DMA_ = false; // disable the DMA
|
||||||
|
|
||||||
if (enable_dds_lo_)
|
if (enable_dds_lo_)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@ -135,7 +399,13 @@ Ad9361FpgaSignalSource::~Ad9361FpgaSignalSource()
|
|||||||
LOG(WARNING) << "Problem closing the Ad9361FpgaSignalSource: " << e.what();
|
LOG(WARNING) << "Problem closing the Ad9361FpgaSignalSource: " << e.what();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (switch_position == 0) // read samples from a file via DMA
|
||||||
|
{
|
||||||
|
if (thread_file_to_dma.joinable())
|
||||||
|
{
|
||||||
|
thread_file_to_dma.join();
|
||||||
|
}
|
||||||
|
}
|
||||||
// std::cout<<"* AD9361 Destroying context\n";
|
// std::cout<<"* AD9361 Destroying context\n";
|
||||||
// if (ctx) { iio_context_destroy(ctx); }
|
// if (ctx) { iio_context_destroy(ctx); }
|
||||||
}
|
}
|
||||||
@ -168,6 +438,5 @@ gr::basic_block_sptr Ad9361FpgaSignalSource::get_left_block()
|
|||||||
|
|
||||||
gr::basic_block_sptr Ad9361FpgaSignalSource::get_right_block()
|
gr::basic_block_sptr Ad9361FpgaSignalSource::get_right_block()
|
||||||
{
|
{
|
||||||
LOG(WARNING) << "Trying to get AD9361 FPGA signal source right block.";
|
|
||||||
return gr::basic_block_sptr();
|
return gr::basic_block_sptr();
|
||||||
}
|
}
|
||||||
|
@ -40,6 +40,7 @@
|
|||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <thread>
|
||||||
|
|
||||||
class ConfigurationInterface;
|
class ConfigurationInterface;
|
||||||
|
|
||||||
@ -79,7 +80,6 @@ private:
|
|||||||
std::string role_;
|
std::string role_;
|
||||||
|
|
||||||
// Front-end settings
|
// Front-end settings
|
||||||
std::string uri_; // device direction
|
|
||||||
uint64_t freq_; // frequency of local oscillator
|
uint64_t freq_; // frequency of local oscillator
|
||||||
uint64_t sample_rate_;
|
uint64_t sample_rate_;
|
||||||
uint64_t bandwidth_;
|
uint64_t bandwidth_;
|
||||||
@ -110,12 +110,18 @@ private:
|
|||||||
|
|
||||||
size_t item_size_;
|
size_t item_size_;
|
||||||
long samples_;
|
long samples_;
|
||||||
bool dump_;
|
|
||||||
std::string dump_filename_;
|
|
||||||
|
|
||||||
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
|
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
|
||||||
|
|
||||||
std::shared_ptr<Fpga_Switch> switch_fpga;
|
std::shared_ptr<Fpga_Switch> switch_fpga;
|
||||||
|
int32_t switch_position;
|
||||||
|
|
||||||
|
std::thread thread_file_to_dma;
|
||||||
|
std::string filename_rx1;
|
||||||
|
std::string filename_rx2;
|
||||||
|
std::string freq_band;
|
||||||
|
|
||||||
|
bool enable_DMA_;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // GNSS_SDR_AD9361_FPGA_SIGNAL_SOURCE_H_
|
#endif // GNSS_SDR_AD9361_FPGA_SIGNAL_SOURCE_H_
|
||||||
|
@ -181,8 +181,14 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
|
|||||||
std::string default_device_name = "/dev/uio";
|
std::string default_device_name = "/dev/uio";
|
||||||
std::string device_name = configuration->property(role + ".devicename", default_device_name);
|
std::string device_name = configuration->property(role + ".devicename", default_device_name);
|
||||||
trk_param_fpga.device_name = device_name;
|
trk_param_fpga.device_name = device_name;
|
||||||
int32_t device_base = configuration->property(role + ".device_base", 15);
|
// obtain the number of the first uio device corresponding to a HW accelerator in the FPGA
|
||||||
trk_param_fpga.device_base = device_base;
|
// that can be assigned to the tracking of the E1 signal
|
||||||
|
trk_param_fpga.dev_file_num = configuration->property(role + ".dev_file_num", 15);
|
||||||
|
// compute the number of tracking channels that have already been instantiated. The order in which
|
||||||
|
// GNSS-SDR instantiates the tracking channels i L1, L2, L5, E1, E5a
|
||||||
|
trk_param_fpga.num_prev_assigned_ch = configuration->property("Channels_1C.count", 0) +
|
||||||
|
configuration->property("Channels_2S.count", 0) +
|
||||||
|
configuration->property("Channels_L5.count", 0);
|
||||||
|
|
||||||
//################# PRE-COMPUTE ALL THE CODES #################
|
//################# PRE-COMPUTE ALL THE CODES #################
|
||||||
uint32_t code_samples_per_chip = 2;
|
uint32_t code_samples_per_chip = 2;
|
||||||
|
@ -176,8 +176,15 @@ GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
|
|||||||
std::string default_device_name = "/dev/uio";
|
std::string default_device_name = "/dev/uio";
|
||||||
std::string device_name = configuration->property(role + ".devicename", default_device_name);
|
std::string device_name = configuration->property(role + ".devicename", default_device_name);
|
||||||
trk_param_fpga.device_name = device_name;
|
trk_param_fpga.device_name = device_name;
|
||||||
int32_t device_base = configuration->property(role + ".device_base", 27);
|
// obtain the number of the first uio device corresponding to a HW accelerator in the FPGA
|
||||||
trk_param_fpga.device_base = device_base;
|
// that can be assigned to the tracking of the E5a signal
|
||||||
|
trk_param_fpga.dev_file_num = configuration->property(role + ".dev_file_num", 27);
|
||||||
|
// compute the number of tracking channels that have already been instantiated. The order in which
|
||||||
|
// GNSS-SDR instantiates the tracking channels i L1, L2, L5, E1, E5a
|
||||||
|
trk_param_fpga.num_prev_assigned_ch = configuration->property("Channels_1C.count", 0) +
|
||||||
|
configuration->property("Channels_2S.count", 0) +
|
||||||
|
configuration->property("Channels_L5.count", 0) +
|
||||||
|
configuration->property("Channels_1B.count", 0);
|
||||||
|
|
||||||
// ################# PRE-COMPUTE ALL THE CODES #################
|
// ################# PRE-COMPUTE ALL THE CODES #################
|
||||||
uint32_t code_samples_per_chip = 1;
|
uint32_t code_samples_per_chip = 1;
|
||||||
|
@ -182,8 +182,12 @@ GpsL1CaDllPllTrackingFpga::GpsL1CaDllPllTrackingFpga(
|
|||||||
std::string default_device_name = "/dev/uio";
|
std::string default_device_name = "/dev/uio";
|
||||||
std::string device_name = configuration->property(role + ".devicename", default_device_name);
|
std::string device_name = configuration->property(role + ".devicename", default_device_name);
|
||||||
trk_param_fpga.device_name = device_name;
|
trk_param_fpga.device_name = device_name;
|
||||||
int32_t device_base = configuration->property(role + ".device_base", 3);
|
// obtain the number of the first uio device corresponding to a HW accelerator in the FPGA
|
||||||
trk_param_fpga.device_base = device_base;
|
// that can be assigned to the tracking of the L1 signal
|
||||||
|
trk_param_fpga.dev_file_num = configuration->property(role + ".dev_file_num", 3);
|
||||||
|
// compute the number of tracking channels that have already been instantiated. The order in which
|
||||||
|
// GNSS-SDR instantiates the tracking channels i L1, l2, L5, E1, E5a
|
||||||
|
trk_param_fpga.num_prev_assigned_ch = 0;
|
||||||
|
|
||||||
// ################# PRE-COMPUTE ALL THE CODES #################
|
// ################# PRE-COMPUTE ALL THE CODES #################
|
||||||
d_ca_codes = static_cast<int32_t*>(volk_gnsssdr_malloc(static_cast<int32_t>(GPS_L1_CA_CODE_LENGTH_CHIPS * NUM_PRNs) * sizeof(int32_t), volk_gnsssdr_get_alignment()));
|
d_ca_codes = static_cast<int32_t*>(volk_gnsssdr_malloc(static_cast<int32_t>(GPS_L1_CA_CODE_LENGTH_CHIPS * NUM_PRNs) * sizeof(int32_t), volk_gnsssdr_get_alignment()));
|
||||||
|
@ -107,19 +107,16 @@ GpsL2MDllPllTrackingFpga::GpsL2MDllPllTrackingFpga(
|
|||||||
trk_param_fpga.carrier_lock_test_smoother_samples = configuration->property(role + ".carrier_lock_test_smoother_samples", trk_param_fpga.carrier_lock_test_smoother_samples);
|
trk_param_fpga.carrier_lock_test_smoother_samples = configuration->property(role + ".carrier_lock_test_smoother_samples", trk_param_fpga.carrier_lock_test_smoother_samples);
|
||||||
trk_param_fpga.carrier_lock_test_smoother_alpha = configuration->property(role + ".carrier_lock_test_smoother_alpha", trk_param_fpga.carrier_lock_test_smoother_alpha);
|
trk_param_fpga.carrier_lock_test_smoother_alpha = configuration->property(role + ".carrier_lock_test_smoother_alpha", trk_param_fpga.carrier_lock_test_smoother_alpha);
|
||||||
|
|
||||||
// int32_t max_lock_fail = configuration->property(role + ".max_lock_fail", 50);
|
|
||||||
// if (FLAGS_max_lock_fail != 50)
|
|
||||||
// {
|
|
||||||
// max_lock_fail = FLAGS_max_lock_fail;
|
|
||||||
// }
|
|
||||||
// trk_param_fpga.max_lock_fail = max_lock_fail;
|
|
||||||
|
|
||||||
// FPGA configuration parameters
|
// FPGA configuration parameters
|
||||||
std::string default_device_name = "/dev/uio";
|
std::string default_device_name = "/dev/uio";
|
||||||
std::string device_name = configuration->property(role + ".devicename", default_device_name);
|
std::string device_name = configuration->property(role + ".devicename", default_device_name);
|
||||||
trk_param_fpga.device_name = device_name;
|
trk_param_fpga.device_name = device_name;
|
||||||
unsigned int device_base = configuration->property(role + ".device_base", 1);
|
// obtain the number of the first uio device file that is assigned to the FPGA L2 tracking multicorrelator HW accelerators
|
||||||
trk_param_fpga.device_base = device_base;
|
trk_param_fpga.dev_file_num = configuration->property(role + ".dev_file_num", 27);
|
||||||
|
// compute the number of tracking channels that have already been instantiated. The order in which
|
||||||
|
// GNSS-SDR instantiates the tracking channels i L1, L2, L5, E1, E5a
|
||||||
|
trk_param_fpga.num_prev_assigned_ch = configuration->property("Channels_1C.count", 0);
|
||||||
|
|
||||||
|
|
||||||
auto* ca_codes_f = static_cast<float*>(volk_gnsssdr_malloc(static_cast<unsigned int>(GPS_L2_M_CODE_LENGTH_CHIPS) * sizeof(float), volk_gnsssdr_get_alignment()));
|
auto* ca_codes_f = static_cast<float*>(volk_gnsssdr_malloc(static_cast<unsigned int>(GPS_L2_M_CODE_LENGTH_CHIPS) * sizeof(float), volk_gnsssdr_get_alignment()));
|
||||||
|
|
||||||
|
@ -175,8 +175,13 @@ GpsL5DllPllTrackingFpga::GpsL5DllPllTrackingFpga(
|
|||||||
std::string default_device_name = "/dev/uio";
|
std::string default_device_name = "/dev/uio";
|
||||||
std::string device_name = configuration->property(role + ".devicename", default_device_name);
|
std::string device_name = configuration->property(role + ".devicename", default_device_name);
|
||||||
trk_param_fpga.device_name = device_name;
|
trk_param_fpga.device_name = device_name;
|
||||||
int32_t device_base = configuration->property(role + ".device_base", 27);
|
// obtain the number of the first uio device corresponding to a HW accelerator in the FPGA
|
||||||
trk_param_fpga.device_base = device_base;
|
// that can be assigned to the tracking of the L5 signal
|
||||||
|
trk_param_fpga.dev_file_num = configuration->property(role + ".dev_file_num", 27);
|
||||||
|
// compute the number of tracking channels that have already been instantiated. The order in which
|
||||||
|
// GNSS-SDR instantiates the tracking channels i L1, L2, L5, E1, E5a
|
||||||
|
trk_param_fpga.num_prev_assigned_ch = configuration->property("Channels_1C.count", 0) +
|
||||||
|
configuration->property("Channels_2S.count", 0);
|
||||||
|
|
||||||
// tracking lock tests smoother parameters
|
// tracking lock tests smoother parameters
|
||||||
trk_param_fpga.cn0_smoother_samples = configuration->property(role + ".cn0_smoother_samples", trk_param_fpga.cn0_smoother_samples);
|
trk_param_fpga.cn0_smoother_samples = configuration->property(role + ".cn0_smoother_samples", trk_param_fpga.cn0_smoother_samples);
|
||||||
|
@ -453,10 +453,11 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
|
|||||||
}
|
}
|
||||||
// create multicorrelator class
|
// create multicorrelator class
|
||||||
std::string device_name = trk_parameters.device_name;
|
std::string device_name = trk_parameters.device_name;
|
||||||
int32_t device_base = trk_parameters.device_base;
|
uint32_t dev_file_num = trk_parameters.dev_file_num;
|
||||||
|
uint32_t num_prev_assigned_ch = trk_parameters.num_prev_assigned_ch;
|
||||||
int32_t *ca_codes = trk_parameters.ca_codes;
|
int32_t *ca_codes = trk_parameters.ca_codes;
|
||||||
int32_t *data_codes = trk_parameters.data_codes;
|
int32_t *data_codes = trk_parameters.data_codes;
|
||||||
multicorrelator_fpga = std::make_shared<Fpga_Multicorrelator_8sc>(d_n_correlator_taps, device_name, device_base, ca_codes, data_codes, d_code_length_chips, trk_parameters.track_pilot, d_code_samples_per_chip);
|
multicorrelator_fpga = std::make_shared<Fpga_Multicorrelator_8sc>(d_n_correlator_taps, device_name, dev_file_num, num_prev_assigned_ch, ca_codes, data_codes, d_code_length_chips, trk_parameters.track_pilot, d_code_samples_per_chip);
|
||||||
multicorrelator_fpga->set_output_vectors(d_correlator_outs, d_Prompt_Data);
|
multicorrelator_fpga->set_output_vectors(d_correlator_outs, d_Prompt_Data);
|
||||||
d_sample_counter_next = 0ULL;
|
d_sample_counter_next = 0ULL;
|
||||||
|
|
||||||
|
@ -81,7 +81,8 @@ Dll_Pll_Conf_Fpga::Dll_Pll_Conf_Fpga()
|
|||||||
signal[1] = 'C';
|
signal[1] = 'C';
|
||||||
signal[2] = '\0';
|
signal[2] = '\0';
|
||||||
device_name = "/dev/uio";
|
device_name = "/dev/uio";
|
||||||
device_base = 1;
|
dev_file_num = 3;
|
||||||
|
num_prev_assigned_ch = 0;
|
||||||
code_length_chips = 0U;
|
code_length_chips = 0U;
|
||||||
code_samples_per_chip = 0U;
|
code_samples_per_chip = 0U;
|
||||||
ca_codes = nullptr;
|
ca_codes = nullptr;
|
||||||
|
@ -87,7 +87,8 @@ public:
|
|||||||
char system;
|
char system;
|
||||||
char signal[3];
|
char signal[3];
|
||||||
std::string device_name;
|
std::string device_name;
|
||||||
int32_t device_base;
|
uint32_t dev_file_num;
|
||||||
|
uint32_t num_prev_assigned_ch;
|
||||||
uint32_t code_length_chips;
|
uint32_t code_length_chips;
|
||||||
uint32_t code_samples_per_chip;
|
uint32_t code_samples_per_chip;
|
||||||
int32_t* ca_codes;
|
int32_t* ca_codes;
|
||||||
|
@ -61,13 +61,15 @@ const float PHASE_CARR_MAX_DIV_PI = 683565275.5764316; // 2^(31)/pi
|
|||||||
const float TWO_PI = 6.283185307179586;
|
const float TWO_PI = 6.283185307179586;
|
||||||
|
|
||||||
Fpga_Multicorrelator_8sc::Fpga_Multicorrelator_8sc(int32_t n_correlators,
|
Fpga_Multicorrelator_8sc::Fpga_Multicorrelator_8sc(int32_t n_correlators,
|
||||||
const std::string &device_name, int32_t device_base, int32_t *ca_codes, int32_t *data_codes, uint32_t code_length_chips, bool track_pilot,
|
const std::string &device_name, uint32_t dev_file_num, uint32_t num_prev_assigned_ch, int32_t *ca_codes, int32_t *data_codes, uint32_t code_length_chips, bool track_pilot,
|
||||||
uint32_t code_samples_per_chip)
|
uint32_t code_samples_per_chip)
|
||||||
|
|
||||||
{
|
{
|
||||||
d_n_correlators = n_correlators;
|
d_n_correlators = n_correlators;
|
||||||
d_device_name = device_name;
|
d_device_name = device_name;
|
||||||
d_device_base = device_base;
|
d_dev_file_num = dev_file_num;
|
||||||
|
d_num_prev_assigned_ch = num_prev_assigned_ch;
|
||||||
|
|
||||||
d_track_pilot = track_pilot;
|
d_track_pilot = track_pilot;
|
||||||
d_device_descriptor = 0;
|
d_device_descriptor = 0;
|
||||||
d_map_base = nullptr;
|
d_map_base = nullptr;
|
||||||
@ -243,7 +245,7 @@ void Fpga_Multicorrelator_8sc::set_channel(uint32_t channel)
|
|||||||
// open the device corresponding to the assigned channel
|
// open the device corresponding to the assigned channel
|
||||||
std::string mergedname;
|
std::string mergedname;
|
||||||
std::stringstream devicebasetemp;
|
std::stringstream devicebasetemp;
|
||||||
int32_t numdevice = d_device_base + d_channel;
|
uint32_t numdevice = d_dev_file_num + d_channel - d_num_prev_assigned_ch;
|
||||||
devicebasetemp << numdevice;
|
devicebasetemp << numdevice;
|
||||||
mergedname = d_device_name + devicebasetemp.str();
|
mergedname = d_device_name + devicebasetemp.str();
|
||||||
|
|
||||||
|
@ -53,7 +53,8 @@ public:
|
|||||||
*/
|
*/
|
||||||
Fpga_Multicorrelator_8sc(int32_t n_correlators,
|
Fpga_Multicorrelator_8sc(int32_t n_correlators,
|
||||||
const std::string &device_name,
|
const std::string &device_name,
|
||||||
int32_t device_base,
|
uint32_t dev_file_num,
|
||||||
|
uint32_t num_prev_assigned_ch,
|
||||||
int32_t *ca_codes,
|
int32_t *ca_codes,
|
||||||
int32_t *data_codes,
|
int32_t *data_codes,
|
||||||
uint32_t code_length_chips,
|
uint32_t code_length_chips,
|
||||||
@ -236,7 +237,8 @@ private:
|
|||||||
|
|
||||||
// driver
|
// driver
|
||||||
std::string d_device_name;
|
std::string d_device_name;
|
||||||
int32_t d_device_base;
|
uint32_t d_dev_file_num;
|
||||||
|
uint32_t d_num_prev_assigned_ch;
|
||||||
|
|
||||||
// PRN codes
|
// PRN codes
|
||||||
int32_t *d_ca_codes;
|
int32_t *d_ca_codes;
|
||||||
|
@ -1446,15 +1446,6 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if AD9361_DRIVER
|
|
||||||
else if (implementation == "Ad9361_Fpga_Signal_Source")
|
|
||||||
{
|
|
||||||
std::unique_ptr<GNSSBlockInterface> block_(new Ad9361FpgaSignalSource(configuration.get(), role, in_streams,
|
|
||||||
out_streams, queue));
|
|
||||||
block = std::move(block_);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if FLEXIBAND_DRIVER
|
#if FLEXIBAND_DRIVER
|
||||||
else if (implementation == "Flexiband_Signal_Source")
|
else if (implementation == "Flexiband_Signal_Source")
|
||||||
{
|
{
|
||||||
@ -1927,6 +1918,18 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
|
|||||||
out_streams));
|
out_streams));
|
||||||
block = std::move(block_);
|
block = std::move(block_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if AD9361_DRIVER
|
||||||
|
// The AD9361_DRIVER Driver is instantiated last. In this way, when using the FPGA, and when using the GNSS receiver
|
||||||
|
// in post-processing mode, the receiver is configured and ready when the DMA starts sending samples to the receiver.
|
||||||
|
else if (implementation == "Ad9361_Fpga_Signal_Source")
|
||||||
|
{
|
||||||
|
std::unique_ptr<GNSSBlockInterface> block_(new Ad9361FpgaSignalSource(configuration.get(), role, in_streams,
|
||||||
|
out_streams, queue));
|
||||||
|
block = std::move(block_);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Log fatal. This causes execution to stop.
|
// Log fatal. This causes execution to stop.
|
||||||
|
Loading…
Reference in New Issue
Block a user