mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 20:20:35 +00:00
Code Issues Releases Wiki Activity

The acquisition device name is not configurable.

Browse Source
This commit is contained in:
Marc Majoral 2020-11-27 12:04:27 +01:00
parent 3047051835
commit 9e552b9cda
12 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc
View File

@ -82,11 +82,10 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
// UIO device file // UIO device file
std::string device_io_name; std::string device_io_name;
std::string device_name = configuration->property(role + ".devicename", default_device_name); // find the uio device file corresponding to the acquisition
// find the uio device file corresponding to the GNSS reset module if (find_uio_dev_file_name(device_io_name, acquisition_device_name, 0) < 0)
if (find_uio_dev_file_name(device_io_name, device_name, 0) < 0)
{ {
std::cout << "Cannot find the FPGA uio device file corresponding to device name " << device_name << std::endl; std::cout << "Cannot find the FPGA uio device file corresponding to device name " << acquisition_device_name << std::endl;
throw std::exception(); throw std::exception();
} }
acq_parameters.device_name = device_io_name; acq_parameters.device_name = device_io_name;

2
src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h
View File

@ -183,7 +183,7 @@ public:
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{};
private: private:
const std::string default_device_name = "acquisition_S00_AXI"; // UIO device name const std::string acquisition_device_name = "acquisition_S00_AXI"; // UIO device name
// the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA // the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA
// expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking. // expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking.

7
src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc
View File

@ -84,11 +84,10 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(
// UIO device file // UIO device file
std::string device_io_name; std::string device_io_name;
std::string device_name = configuration->property(role + ".devicename", default_device_name); // find the uio device file corresponding to the acquisition
// find the uio device file corresponding to the GNSS reset module if (find_uio_dev_file_name(device_io_name, acquisition_device_name, 0) < 0)
if (find_uio_dev_file_name(device_io_name, device_name, 0) < 0)
{ {
std::cout << "Cannot find the FPGA uio device file corresponding to device name " << device_name << std::endl; std::cout << "Cannot find the FPGA uio device file corresponding to device name " << acquisition_device_name << std::endl;
throw std::exception(); throw std::exception();
} }
acq_parameters.device_name = device_io_name; acq_parameters.device_name = device_io_name;

2
src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h
View File

@ -191,7 +191,7 @@ public:
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{};
private: private:
const std::string default_device_name = "acquisition_S00_AXI"; // UIO device name const std::string acquisition_device_name = "acquisition_S00_AXI"; // UIO device name
// the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA // the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA
// expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking. // expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking.

7
src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.cc
View File

@ -83,11 +83,10 @@ GalileoE5bPcpsAcquisitionFpga::GalileoE5bPcpsAcquisitionFpga(const Configuration
// UIO device file // UIO device file
std::string device_io_name; std::string device_io_name;
std::string device_name = configuration->property(role + ".devicename", default_device_name); // find the uio device file corresponding to the acquisition
// find the uio device file corresponding to the GNSS reset module if (find_uio_dev_file_name(device_io_name, acquisition_device_name, 0) < 0)
if (find_uio_dev_file_name(device_io_name, device_name, 0) < 0)
{ {
std::cout << "Cannot find the FPGA uio device file corresponding to device name " << device_name << std::endl; std::cout << "Cannot find the FPGA uio device file corresponding to device name " << acquisition_device_name << std::endl;
throw std::exception(); throw std::exception();
} }
acq_parameters.device_name = device_io_name; acq_parameters.device_name = device_io_name;

3
src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.h
View File

@ -190,8 +190,7 @@ public:
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{};
private: private:
const std::string acquisition_device_name = "acquisition_S00_AXI"; // UIO device name
const std::string default_device_name = "acquisition_S00_AXI"; // UIO device name
// the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA // the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA
// expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking. // expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking.

7
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc
View File

@ -76,11 +76,10 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga(
// UIO device file // UIO device file
std::string device_io_name; std::string device_io_name;
std::string device_name = configuration->property(role + ".devicename", default_device_name); // find the uio device file corresponding to the acquisition
// find the uio device file corresponding to the GNSS reset module if (find_uio_dev_file_name(device_io_name, acquisition_device_name, 0) < 0)
if (find_uio_dev_file_name(device_io_name, device_name, 0) < 0)
{ {
std::cout << "Cannot find the FPGA uio device file corresponding to device name " << device_name << std::endl; std::cout << "Cannot find the FPGA uio device file corresponding to device name " << acquisition_device_name << std::endl;
throw std::exception(); throw std::exception();
} }
acq_parameters.device_name = device_io_name; acq_parameters.device_name = device_io_name;

2
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h
View File

@ -187,7 +187,7 @@ public:
private: private:
static const uint32_t NUM_PRNs = 32; static const uint32_t NUM_PRNs = 32;
const std::string default_device_name = "acquisition_S00_AXI"; // UIO device name const std::string acquisition_device_name = "acquisition_S00_AXI"; // UIO device name
// the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA // the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA
// expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking. // expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking.

7
src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc
View File

@ -74,11 +74,10 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga(
// UIO device file // UIO device file
std::string device_io_name; std::string device_io_name;
std::string device_name = configuration->property(role + ".devicename", default_device_name); // find the uio device file corresponding to the acquisition
// find the uio device file corresponding to the GNSS reset module if (find_uio_dev_file_name(device_io_name, acquisition_device_name, 0) < 0)
if (find_uio_dev_file_name(device_io_name, device_name, 0) < 0)
{ {
std::cout << "Cannot find the FPGA uio device file corresponding to device name " << device_name << std::endl; std::cout << "Cannot find the FPGA uio device file corresponding to device name " << acquisition_device_name << std::endl;
throw std::exception(); throw std::exception();
} }
acq_parameters.device_name = device_io_name; acq_parameters.device_name = device_io_name;

2
src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h
View File

@ -151,7 +151,7 @@ public:
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{};
private: private:
const std::string default_device_name = "acquisition_S00_AXI"; // UIO device name const std::string acquisition_device_name = "acquisition_S00_AXI"; // UIO device name
static const uint32_t NUM_PRNs = 32; static const uint32_t NUM_PRNs = 32;
static const uint32_t QUANT_BITS_LOCAL_CODE = 16; static const uint32_t QUANT_BITS_LOCAL_CODE = 16;

7
src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc
View File

@ -80,11 +80,10 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga(
// UIO device file // UIO device file
std::string device_io_name; std::string device_io_name;
std::string device_name = configuration->property(role + ".devicename", default_device_name); // find the uio device file corresponding to the acquisition
// find the uio device file corresponding to the GNSS reset module if (find_uio_dev_file_name(device_io_name, acquisition_device_name, 0) < 0)
if (find_uio_dev_file_name(device_io_name, device_name, 0) < 0)
{ {
std::cout << "Cannot find the FPGA uio device file corresponding to device name " << device_name << std::endl; std::cout << "Cannot find the FPGA uio device file corresponding to device name " << acquisition_device_name << std::endl;
throw std::exception(); throw std::exception();
} }
acq_parameters.device_name = device_io_name; acq_parameters.device_name = device_io_name;

2
src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h
View File

@ -187,7 +187,7 @@ public:
private: private:
static const uint32_t NUM_PRNs = 32; static const uint32_t NUM_PRNs = 32;
const std::string default_device_name = "acquisition_S00_AXI"; // UIO device name const std::string acquisition_device_name = "acquisition_S00_AXI"; // UIO device name
// the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA // the following flags are FPGA-specific and they are using arrange the values of the fft of the local code in the way the FPGA
// expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking. // expects. This arrangement is done in the initialisation to avoid consuming unnecessary clock cycles during tracking.