mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-08-18 08:08:53 +00:00
Code Issues Releases Wiki Activity

Update tests to new acquisition adapter interface

Browse Source
This commit is contained in:
Carles Fernandez
2026-04-24 10:41:58 +02:00
parent 3249afa35d
commit 03602dfe74
5 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
+9 -14
View File
@@ -17,21 +17,16 @@
#include "GPS_L1_CA.h"
#include "acquisition_dump_reader.h"
#include "acquisition_interface.h"
#include "display.h"
#include "file_configuration.h"
#include "galileo_e1_pcps_ambiguous_acquisition.h"
#include "galileo_e5a_pcps_acquisition.h"
#include "glonass_l1_ca_pcps_acquisition.h"
#include "glonass_l2_ca_pcps_acquisition.h"
#include "gnss_block_interface.h"
#include "gnss_sdr_filesystem.h"
#include "gnss_sdr_valve.h"
#include "gnuplot_i.h"
#include "gps_l1_ca_pcps_acquisition.h"
#include "gps_l1_ca_pcps_acquisition_fine_doppler.h"
#include "gps_l2_m_pcps_acquisition.h"
#include "gps_l5i_pcps_acquisition.h"
#include "in_memory_configuration.h"
#include "pcps_acquisition_adapter.h"
#include "signal_generator_flags.h"
#include "test_flags.h"
#include "tracking_true_obs_reader.h"
@@ -815,7 +810,7 @@ int AcquisitionPerformanceTest::run_receiver()
auto valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue.get());
if (implementation == "GPS_L1_CA_PCPS_Acquisition")
{
acquisition = std::make_shared<GpsL1CaPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", implementation, 1, 0, GPS_1C);
}
else if (implementation == "GPS_L1_CA_PCPS_Acquisition_Fine_Doppler")
{
@@ -823,27 +818,27 @@ int AcquisitionPerformanceTest::run_receiver()
}
else if (implementation == "Galileo_E1_PCPS_Ambiguous_Acquisition")
{
acquisition = std::make_shared<GalileoE1PcpsAmbiguousAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", implementation, 1, 0, GAL_1B);
}
else if (implementation == "GLONASS_L1_CA_PCPS_Acquisition")
{
acquisition = std::make_shared<GlonassL1CaPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", implementation, 1, 0, GLO_1G);
}
else if (implementation == "GLONASS_L2_CA_PCPS_Acquisition")
{
acquisition = std::make_shared<GlonassL2CaPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", implementation, 1, 0, GLO_2G);
}
else if (implementation == "GPS_L2_M_PCPS_Acquisition")
{
acquisition = std::make_shared<GpsL2MPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", implementation, 1, 0, GPS_2S);
}
else if (implementation == "Galileo_E5a_Pcps_Acquisition")
{
acquisition = std::make_shared<GalileoE5aPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", implementation, 1, 0, GAL_E5a);
}
else if (implementation == "GPS_L5i_PCPS_Acquisition")
{
acquisition = std::make_shared<GpsL5iPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", implementation, 1, 0, GPS_L5);
}
else
{
tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc
+5 -5
View File
@@ -18,11 +18,11 @@
#include "concurrent_queue.h"
#include "freq_xlating_fir_filter.h"
#include "glonass_l1_ca_pcps_acquisition.h"
#include "gnss_block_interface.h"
#include "gnss_sdr_valve.h"
#include "gnss_synchro.h"
#include "in_memory_configuration.h"
#include "pcps_acquisition_adapter.h"
#include <boost/make_shared.hpp>
#include <gnuradio/analog/sig_source_waveform.h>
#include <gnuradio/blocks/file_source.h>
@@ -163,7 +163,7 @@ void GlonassL1CaPcpsAcquisitionTest::init()
config->set_property("Acquisition_1G.coherent_integration_time_ms", "1");
config->set_property("Acquisition_1G.dump", "true");
config->set_property("Acquisition_1G.dump_filename", "./acquisition");
config->set_property("Acquisition_1G.implementation", "Glonass_L1_CA_PCPS_Acquisition");
config->set_property("Acquisition_1G.implementation", "GLONASS_L1_CA_PCPS_Acquisition");
config->set_property("Acquisition_1G.threshold", "0.005");
config->set_property("Acquisition_1G.doppler_max", "5000");
config->set_property("Acquisition_1G.doppler_step", "500");
@@ -175,7 +175,7 @@ void GlonassL1CaPcpsAcquisitionTest::init()
TEST_F(GlonassL1CaPcpsAcquisitionTest, Instantiate)
{
init();
auto acquisition = gnss_make_shared<GlonassL1CaPcpsAcquisition>(config.get(), "Acquisition_1G", 1, 0);
auto acquisition = gnss_make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition_1G", "GLONASS_L1_CA_PCPS_Acquisition", 1, 0, GLO_1G);
}
@@ -189,7 +189,7 @@ TEST_F(GlonassL1CaPcpsAcquisitionTest, ConnectAndRun)
top_block = gr::make_top_block("Acquisition test");
init();
auto acquisition = gnss_make_shared<GlonassL1CaPcpsAcquisition>(config.get(), "Acquisition_1G", 1, 0);
auto acquisition = gnss_make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition_1G", "GLONASS_L1_CA_PCPS_Acquisition", 1, 0, GLO_1G);
auto msg_rx = GlonassL1CaPcpsAcquisitionTest_msg_rx_make();
@@ -222,7 +222,7 @@ TEST_F(GlonassL1CaPcpsAcquisitionTest, ValidationOfResults)
double expected_delay_samples = 31874;
double expected_doppler_hz = -9500;
init();
std::shared_ptr<GlonassL1CaPcpsAcquisition> acquisition = std::make_shared<GlonassL1CaPcpsAcquisition>(config.get(), "Acquisition_1G", 1, 0);
std::shared_ptr<PcpsAcquisitionAdapter> acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition_1G", "GLONASS_L1_CA_PCPS_Acquisition", 1, 0, GLO_1G);
std::shared_ptr<FreqXlatingFirFilter> input_filter = std::make_shared<FreqXlatingFirFilter>(config.get(), "InputFilter", 1, 1);
auto msg_rx = GlonassL1CaPcpsAcquisitionTest_msg_rx_make();
tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
+5 -5
View File
@@ -1,7 +1,7 @@
/*!
* \file gps_l2_m_pcps_acquisition_test.cc
* \brief This class implements an acquisition test for
* GpsL1CaPcpsAcquisition class based on some input parameters.
* PcpsAcquisitionAdapter class based on some input parameters for GPS L2C
* \author Javier Arribas, 2015 (jarribas@cttc.es)
*
*
@@ -25,8 +25,8 @@
#include "gnss_sdr_valve.h"
#include "gnss_synchro.h"
#include "gnuplot_i.h"
#include "gps_l2_m_pcps_acquisition.h"
#include "in_memory_configuration.h"
#include "pcps_acquisition_adapter.h"
#include "test_flags.h"
#include <boost/make_shared.hpp>
#include <gnuradio/analog/sig_source_waveform.h>
@@ -259,7 +259,7 @@ TEST_F(GpsL2MPcpsAcquisitionTest, Instantiate)
{
init();
queue = std::make_shared<Concurrent_Queue<pmt::pmt_t>>();
std::shared_ptr<GpsL2MPcpsAcquisition> acquisition = std::make_shared<GpsL2MPcpsAcquisition>(config.get(), "Acquisition_2S", 1, 0);
std::shared_ptr<PcpsAcquisitionAdapter> acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition_2S", "GPS_L2_M_PCPS_Acquisition", 1, 0, GPS_2S);
}
@@ -271,7 +271,7 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ConnectAndRun)
queue = std::make_shared<Concurrent_Queue<pmt::pmt_t>>();
init();
std::shared_ptr<GpsL2MPcpsAcquisition> acquisition = std::make_shared<GpsL2MPcpsAcquisition>(config.get(), "Acquisition_2S", 1, 0);
std::shared_ptr<PcpsAcquisitionAdapter> acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition_2S", "GPS_L2_M_PCPS_Acquisition", 1, 0, GPS_2S);
ASSERT_NO_THROW({
acquisition->connect(top_block);
@@ -317,7 +317,7 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults)
}
init();
std::shared_ptr<GpsL2MPcpsAcquisition> acquisition = std::make_shared<GpsL2MPcpsAcquisition>(config.get(), "Acquisition_2S", 1, 0);
std::shared_ptr<PcpsAcquisitionAdapter> acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition_2S", "GPS_L2_M_PCPS_Acquisition", 1, 0, GPS_2S);
auto msg_rx = GpsL2MPcpsAcquisitionTest_msg_rx_make();
ASSERT_NO_THROW({
tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
+7 -12
View File
@@ -21,26 +21,21 @@
#include "GPS_L5.h"
#include "Galileo_E1.h"
#include "Galileo_E5a.h"
#include "acquisition_interface.h"
#include "acquisition_msg_rx.h"
#include "dll_pll_tracking_adapter.h"
#include "galileo_e1_pcps_ambiguous_acquisition.h"
#include "galileo_e5a_noncoherent_iq_acquisition_caf.h"
#include "galileo_e5a_pcps_acquisition.h"
#include "glonass_l1_ca_pcps_acquisition.h"
#include "glonass_l2_ca_pcps_acquisition.h"
#include "gnss_block_factory.h"
#include "gnss_block_interface.h"
#include "gnss_satellite.h"
#include "gnss_sdr_sample_counter.h"
#include "gnss_synchro.h"
#include "gnuplot_i.h"
#include "gps_l1_ca_pcps_acquisition.h"
#include "gps_l2_m_pcps_acquisition.h"
#include "gps_l5i_pcps_acquisition.h"
#include "hybrid_observables.h"
#include "in_memory_configuration.h"
#include "observable_tests_flags.h"
#include "observables_dump_reader.h"
#include "pcps_acquisition_adapter.h"
#include "signal_generator_flags.h"
#include "telemetry_decoder_interface.h"
#include "test_flags.h"
@@ -452,7 +447,7 @@ bool HybridObservablesTest::acquire_signal()
#else
config->set_property("Acquisition.max_dwells", std::to_string(absl::GetFlag(FLAGS_external_signal_acquisition_dwells)));
#endif
acquisition = std::make_shared<GpsL1CaPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", "GPS_L1_CA_PCPS_Acquisition", 1, 0, GPS_1C);
}
else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking")
{
@@ -467,7 +462,7 @@ bool HybridObservablesTest::acquire_signal()
#else
config->set_property("Acquisition.max_dwells", std::to_string(absl::GetFlag(FLAGS_external_signal_acquisition_dwells)));
#endif
acquisition = std::make_shared<GalileoE1PcpsAmbiguousAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 0, GAL_1B);
}
else if (implementation == "GPS_L2_M_DLL_PLL_Tracking")
{
@@ -482,7 +477,7 @@ bool HybridObservablesTest::acquire_signal()
#else
config->set_property("Acquisition.max_dwells", std::to_string(absl::GetFlag(FLAGS_external_signal_acquisition_dwells)));
#endif
acquisition = std::make_shared<GpsL2MPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", "GPS_L2_M_PCPS_Acquisition", 1, 0, GPS_2S);
}
else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_b")
{
@@ -517,7 +512,7 @@ bool HybridObservablesTest::acquire_signal()
#else
config->set_property("Acquisition.max_dwells", std::to_string(absl::GetFlag(FLAGS_external_signal_acquisition_dwells)));
#endif
acquisition = std::make_shared<GalileoE5aPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", "Galileo_E5a_Pcps_Acquisition", 1, 0, GAL_E5a);
}
else if (implementation == "GPS_L5_DLL_PLL_Tracking")
{
@@ -532,7 +527,7 @@ bool HybridObservablesTest::acquire_signal()
#else
config->set_property("Acquisition.max_dwells", std::to_string(absl::GetFlag(FLAGS_external_signal_acquisition_dwells)));
#endif
acquisition = std::make_shared<GpsL5iPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", "GPS_L5i_PCPS_Acquisition", 1, 0, GPS_L5);
}
else
{
tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
+7 -10
View File
@@ -21,21 +21,18 @@
#include "GPS_L5.h"
#include "Galileo_E1.h"
#include "Galileo_E5a.h"
#include "acquisition_interface.h"
#include "acquisition_msg_rx.h"
#include "concurrent_queue.h"
#include "galileo_e1_pcps_ambiguous_acquisition.h"
#include "galileo_e5a_noncoherent_iq_acquisition_caf.h"
#include "galileo_e5a_pcps_acquisition.h"
#include "gnss_block_factory.h"
#include "gnss_block_interface.h"
#include "gnss_sdr_filesystem.h"
#include "gnss_sdr_valve.h"
#include "gnuplot_i.h"
#include "gps_l1_ca_pcps_acquisition.h"
#include "gps_l1_ca_pcps_acquisition_fine_doppler.h"
#include "gps_l2_m_pcps_acquisition.h"
#include "gps_l5i_pcps_acquisition.h"
#include "in_memory_configuration.h"
#include "pcps_acquisition_adapter.h"
#include "signal_generator_flags.h"
#include "test_flags.h"
#include "tracking_dump_reader.h"
@@ -451,7 +448,7 @@ bool TrackingPullInTest::acquire_signal(int SV_ID)
config->set_property("Acquisition.max_dwells", std::to_string(absl::GetFlag(FLAGS_external_signal_acquisition_dwells)));
#endif
// acquisition = std::make_shared<GpsL1CaPcpsAcquisitionFineDoppler>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<GpsL1CaPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", "GPS_L1_CA_PCPS_Acquisition", 1, 0, GPS_1C);
}
else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking")
{
@@ -466,7 +463,7 @@ bool TrackingPullInTest::acquire_signal(int SV_ID)
#else
config->set_property("Acquisition.max_dwells", std::to_string(absl::GetFlag(FLAGS_external_signal_acquisition_dwells)));
#endif
acquisition = std::make_shared<GalileoE1PcpsAmbiguousAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 0, GAL_1B);
}
else if (implementation == "GPS_L2_M_DLL_PLL_Tracking")
{
@@ -481,7 +478,7 @@ bool TrackingPullInTest::acquire_signal(int SV_ID)
#else
config->set_property("Acquisition.max_dwells", std::to_string(absl::GetFlag(FLAGS_external_signal_acquisition_dwells)));
#endif
acquisition = std::make_shared<GpsL2MPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", "GPS_L2_M_PCPS_Acquisition", 1, 0, GPS_2S);
}
else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_b")
{
@@ -516,7 +513,7 @@ bool TrackingPullInTest::acquire_signal(int SV_ID)
#else
config->set_property("Acquisition.max_dwells", std::to_string(absl::GetFlag(FLAGS_external_signal_acquisition_dwells)));
#endif
acquisition = std::make_shared<GalileoE5aPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", "Galileo_E5a_Pcps_Acquisition", 1, 0, GAL_E5a);
}
else if (implementation == "GPS_L5_DLL_PLL_Tracking")
{
@@ -531,7 +528,7 @@ bool TrackingPullInTest::acquire_signal(int SV_ID)
#else
config->set_property("Acquisition.max_dwells", std::to_string(absl::GetFlag(FLAGS_external_signal_acquisition_dwells)));
#endif
acquisition = std::make_shared<GpsL5iPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
acquisition = std::make_shared<PcpsAcquisitionAdapter>(config.get(), "Acquisition", "GPS_L5i_PCPS_Acquisition", 1, 0, GPS_L5);
}
else
{