From 86658c23913b6ff3bbeb21294272ec06962b0c46 Mon Sep 17 00:00:00 2001 From: Javier Arribas Date: Mon, 25 Apr 2016 15:20:42 +0200 Subject: [PATCH 1/7] Migration of acquisition test to new message system --- .../gps_l1_ca_pcps_acquisition_test.cc | 105 +++++++++++------- src/tests/test_main.cc | 2 +- 2 files changed, 68 insertions(+), 39 deletions(-) diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc index 96cd016a2..7287dc721 100644 --- a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc @@ -51,12 +51,64 @@ #include "gps_l1_ca_pcps_acquisition.h" + +// ######## GNURADIO BLOCK MESSAGE RECEVER ######### +class GpsL1CaPcpsAcquisitionTest_msg_rx; + +typedef boost::shared_ptr GpsL1CaPcpsAcquisitionTest_msg_rx_sptr; + +GpsL1CaPcpsAcquisitionTest_msg_rx_sptr GpsL1CaPcpsAcquisitionTest_msg_rx_make(); + +class GpsL1CaPcpsAcquisitionTest_msg_rx : public gr::block +{ +private: + friend GpsL1CaPcpsAcquisitionTest_msg_rx_sptr GpsL1CaPcpsAcquisitionTest_msg_rx_make(); + void msg_handler_events(pmt::pmt_t msg); + GpsL1CaPcpsAcquisitionTest_msg_rx(); + +public: + int* rx_message; + ~GpsL1CaPcpsAcquisitionTest_msg_rx(); //!< Default destructor + +}; + +GpsL1CaPcpsAcquisitionTest_msg_rx_sptr GpsL1CaPcpsAcquisitionTest_msg_rx_make() +{ + return GpsL1CaPcpsAcquisitionTest_msg_rx_sptr(new GpsL1CaPcpsAcquisitionTest_msg_rx()); +} + +void GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +{ + try { + long int message=pmt::to_long(msg); + *rx_message=message; + }catch(boost::bad_any_cast& e) + { + LOG(WARNING) << "msg_handler_telemetry Bad any cast!\n"; + *rx_message = 0; + } +} + +GpsL1CaPcpsAcquisitionTest_msg_rx::GpsL1CaPcpsAcquisitionTest_msg_rx() : + gr::block("GpsL1CaPcpsAcquisitionTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)) +{ + + this->message_port_register_in(pmt::mp("events")); + this->set_msg_handler(pmt::mp("events"), boost::bind(&GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + +} + +GpsL1CaPcpsAcquisitionTest_msg_rx::~GpsL1CaPcpsAcquisitionTest_msg_rx() +{} + + +// ########################################################### + class GpsL1CaPcpsAcquisitionTest: public ::testing::Test { protected: GpsL1CaPcpsAcquisitionTest() { - //queue = gr::msg_queue::make(0); factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); @@ -69,9 +121,6 @@ protected: {} void init(); - void start_queue(); - void wait_message(); - void stop_queue(); gr::msg_queue::sptr queue; gr::top_block_sptr top_block; @@ -92,7 +141,7 @@ void GpsL1CaPcpsAcquisitionTest::init() std::string signal = "1C"; signal.copy(gnss_synchro.Signal, 2, 0); gnss_synchro.PRN = 1; - + queue = gr::msg_queue::make(0); config->set_property("GNSS-SDR.internal_fs_hz", "4000000"); config->set_property("Acquisition.item_type", "gr_complex"); config->set_property("Acquisition.if", "0"); @@ -107,35 +156,11 @@ void GpsL1CaPcpsAcquisitionTest::init() } -void GpsL1CaPcpsAcquisitionTest::start_queue() -{ - ch_thread = boost::thread(&GpsL1CaPcpsAcquisitionTest::wait_message, this); -} - - -void GpsL1CaPcpsAcquisitionTest::wait_message() -{ - while (!stop) - { - channel_internal_queue.wait_and_pop(message); - stop_queue(); - } -} - - - -void GpsL1CaPcpsAcquisitionTest::stop_queue() -{ - stop = true; -} - - TEST_F(GpsL1CaPcpsAcquisitionTest, Instantiate) { init(); - queue = gr::msg_queue::make(0); - std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); + boost::shared_ptr acquisition = boost::make_shared(config.get(), "Acquisition", 1, 1); } TEST_F(GpsL1CaPcpsAcquisitionTest, ConnectAndRun) @@ -145,11 +170,13 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ConnectAndRun) struct timeval tv; long long int begin = 0; long long int end = 0; - top_block = gr::make_top_block("Acquisition test"); - queue = gr::msg_queue::make(0); + int message=0; + top_block = gr::make_top_block("Acquisition test"); init(); - std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); + boost::shared_ptr acquisition = boost::make_shared(config.get(), "Acquisition", 1, 1); + boost::shared_ptr msg_rx = GpsL1CaPcpsAcquisitionTest_msg_rx_make(); + msg_rx->rx_message=&message; // set message pointer to get last acquisition message ASSERT_NO_THROW( { acquisition->connect(top_block); @@ -157,6 +184,8 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ConnectAndRun) boost::shared_ptr valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue); top_block->connect(source, 0, valve, 0); top_block->connect(valve, 0, acquisition->get_left_block(), 0); + top_block->msg_connect(acquisition->get_right_block(),pmt::mp("events"), msg_rx,pmt::mp("events")); + }) << "Failure connecting the blocks of acquisition test." << std::endl; EXPECT_NO_THROW( { @@ -176,14 +205,14 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ValidationOfResults) long long int begin = 0; long long int end = 0; top_block = gr::make_top_block("Acquisition test"); - queue = gr::msg_queue::make(0); double expected_delay_samples = 524; double expected_doppler_hz = 1680; init(); - start_queue(); std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); - + int message=0; + boost::shared_ptr msg_rx = GpsL1CaPcpsAcquisitionTest_msg_rx_make(); + msg_rx->rx_message=&message; // set message pointer to get last acquisition message ASSERT_NO_THROW( { acquisition->set_channel(1); @@ -216,6 +245,7 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ValidationOfResults) const char * file_name = file.c_str(); gr::blocks::file_source::sptr file_source = gr::blocks::file_source::make(sizeof(gr_complex), file_name, false); top_block->connect(file_source, 0, acquisition->get_left_block(), 0); + top_block->msg_connect(acquisition->get_right_block(),pmt::mp("events"), msg_rx,pmt::mp("events")); }) << "Failure connecting the blocks of acquisition test." << std::endl; @@ -230,12 +260,11 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ValidationOfResults) end = tv.tv_sec * 1000000 + tv.tv_usec; }) << "Failure running the top_block." << std::endl; - stop_queue(); unsigned long int nsamples = gnss_synchro.Acq_samplestamp_samples; std::cout << "Acquired " << nsamples << " samples in " << (end - begin) << " microseconds" << std::endl; - ASSERT_EQ(1, message) << "Acquisition failure. Expected message: 1=ACQ SUCCESS."; + ASSERT_EQ(1, *(msg_rx->rx_message)) << "Acquisition failure. Expected message: 1=ACQ SUCCESS."; double delay_error_samples = std::abs(expected_delay_samples - gnss_synchro.Acq_delay_samples); float delay_error_chips = (float)(delay_error_samples * 1023 / 4000); diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc index a9e63f93f..9e5130877 100644 --- a/src/tests/test_main.cc +++ b/src/tests/test_main.cc @@ -86,7 +86,7 @@ DECLARE_string(log_dir); #include "gnss_block/rtcm_printer_test.cc" #include "gnss_block/file_signal_source_test.cc" #include "gnss_block/fir_filter_test.cc" -//#include "gnss_block/gps_l1_ca_pcps_acquisition_test.cc" +#include "gnss_block/gps_l1_ca_pcps_acquisition_test.cc" //#include "gnss_block/gps_l2_m_pcps_acquisition_test.cc" //#include "gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc" //#include "gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc" From 7d62ef367a0aac65671542cfaacbe464c3a411e5 Mon Sep 17 00:00:00 2001 From: Javier Arribas Date: Mon, 25 Apr 2016 15:31:30 +0200 Subject: [PATCH 2/7] Acquisition unit test migrated to new message system --- .../gps_l1_ca_pcps_acquisition_test.cc | 6 - .../gps_l2_m_pcps_acquisition_test.cc | 105 ++++++++++-------- src/tests/test_main.cc | 2 +- 3 files changed, 61 insertions(+), 52 deletions(-) diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc index 7287dc721..bbd6b3b87 100644 --- a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc @@ -112,8 +112,6 @@ protected: factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); - stop = false; - message = 0; gnss_synchro = Gnss_Synchro(); } @@ -128,9 +126,6 @@ protected: std::shared_ptr config; Gnss_Synchro gnss_synchro; size_t item_size; - bool stop; - int message; - boost::thread ch_thread; }; @@ -273,5 +268,4 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ValidationOfResults) EXPECT_LE(doppler_error_hz, 666) << "Doppler error exceeds the expected value: 666 Hz = 2/(3*integration period)"; EXPECT_LT(delay_error_chips, 0.5) << "Delay error exceeds the expected value: 0.5 chips"; - ch_thread.join(); } diff --git a/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc b/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc index 46d10ebc7..02e3e30d2 100644 --- a/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc +++ b/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc @@ -55,17 +55,66 @@ #include "GPS_L2C.h" +// ######## GNURADIO BLOCK MESSAGE RECEVER ######### +class GpsL2MPcpsAcquisitionTest_msg_rx; + +typedef boost::shared_ptr GpsL2MPcpsAcquisitionTest_msg_rx_sptr; + +GpsL2MPcpsAcquisitionTest_msg_rx_sptr GpsL2MPcpsAcquisitionTest_msg_rx_make(); + +class GpsL2MPcpsAcquisitionTest_msg_rx : public gr::block +{ +private: + friend GpsL2MPcpsAcquisitionTest_msg_rx_sptr GpsL2MPcpsAcquisitionTest_msg_rx_make(); + void msg_handler_events(pmt::pmt_t msg); + GpsL2MPcpsAcquisitionTest_msg_rx(); + +public: + int* rx_message; + ~GpsL2MPcpsAcquisitionTest_msg_rx(); //!< Default destructor + +}; + +GpsL2MPcpsAcquisitionTest_msg_rx_sptr GpsL2MPcpsAcquisitionTest_msg_rx_make() +{ + return GpsL2MPcpsAcquisitionTest_msg_rx_sptr(new GpsL2MPcpsAcquisitionTest_msg_rx()); +} + +void GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +{ + try { + long int message=pmt::to_long(msg); + *rx_message=message; + }catch(boost::bad_any_cast& e) + { + LOG(WARNING) << "msg_handler_telemetry Bad any cast!\n"; + *rx_message = 0; + } +} + +GpsL2MPcpsAcquisitionTest_msg_rx::GpsL2MPcpsAcquisitionTest_msg_rx() : + gr::block("GpsL2MPcpsAcquisitionTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)) +{ + + this->message_port_register_in(pmt::mp("events")); + this->set_msg_handler(pmt::mp("events"), boost::bind(&GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + +} + +GpsL2MPcpsAcquisitionTest_msg_rx::~GpsL2MPcpsAcquisitionTest_msg_rx() +{} + + +// ########################################################### + class GpsL2MPcpsAcquisitionTest: public ::testing::Test { protected: GpsL2MPcpsAcquisitionTest() { - //queue = gr::msg_queue::make(0); factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); - stop = false; - message = 0; sampling_freqeuncy_hz = 0; nsamples = 0; gnss_synchro = Gnss_Synchro(); @@ -75,9 +124,6 @@ protected: {} void init(); - void start_queue(); - void wait_message(); - void stop_queue(); gr::msg_queue::sptr queue; gr::top_block_sptr top_block; @@ -85,10 +131,6 @@ protected: std::shared_ptr config; Gnss_Synchro gnss_synchro; size_t item_size; - bool stop; - int message; - boost::thread ch_thread; - int sampling_freqeuncy_hz; int nsamples; }; @@ -119,30 +161,6 @@ void GpsL2MPcpsAcquisitionTest::init() } -void GpsL2MPcpsAcquisitionTest::start_queue() -{ - ch_thread = boost::thread(&GpsL2MPcpsAcquisitionTest::wait_message, this); -} - - -void GpsL2MPcpsAcquisitionTest::wait_message() -{ - while (!stop) - { - channel_internal_queue.wait_and_pop(message); - stop_queue(); - } -} - - - -void GpsL2MPcpsAcquisitionTest::stop_queue() -{ - stop = true; -} - - - TEST_F(GpsL2MPcpsAcquisitionTest, Instantiate) { init(); @@ -155,6 +173,7 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ConnectAndRun) struct timeval tv; long long int begin = 0; long long int end = 0; + int message=0; top_block = gr::make_top_block("Acquisition test"); queue = gr::msg_queue::make(0); @@ -167,6 +186,8 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ConnectAndRun) boost::shared_ptr valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue); top_block->connect(source, 0, valve, 0); top_block->connect(valve, 0, acquisition->get_left_block(), 0); + boost::shared_ptr msg_rx = GpsL1CaPcpsAcquisitionTest_msg_rx_make(); + msg_rx->rx_message=&message; // set message pointer to get last acquisition message }) << "Failure connecting the blocks of acquisition test." << std::endl; EXPECT_NO_THROW( { @@ -185,16 +206,15 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults) struct timeval tv; long long int begin = 0; long long int end = 0; + int message=0; top_block = gr::make_top_block("Acquisition test"); queue = gr::msg_queue::make(0); - - double expected_delay_samples = 1;//2004; double expected_doppler_hz = 1200;//3000; init(); - start_queue(); std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); - + boost::shared_ptr msg_rx = GpsL1CaPcpsAcquisitionTest_msg_rx_make(); + msg_rx->rx_message=&message; // set message pointer to get last acquisition message ASSERT_NO_THROW( { acquisition->set_channel(1); @@ -230,12 +250,11 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults) //gr::blocks::interleaved_short_to_complex::sptr gr_interleaved_short_to_complex_ = gr::blocks::interleaved_short_to_complex::make(); //gr::blocks::char_to_short::sptr gr_char_to_short_ = gr::blocks::char_to_short::make(); boost::shared_ptr valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue); - //top_block->connect(file_source, 0, gr_char_to_short_, 0); //top_block->connect(gr_char_to_short_, 0, gr_interleaved_short_to_complex_ , 0); top_block->connect(file_source, 0, valve , 0); top_block->connect(valve, 0, acquisition->get_left_block(), 0); - + top_block->msg_connect(acquisition->get_right_block(),pmt::mp("events"), msg_rx,pmt::mp("events")); }) << "Failure connecting the blocks of acquisition test." << std::endl; @@ -252,16 +271,13 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults) end = tv.tv_sec * 1000000 + tv.tv_usec; }) << "Failure running the top_block." << std::endl; - stop_queue(); - //unsigned long int Acq_samplestamp_samples = gnss_synchro.Acq_samplestamp_samples; std::cout << "Acquisition process runtime duration: " << (end - begin) << " microseconds" << std::endl; std::cout << "gnss_synchro.Acq_doppler_hz = " << gnss_synchro.Acq_doppler_hz << " Hz" << std::endl; std::cout << "gnss_synchro.Acq_delay_samples = " << gnss_synchro.Acq_delay_samples << " Samples" << std::endl; - - ASSERT_EQ(1, message) << "Acquisition failure. Expected message: 1=ACQ SUCCESS."; + ASSERT_EQ(1, *(msg_rx->rx_message)) << "Acquisition failure. Expected message: 1=ACQ SUCCESS."; double delay_error_samples = std::abs(expected_delay_samples - gnss_synchro.Acq_delay_samples); float delay_error_chips = (float)(delay_error_samples * 1023 / 4000); @@ -270,5 +286,4 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults) EXPECT_LE(doppler_error_hz, 200) << "Doppler error exceeds the expected value: 666 Hz = 2/(3*integration period)"; EXPECT_LT(delay_error_chips, 0.5) << "Delay error exceeds the expected value: 0.5 chips"; - ch_thread.join(); } diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc index 9e5130877..dcce9e49e 100644 --- a/src/tests/test_main.cc +++ b/src/tests/test_main.cc @@ -87,7 +87,7 @@ DECLARE_string(log_dir); #include "gnss_block/file_signal_source_test.cc" #include "gnss_block/fir_filter_test.cc" #include "gnss_block/gps_l1_ca_pcps_acquisition_test.cc" -//#include "gnss_block/gps_l2_m_pcps_acquisition_test.cc" +#include "gnss_block/gps_l2_m_pcps_acquisition_test.cc" //#include "gnss_block/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc" //#include "gnss_block/gps_l1_ca_pcps_multithread_acquisition_gsoc2013_test.cc" //#if OPENCL_BLOCKS_TEST From 5b30b3f8c61a9fbbd8e805957c338080b748f8e7 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 25 Apr 2016 15:38:31 +0200 Subject: [PATCH 3/7] adding missing include --- src/tests/test_main.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc index dcce9e49e..4dd34e4d5 100644 --- a/src/tests/test_main.cc +++ b/src/tests/test_main.cc @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include From 76f9ea0e07cff091cab341415b8f30820bd73715 Mon Sep 17 00:00:00 2001 From: Javier Arribas Date: Mon, 25 Apr 2016 15:53:01 +0200 Subject: [PATCH 4/7] Re-enabling more tests and bug fixes --- ...ileo_e1_pcps_ambiguous_acquisition_test.cc | 101 +++++++++++------- ...cps_acquisition_gsoc2014_gensource_test.cc | 2 +- .../gps_l1_ca_pcps_acquisition_test.cc | 1 + .../gps_l2_m_dll_pll_tracking_test.cc | 74 ++++++++++--- .../gps_l2_m_pcps_acquisition_test.cc | 7 +- src/tests/test_main.cc | 4 +- 6 files changed, 129 insertions(+), 60 deletions(-) diff --git a/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc index 917e030ea..22544821c 100644 --- a/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc +++ b/src/tests/gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -50,6 +51,58 @@ #include "galileo_e1_pcps_ambiguous_acquisition.h" +// ######## GNURADIO BLOCK MESSAGE RECEVER ######### +class GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx; + +typedef boost::shared_ptr GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr; + +GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_make(); + +class GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx : public gr::block +{ +private: + friend GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_make(); + void msg_handler_events(pmt::pmt_t msg); + GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx(); + +public: + int* rx_message; + ~GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx(); //!< Default destructor + +}; + +GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_make() +{ + return GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr(new GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx()); +} + +void GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +{ + try { + long int message=pmt::to_long(msg); + *rx_message=message; + }catch(boost::bad_any_cast& e) + { + LOG(WARNING) << "msg_handler_telemetry Bad any cast!\n"; + *rx_message = 0; + } +} + +GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx() : + gr::block("GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)) +{ + + this->message_port_register_in(pmt::mp("events")); + this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, _1)); + +} + +GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::~GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx() +{} + + +// ########################################################### + class GalileoE1PcpsAmbiguousAcquisitionTest: public ::testing::Test { protected: @@ -58,8 +111,6 @@ protected: factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); - stop = false; - message = 0; gnss_synchro = Gnss_Synchro(); } @@ -67,9 +118,6 @@ protected: {} void init(); - void start_queue(); - void wait_message(); - void stop_queue(); gr::msg_queue::sptr queue; gr::top_block_sptr top_block; @@ -77,9 +125,6 @@ protected: std::shared_ptr config; Gnss_Synchro gnss_synchro; size_t item_size; - bool stop; - int message; - boost::thread ch_thread; }; @@ -104,29 +149,6 @@ void GalileoE1PcpsAmbiguousAcquisitionTest::init() config->set_property("Acquisition1.cboc", "true"); } -void GalileoE1PcpsAmbiguousAcquisitionTest::start_queue() -{ - stop = false; - ch_thread = boost::thread(&GalileoE1PcpsAmbiguousAcquisitionTest::wait_message, this); -} - - -void GalileoE1PcpsAmbiguousAcquisitionTest::wait_message() -{ - while (!stop) - { - channel_internal_queue.wait_and_pop(message); - stop_queue(); - } -} - -void GalileoE1PcpsAmbiguousAcquisitionTest::stop_queue() -{ - stop = true; -} - - - TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, Instantiate) { init(); @@ -142,11 +164,14 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ConnectAndRun) struct timeval tv; long long int begin = 0; long long int end = 0; + int message=0; top_block = gr::make_top_block("Acquisition test"); queue = gr::msg_queue::make(0); init(); std::shared_ptr acq_ = factory->GetBlock(config, "Acquisition", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 1, queue); std::shared_ptr acquisition = std::dynamic_pointer_cast(acq_); + boost::shared_ptr msg_rx = GpsL2MPcpsAcquisitionTest_msg_rx_make(); + msg_rx->rx_message=&message; // set message pointer to get last acquisition message ASSERT_NO_THROW( { acquisition->connect(top_block); @@ -154,6 +179,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ConnectAndRun) boost::shared_ptr valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue); top_block->connect(source, 0, valve, 0); top_block->connect(valve, 0, acquisition->get_left_block(), 0); + top_block->msg_connect(acquisition->get_right_block(),pmt::mp("events"), msg_rx,pmt::mp("events")); }) << "Failure connecting the blocks of acquisition test." << std::endl; EXPECT_NO_THROW( { @@ -172,6 +198,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults) struct timeval tv; long long int begin = 0; long long int end = 0; + int message=0; double expected_delay_samples = 2920; //18250; double expected_doppler_hz = -632; init(); @@ -179,6 +206,8 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults) queue = gr::msg_queue::make(0); std::shared_ptr acq_ = factory->GetBlock(config, "Acquisition", "Galileo_E1_PCPS_Ambiguous_Acquisition", 1, 1, queue); std::shared_ptr acquisition = std::dynamic_pointer_cast(acq_); + boost::shared_ptr msg_rx = GpsL2MPcpsAcquisitionTest_msg_rx_make(); + msg_rx->rx_message=&message; // set message pointer to get last acquisition message ASSERT_NO_THROW( { acquisition->set_channel(gnss_synchro.Channel_ID); @@ -210,12 +239,9 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults) const char * file_name = file.c_str(); gr::blocks::file_source::sptr file_source = gr::blocks::file_source::make(sizeof(gr_complex), file_name, false); top_block->connect(file_source, 0, acquisition->get_left_block(), 0); + top_block->msg_connect(acquisition->get_right_block(),pmt::mp("events"), msg_rx,pmt::mp("events")); }) << "Failure connecting the blocks of acquisition test." << std::endl; - ASSERT_NO_THROW( { - start_queue(); - }) << "Failure while starting the queue" << std::endl; - acquisition->init(); acquisition->reset(); acquisition->set_state(1); @@ -227,11 +253,10 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults) gettimeofday(&tv, NULL); end = tv.tv_sec * 1000000 + tv.tv_usec; }) << "Failure running the top_block." << std::endl; - stop_queue(); unsigned long int nsamples = gnss_synchro.Acq_samplestamp_samples; std::cout << "Acquired " << nsamples << " samples in " << (end - begin) << " microseconds" << std::endl; - EXPECT_EQ(1, message) << "Acquisition failure. Expected message: 1=ACQ SUCCESS."; + ASSERT_EQ(1, *(msg_rx->rx_message)) << "Acquisition failure. Expected message: 1=ACQ SUCCESS."; std::cout << "Delay: " << gnss_synchro.Acq_delay_samples << std::endl; std::cout << "Doppler: " << gnss_synchro.Acq_doppler_hz << std::endl; @@ -242,7 +267,5 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults) EXPECT_LE(doppler_error_hz, 166) << "Doppler error exceeds the expected value: 166 Hz = 2/(3*integration period)"; EXPECT_LT(delay_error_chips, 0.175) << "Delay error exceeds the expected value: 0.175 chips"; - - ch_thread.join(); } diff --git a/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc index 6a5556b2a..fa5582dba 100644 --- a/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc +++ b/src/tests/gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc @@ -52,7 +52,7 @@ #include "pass_through.h" #include "gnss_block_factory.h" - +z class GalileoE5aPcpsAcquisitionGSoC2014GensourceTest: public ::testing::Test { protected: diff --git a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc index bbd6b3b87..3428b5542 100644 --- a/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc +++ b/src/tests/gnss_block/gps_l1_ca_pcps_acquisition_test.cc @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include diff --git a/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc b/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc index a340f9b11..a289aefc1 100644 --- a/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc +++ b/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc @@ -50,6 +50,59 @@ #include "gps_l2_m_dll_pll_tracking.h" +// ######## GNURADIO BLOCK MESSAGE RECEVER ######### +class GpsL2MDllPllTrackingTest_msg_rx; + +typedef boost::shared_ptr GpsL2MDllPllTrackingTest_msg_rx_sptr; + +GpsL2MDllPllTrackingTest_msg_rx_sptr GpsL2MDllPllTrackingTest_msg_rx_make(); + +class GpsL2MDllPllTrackingTest_msg_rx : public gr::block +{ +private: + friend GpsL2MDllPllTrackingTest_msg_rx_sptr GpsL2MDllPllTrackingTest_msg_rx_make(); + void msg_handler_events(pmt::pmt_t msg); + GpsL2MDllPllTrackingTest_msg_rx(); + +public: + int* rx_message; + ~GpsL2MDllPllTrackingTest_msg_rx(); //!< Default destructor + +}; + +GpsL2MDllPllTrackingTest_msg_rx_sptr GpsL2MDllPllTrackingTest_msg_rx_make() +{ + return GpsL2MDllPllTrackingTest_msg_rx_sptr(new GpsL2MDllPllTrackingTest_msg_rx()); +} + +void GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg) +{ + try { + long int message=pmt::to_long(msg); + *rx_message=message; + }catch(boost::bad_any_cast& e) + { + LOG(WARNING) << "msg_handler_telemetry Bad any cast!\n"; + *rx_message = 0; + } +} + +GpsL2MDllPllTrackingTest_msg_rx::GpsL2MDllPllTrackingTest_msg_rx() : + gr::block("GpsL2MDllPllTrackingTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)) +{ + + this->message_port_register_in(pmt::mp("events")); + this->set_msg_handler(pmt::mp("events"), boost::bind(&GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events, this, _1)); + +} + +GpsL2MDllPllTrackingTest_msg_rx::~GpsL2MDllPllTrackingTest_msg_rx() +{} + + +// ########################################################### + + class GpsL2MDllPllTrackingTest: public ::testing::Test { protected: @@ -58,8 +111,6 @@ protected: factory = std::make_shared(); config = std::make_shared(); item_size = sizeof(gr_complex); - stop = false; - message = 0; gnss_synchro = Gnss_Synchro(); } @@ -74,8 +125,6 @@ protected: std::shared_ptr config; Gnss_Synchro gnss_synchro; size_t item_size; - bool stop; - int message; }; @@ -105,15 +154,17 @@ TEST_F(GpsL2MDllPllTrackingTest, ValidationOfResults) long long int end = 0; int fs_in = 5000000; int nsamples = fs_in*9; + int message=0; + init(); queue = gr::msg_queue::make(0); top_block = gr::make_top_block("Tracking test"); - std::shared_ptr tracking = std::make_shared(config.get(), "Tracking_2S", 1, 1, queue); + boost::shared_ptr msg_rx = GpsL2MDllPllTrackingTest_msg_rx_make(); + msg_rx->rx_message=&message; // set message pointer to get last message - //REAL gnss_synchro.Acq_delay_samples = 1; - gnss_synchro.Acq_doppler_hz = 1200;//1200; + gnss_synchro.Acq_doppler_hz = 1200; gnss_synchro.Acq_samplestamp_samples = 0; ASSERT_NO_THROW( { @@ -130,22 +181,16 @@ TEST_F(GpsL2MDllPllTrackingTest, ValidationOfResults) ASSERT_NO_THROW( { //gr::analog::sig_source_c::sptr source = gr::analog::sig_source_c::make(fs_in, gr::analog::GR_SIN_WAVE, 1000, 1, gr_complex(0)); - - std::string path = std::string(TEST_PATH); - //std::string file = path + "signal_samples/GSoC_CTTC_capture_2012_07_26_4Msps_4ms.dat"; - //std::string file = "/datalogger/signals/Fraunhofer/L125_III1b_210s_L2_resampled.bin"; std::string file = path + "/data/gps_l2c_m_prn7_5msps.dat"; const char * file_name = file.c_str(); gr::blocks::file_source::sptr file_source = gr::blocks::file_source::make(sizeof(gr_complex), file_name, false); - - boost::shared_ptr valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue); gr::blocks::null_sink::sptr sink = gr::blocks::null_sink::make(sizeof(Gnss_Synchro)); top_block->connect(file_source, 0, valve, 0); top_block->connect(valve, 0, tracking->get_left_block(), 0); top_block->connect(tracking->get_right_block(), 0, sink, 0); - + top_block->msg_connect(tracking->get_right_block(),pmt::mp("events"), msg_rx,pmt::mp("events")); }) << "Failure connecting the blocks of tracking test." << std::endl; tracking->start_tracking(); @@ -158,6 +203,7 @@ TEST_F(GpsL2MDllPllTrackingTest, ValidationOfResults) end = tv.tv_sec *1000000 + tv.tv_usec; }) << "Failure running the top_block." << std::endl; + // TODO: Verify tracking results std::cout << "Tracked " << nsamples << " samples in " << (end - begin) << " microseconds" << std::endl; } diff --git a/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc b/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc index 02e3e30d2..eafaffa8c 100644 --- a/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc +++ b/src/tests/gnss_block/gps_l2_m_pcps_acquisition_test.cc @@ -1,5 +1,5 @@ /*! - * \file gps_l1_ca_pcps_acquisition_test.cc + * \file gps_l2_m_pcps_acquisition_test.cc * \brief This class implements an acquisition test for * GpsL1CaPcpsAcquisition class based on some input parameters. * \author Javier Arribas, 2015 (jarribas@cttc.es) @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -186,7 +187,7 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ConnectAndRun) boost::shared_ptr valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue); top_block->connect(source, 0, valve, 0); top_block->connect(valve, 0, acquisition->get_left_block(), 0); - boost::shared_ptr msg_rx = GpsL1CaPcpsAcquisitionTest_msg_rx_make(); + boost::shared_ptr msg_rx = GpsL2MPcpsAcquisitionTest_msg_rx_make(); msg_rx->rx_message=&message; // set message pointer to get last acquisition message }) << "Failure connecting the blocks of acquisition test." << std::endl; @@ -213,7 +214,7 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults) double expected_doppler_hz = 1200;//3000; init(); std::shared_ptr acquisition = std::make_shared(config.get(), "Acquisition", 1, 1); - boost::shared_ptr msg_rx = GpsL1CaPcpsAcquisitionTest_msg_rx_make(); + boost::shared_ptr msg_rx = GpsL2MPcpsAcquisitionTest_msg_rx_make(); msg_rx->rx_message=&message; // set message pointer to get last acquisition message ASSERT_NO_THROW( { diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc index 4dd34e4d5..2df342e53 100644 --- a/src/tests/test_main.cc +++ b/src/tests/test_main.cc @@ -96,7 +96,7 @@ DECLARE_string(log_dir); //#endif //#include "gnss_block/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc" //#include "gnss_block/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc" -//#include "gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc" +#include "gnss_block/galileo_e1_pcps_ambiguous_acquisition_test.cc" //#include "gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc" //#include "gnss_block/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc" //#include "gnss_block/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc" @@ -107,8 +107,6 @@ DECLARE_string(log_dir); #include "gnuradio_block/gnss_sdr_valve_test.cc" #include "gnuradio_block/direct_resampler_conditioner_cc_test.cc" -//#include "gnss_block/galileo_e5a_pcps_acquisition_test.cc" -//#include "gnss_block/galileo_e5a_pcps_acquisition_test_2.cc" //#include "gnss_block/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc" #include "gnss_block/galileo_e5a_tracking_test.cc" #include "gnss_block/gps_l2_m_dll_pll_tracking_test.cc" From b8aa2023484029becb2e1f02a83fbe5f669b7931 Mon Sep 17 00:00:00 2001 From: Javier Arribas Date: Mon, 25 Apr 2016 16:03:57 +0200 Subject: [PATCH 5/7] Fix controthread test to use new configuration scheme --- .../control_thread/control_thread_test.cc | 44 +++++++++---------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/src/tests/control_thread/control_thread_test.cc b/src/tests/control_thread/control_thread_test.cc index b31e18005..c5cd15784 100644 --- a/src/tests/control_thread/control_thread_test.cc +++ b/src/tests/control_thread/control_thread_test.cc @@ -62,19 +62,17 @@ TEST(Control_Thread_Test, InstantiateRunControlMessages) config->set_property("SignalSource.repeat", "true"); config->set_property("SignalConditioner.implementation", "Pass_Through"); config->set_property("SignalConditioner.item_type", "gr_complex"); - config->set_property("Channels_GPS.count", "2"); - config->set_property("Channels_Galileo.count", "0"); + config->set_property("Channels_1C.count", "2"); + config->set_property("Channels_1E.count", "0"); config->set_property("Channels.in_acquisition", "1"); - config->set_property("Channel.system", "GPS"); - config->set_property("Channel.signal", "1C"); - config->set_property("Acquisition_GPS.implementation", "GPS_L1_CA_PCPS_Acquisition"); - config->set_property("Acquisition_GPS.threshold", "1"); - config->set_property("Acquisition_GPS.doppler_max", "5000"); - config->set_property("Acquisition_GPS.doppler_min", "-5000"); - config->set_property("Tracking_GPS.implementation", "GPS_L1_CA_DLL_PLL_Tracking"); - config->set_property("Tracking_GPS.item_type", "gr_complex"); - config->set_property("TelemetryDecoder_GPS.implementation", "GPS_L1_CA_Telemetry_Decoder"); - config->set_property("TelemetryDecoder_GPS.item_type", "gr_complex"); + config->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Acquisition"); + config->set_property("Acquisition_1C.threshold", "1"); + config->set_property("Acquisition_1C.doppler_max", "5000"); + config->set_property("Acquisition_1C.doppler_min", "-5000"); + config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_Tracking"); + config->set_property("Tracking_1C.item_type", "gr_complex"); + config->set_property("TelemetryDecoder_1C.implementation", "GPS_L1_CA_Telemetry_Decoder"); + config->set_property("TelemetryDecoder_1C.item_type", "gr_complex"); config->set_property("Observables.implementation", "GPS_L1_CA_Observables"); config->set_property("Observables.item_type", "gr_complex"); config->set_property("PVT.implementation", "GPS_L1_CA_PVT"); @@ -127,19 +125,17 @@ TEST(Control_Thread_Test, InstantiateRunControlMessages2) config->set_property("SignalSource.repeat", "true"); config->set_property("SignalConditioner.implementation", "Pass_Through"); config->set_property("SignalConditioner.item_type", "gr_complex"); - config->set_property("Channels_GPS.count", "4"); - config->set_property("Channels_Galileo.count", "0"); + config->set_property("Channels_1C.count", "4"); + config->set_property("Channels_1E.count", "0"); config->set_property("Channels.in_acquisition", "1"); - config->set_property("Channel.system", "GPS"); - config->set_property("Channel.signal", "1C"); - config->set_property("Acquisition_GPS.implementation", "GPS_L1_CA_PCPS_Acquisition"); - config->set_property("Acquisition_GPS.threshold", "1"); - config->set_property("Acquisition_GPS.doppler_max", "5000"); - config->set_property("Acquisition_GPS.doppler_min", "-5000"); - config->set_property("Tracking_GPS.implementation", "GPS_L1_CA_DLL_PLL_C_Aid_Tracking"); - config->set_property("Tracking_GPS.item_type", "gr_complex"); - config->set_property("TelemetryDecoder_GPS.implementation", "GPS_L1_CA_Telemetry_Decoder"); - config->set_property("TelemetryDecoder_GPS.item_type", "gr_complex"); + config->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Acquisition"); + config->set_property("Acquisition_1C.threshold", "1"); + config->set_property("Acquisition_1C.doppler_max", "5000"); + config->set_property("Acquisition_1C.doppler_min", "-5000"); + config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_C_Aid_Tracking"); + config->set_property("Tracking_1C.item_type", "gr_complex"); + config->set_property("TelemetryDecoder_1C.implementation", "GPS_L1_CA_Telemetry_Decoder"); + config->set_property("TelemetryDecoder_1C.item_type", "gr_complex"); config->set_property("Observables.implementation", "GPS_L1_CA_Observables"); config->set_property("Observables.item_type", "gr_complex"); config->set_property("PVT.implementation", "GPS_L1_CA_PVT"); From 481d368eb157015b8a858a02bddf5c836f9e9cf8 Mon Sep 17 00:00:00 2001 From: Javier Arribas Date: Mon, 25 Apr 2016 16:16:31 +0200 Subject: [PATCH 6/7] Unit test flowgrap migrated to the new configuration scheme --- src/tests/flowgraph/gnss_flowgraph_test.cc | 30 +++++----------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/src/tests/flowgraph/gnss_flowgraph_test.cc b/src/tests/flowgraph/gnss_flowgraph_test.cc index 3772ad3b3..7719dc8d1 100644 --- a/src/tests/flowgraph/gnss_flowgraph_test.cc +++ b/src/tests/flowgraph/gnss_flowgraph_test.cc @@ -57,15 +57,13 @@ TEST(GNSSFlowgraph, InstantiateConnectStartStopOldNotation) std::string filename = path + "signal_samples/Galileo_E1_ID_1_Fs_4Msps_8ms.dat"; config->set_property("SignalSource.filename", filename); config->set_property("SignalConditioner.implementation", "Pass_Through"); - config->set_property("Channels_GPS.count", "1"); + config->set_property("Channels_1C.count", "1"); config->set_property("Channels.in_acquisition", "1"); - config->set_property("Channel.system", "GPS"); - config->set_property("Channel.signal", "1C"); - config->set_property("Acquisition_GPS.implementation", "GPS_L1_CA_PCPS_Acquisition"); - config->set_property("Acquisition_GPS.threshold", "1"); - config->set_property("Acquisition_GPS.doppler_max", "5000"); - config->set_property("Tracking_GPS.implementation", "GPS_L1_CA_DLL_PLL_Tracking"); - config->set_property("TelemetryDecoder_GPS.implementation", "GPS_L1_CA_Telemetry_Decoder"); + config->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Acquisition"); + config->set_property("Acquisition_1C.threshold", "1"); + config->set_property("Acquisition_1C.doppler_max", "5000"); + config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_Tracking"); + config->set_property("TelemetryDecoder_1C.implementation", "GPS_L1_CA_Telemetry_Decoder"); config->set_property("Observables.implementation", "GPS_L1_CA_Observables"); config->set_property("PVT.implementation", "GPS_L1_CA_PVT"); @@ -166,22 +164,6 @@ TEST(GNSSFlowgraph, InstantiateConnectStartStopHybrid) config->set_property("Channels_1B.count", "8"); config->set_property("Channels.in_acquisition", "1"); - config->set_property("Channel0.signal", "1C"); - config->set_property("Channel1.signal", "1C"); - config->set_property("Channel2.signal", "1C"); - config->set_property("Channel3.signal", "1C"); - config->set_property("Channel4.signal", "1C"); - config->set_property("Channel5.signal", "1C"); - config->set_property("Channel7.signal", "1C"); - config->set_property("Channel8.signal", "1B"); - config->set_property("Channel9.signal", "1B"); - config->set_property("Channel10.signal", "1B"); - config->set_property("Channel11.signal", "1B"); - config->set_property("Channel12.signal", "1B"); - config->set_property("Channel13.signal", "1B"); - config->set_property("Channel14.signal", "1B"); - config->set_property("Channel15.signal", "1B"); - config->set_property("Acquisition_1C0.implementation", "GPS_L1_CA_PCPS_Acquisition"); config->set_property("Acquisition_1C0.threshold", "1"); config->set_property("Acquisition_1C0.doppler_max", "5000"); From e99bae8ad4f4ad1e0b4c02741bc5c01b2d4851ec Mon Sep 17 00:00:00 2001 From: Javier Arribas Date: Mon, 25 Apr 2016 16:20:14 +0200 Subject: [PATCH 7/7] Unit test BlockFactory migrated to the new configuration scheme --- src/tests/gnss_block/gnss_block_factory_test.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tests/gnss_block/gnss_block_factory_test.cc b/src/tests/gnss_block/gnss_block_factory_test.cc index 24f8f0016..e9e189530 100644 --- a/src/tests/gnss_block/gnss_block_factory_test.cc +++ b/src/tests/gnss_block/gnss_block_factory_test.cc @@ -285,13 +285,13 @@ TEST(GNSS_Block_Factory_Test, InstantiateGpsL1CaTelemetryDecoder) TEST(GNSS_Block_Factory_Test, InstantiateChannels) { std::shared_ptr configuration = std::make_shared(); - configuration->set_property("Channels_GPS.count", "2"); - configuration->set_property("Channels_Galileo.count", "0"); + configuration->set_property("Channels_1C.count", "2"); + configuration->set_property("Channels_1E.count", "0"); configuration->set_property("Channels.in_acquisition", "2"); - configuration->set_property("Tracking_GPS.implementation","GPS_L1_CA_DLL_PLL_C_Aid_Tracking"); - configuration->set_property("TelemetryDecoder_GPS.implementation","GPS_L1_CA_Telemetry_Decoder"); + configuration->set_property("Tracking_1C.implementation","GPS_L1_CA_DLL_PLL_C_Aid_Tracking"); + configuration->set_property("TelemetryDecoder_1C.implementation","GPS_L1_CA_Telemetry_Decoder"); configuration->set_property("Channel0.item_type", "gr_complex"); - configuration->set_property("Acquisition_GPS.implementation", "GPS_L1_CA_PCPS_Acquisition"); + configuration->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Acquisition"); configuration->set_property("Channel1.item_type", "gr_complex"); gr::msg_queue::sptr queue = gr::msg_queue::make(0); std::unique_ptr factory;