mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-31 15:23:04 +00:00
Code Issues Releases Wiki Activity

Fix redefinition of variable

Browse Source
This commit is contained in:
Carles Fernandez
2017-08-24 18:03:23 +02:00
committed by Damian Miralles
parent d4a1dbaf08
commit 1e59501cb5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
View File

@@ -109,6 +109,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::GalileoE1PcpsQuic
rx_message = 0; rx_message = 0;
} }
GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::~GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx() GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::~GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx()
{} {}
@@ -127,7 +128,6 @@ protected:
gnss_synchro = Gnss_Synchro(); gnss_synchro = Gnss_Synchro();
init(); init();
} }
~GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test() ~GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test()
{ {
} }
@@ -201,6 +201,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::init()
Pmd = 0; Pmd = 0;
} }
void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::config_1() void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::config_1()
{ {
gnss_synchro.Channel_ID = 0; gnss_synchro.Channel_ID = 0;
@@ -273,6 +274,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::config_1()
config->set_property("Acquisition.dump", "false"); config->set_property("Acquisition.dump", "false");
} }
void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::config_2() void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::config_2()
{ {
gnss_synchro.Channel_ID = 0; gnss_synchro.Channel_ID = 0;
@@ -458,12 +460,14 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::config_3()
config->set_property("Acquisition.dump", "false"); config->set_property("Acquisition.dump", "false");
} }
void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::start_queue() void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::start_queue()
{ {
stop = false; stop = false;
ch_thread = boost::thread(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::wait_message, this); ch_thread = boost::thread(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::wait_message, this);
} }
void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::wait_message() void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::wait_message()
{ {
std::chrono::time_point<std::chrono::system_clock> begin, end; std::chrono::time_point<std::chrono::system_clock> begin, end;
@@ -478,7 +482,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::wait_message()
channel_internal_queue.wait_and_pop(message); channel_internal_queue.wait_and_pop(message);
end = std::chrono::system_clock::now(); end = std::chrono::system_clock::now();
std::chrono::duration<double> elapsed_seconds = end - begin; elapsed_seconds = end - begin;
mean_acq_time_us += elapsed_seconds.count() * 1e6; mean_acq_time_us += elapsed_seconds.count() * 1e6;
@@ -582,7 +586,7 @@ TEST_F(GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test, ConnectAndRun)
begin = std::chrono::system_clock::now(); begin = std::chrono::system_clock::now();
top_block->run(); // Start threads and wait top_block->run(); // Start threads and wait
end = std::chrono::system_clock::now(); end = std::chrono::system_clock::now();
std::chrono::duration<double> elapsed_seconds = end - begin; elapsed_seconds = end - begin;
}) << "Failure running the top_block."<< std::endl; }) << "Failure running the top_block."<< std::endl;
std::cout << "Processed " << nsamples << " samples in " << elapsed_seconds.count() * 1e6 << " microseconds" << std::endl; std::cout << "Processed " << nsamples << " samples in " << elapsed_seconds.count() * 1e6 << " microseconds" << std::endl;