mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-18 21:23:02 +00:00
Code Issues Releases Wiki Activity

Fix build for macOS, fix warning about non-virtual destructor

Browse Source
This commit is contained in:
Carles Fernandez 2020-01-12 23:13:44 +01:00
parent 1d5ff14619
commit c57350cbc7
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/algorithms/channel/libs/channel_fsm.h
View File

@ -50,6 +50,7 @@ class ChannelFsm
{
public:
ChannelFsm();
virtual ~ChannelFsm() = default;
explicit ChannelFsm(std::shared_ptr<AcquisitionInterface> acquisition);
void set_acquisition(std::shared_ptr<AcquisitionInterface> acquisition);

22
src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test_fpga.cc
View File

@ -48,7 +48,8 @@
#include <gtest/gtest.h>
#include <pmt/pmt.h>
#include <chrono>
#include <cmath> // for abs, pow, floor
#include <cmath> // for abs, pow, floor
#include <fcntl.h> // for O_WRONLY
#include <pthread.h>
#include <utility>
@ -91,11 +92,11 @@ public:
std::string implementation = "GPS_L1_CA_DLL_PLL_Tracking_Fpga";
std::vector<Gnss_Synchro> gnss_synchro_vec;
static const int32_t TEST_ACQ_SKIP_SAMPLES = 1024;
static const int BASEBAND_SAMPLING_FREQ = 4000000;
static constexpr float MAX_SAMPLE_VALUE = 0.096257761120796;
static const int DMA_BITS_PER_SAMPLE = 8;
static constexpr float DMA_SIGNAL_SCALING_FACTOR = (pow(2, DMA_BITS_PER_SAMPLE - 1) - 1) / MAX_SAMPLE_VALUE;
const int32_t TEST_ACQ_SKIP_SAMPLES = 1024;
const int BASEBAND_SAMPLING_FREQ = 4000000;
const float MAX_SAMPLE_VALUE = 0.096257761120796;
const int DMA_BITS_PER_SAMPLE = 8;
const float DMA_SIGNAL_SCALING_FACTOR = (pow(2, DMA_BITS_PER_SAMPLE - 1) - 1) / MAX_SAMPLE_VALUE;
protected:
GalileoE1PcpsAmbiguousAcquisitionTestFpga();
@ -119,6 +120,7 @@ GalileoE1PcpsAmbiguousAcquisitionTestFpga::GalileoE1PcpsAmbiguousAcquisitionTest
doppler_step = 100;
}
void* handler_DMA_galileo_e1_pcps_ambiguous_acq_test(void* arguments)
{
const int MAX_INPUT_SAMPLES_TOTAL = 16384;
@ -164,8 +166,7 @@ void* handler_DMA_galileo_e1_pcps_ambiguous_acq_test(void* arguments)
//**************************************************************************
// Open input file
//**************************************************************************
uint32_t skip_samples = 0; //static_cast<uint32_t>(FLAGS_skip_samples);
uint32_t skip_samples = 0; // static_cast<uint32_t>(FLAGS_skip_samples);
if (skip_samples + skip_used_samples > 0)
{
@ -225,7 +226,6 @@ void* handler_DMA_galileo_e1_pcps_ambiguous_acq_test(void* arguments)
// Throttle the DMA
std::this_thread::sleep_for(std::chrono::milliseconds(1));
nsamples_remaining -= nsamples_block_size;
if (nsamples_remaining == 0)
@ -284,14 +284,12 @@ public:
return true;
}
bool Event_failed_acquisition_repeat() override
{
acquisition_successful = false;
return true;
}
bool Event_failed_acquisition_no_repeat() override
{
acquisition_successful = false;
@ -353,7 +351,6 @@ bool GalileoE1PcpsAmbiguousAcquisitionTestFpga::acquire_signal()
const char* str = signal.c_str(); // get a C style null terminated string
std::memcpy(static_cast<void*>(tmp_gnss_synchro.Signal), str, 2); // copy string into synchro char array: 2 char + null
tmp_gnss_synchro.PRN = SV_ID;
const std::string& role = "Acquisition";
acquisition = std::make_shared<GalileoE1PcpsAmbiguousAcquisitionFpga>(config.get(), "Acquisition", 0, 0);
acquisition->set_gnss_synchro(&tmp_gnss_synchro);
@ -434,6 +431,7 @@ void GalileoE1PcpsAmbiguousAcquisitionTestFpga::init()
config->set_property("Acquisition.total_block_exp", "14");
}
TEST_F(GalileoE1PcpsAmbiguousAcquisitionTestFpga, ValidationOfResults)
{
struct DMA_handler_args_galileo_e1_pcps_ambiguous_acq_test args;

22
src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
View File

@ -46,7 +46,8 @@
#include <glog/logging.h>
#include <gtest/gtest.h>
#include <chrono>
#include <cmath> // for abs, pow, floor
#include <cmath> // for abs, pow, floor
#include <fcntl.h> // for O_WRONLY
#include <pthread.h>
#include <utility>
@ -89,11 +90,11 @@ public:
std::string implementation = "GPS_L1_CA_DLL_PLL_Tracking_Fpga";
std::vector<Gnss_Synchro> gnss_synchro_vec;
static const int32_t TEST_ACQ_SKIP_SAMPLES = 1024;
static const int BASEBAND_SAMPLING_FREQ = 4000000;
static constexpr float MAX_SAMPLE_VALUE = 0.096257761120796;
static const int DMA_BITS_PER_SAMPLE = 8;
static constexpr float DMA_SIGNAL_SCALING_FACTOR = (pow(2, DMA_BITS_PER_SAMPLE - 1) - 1) / MAX_SAMPLE_VALUE;
const int32_t TEST_ACQ_SKIP_SAMPLES = 1024;
const int BASEBAND_SAMPLING_FREQ = 4000000;
const float MAX_SAMPLE_VALUE = 0.096257761120796;
const int DMA_BITS_PER_SAMPLE = 8;
const float DMA_SIGNAL_SCALING_FACTOR = (pow(2, DMA_BITS_PER_SAMPLE - 1) - 1) / MAX_SAMPLE_VALUE;
protected:
GpsL1CaPcpsAcquisitionTestFpga();
@ -117,6 +118,7 @@ GpsL1CaPcpsAcquisitionTestFpga::GpsL1CaPcpsAcquisitionTestFpga()
doppler_step = 100;
}
void* handler_DMA_gps_l1_acq_test(void* arguments)
{
const int MAX_INPUT_SAMPLES_TOTAL = 16384;
@ -162,8 +164,7 @@ void* handler_DMA_gps_l1_acq_test(void* arguments)
//**************************************************************************
// Open input file
//**************************************************************************
uint32_t skip_samples = 0; //static_cast<uint32_t>(FLAGS_skip_samples);
uint32_t skip_samples = 0; // static_cast<uint32_t>(FLAGS_skip_samples);
if (skip_samples + skip_used_samples > 0)
{
@ -223,7 +224,6 @@ void* handler_DMA_gps_l1_acq_test(void* arguments)
// Throttle the DMA
std::this_thread::sleep_for(std::chrono::milliseconds(1));
nsamples_remaining -= nsamples_block_size;
if (nsamples_remaining == 0)
@ -282,14 +282,12 @@ public:
return true;
}
bool Event_failed_acquisition_repeat() override
{
acquisition_successful = false;
return true;
}
bool Event_failed_acquisition_no_repeat() override
{
acquisition_successful = false;
@ -351,7 +349,6 @@ bool GpsL1CaPcpsAcquisitionTestFpga::acquire_signal()
const char* str = signal.c_str(); // get a C style null terminated string
std::memcpy(static_cast<void*>(tmp_gnss_synchro.Signal), str, 3); // copy string into synchro char array: 2 char + null
tmp_gnss_synchro.PRN = SV_ID;
const std::string& role = "Acquisition";
acquisition = std::make_shared<GpsL1CaPcpsAcquisitionFpga>(config.get(), "Acquisition", 0, 0);
acquisition->set_gnss_synchro(&tmp_gnss_synchro);
@ -432,6 +429,7 @@ void GpsL1CaPcpsAcquisitionTestFpga::init()
config->set_property("Acquisition.total_block_exp", "12");
}
TEST_F(GpsL1CaPcpsAcquisitionTestFpga, ValidationOfResults)
{
struct DMA_handler_args_gps_l1_acq_test args;