From cc40f5c25cad8e1e72f26675500efdbc9d027d79 Mon Sep 17 00:00:00 2001 From: mmajoral Date: Fri, 26 May 2017 16:45:03 +0200 Subject: [PATCH] bug fix: removed call to set_local_code() from the init() function. This prevents the function set_local_code() from being called twice, with an invalid PRN during the first call --- .../adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc | 2 +- .../adapters/galileo_e1_pcps_ambiguous_acquisition.cc | 2 +- .../adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc | 2 +- .../adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc | 2 +- .../adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc | 2 +- .../adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc | 2 +- .../acquisition/adapters/gps_l1_ca_pcps_acquisition.cc | 2 +- .../adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc | 2 +- .../acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc | 2 +- .../adapters/gps_l1_ca_pcps_multithread_acquisition.cc | 2 +- .../acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc | 2 +- .../adapters/gps_l1_ca_pcps_quicksync_acquisition.cc | 2 +- .../acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc | 2 +- .../acquisition/adapters/gps_l2_m_pcps_acquisition.cc | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc index d6859919c..ef86f55e7 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc @@ -198,7 +198,7 @@ signed int GalileoE1Pcps8msAmbiguousAcquisition::mag() void GalileoE1Pcps8msAmbiguousAcquisition::init() { acquisition_cc_->init(); - set_local_code(); + //set_local_code(); } diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc index 6f184c25e..b3a57497c 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc @@ -234,7 +234,7 @@ void GalileoE1PcpsAmbiguousAcquisition::init() acquisition_cc_->init(); } - set_local_code(); + //set_local_code(); } diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc index 690e3879d..167857d61 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc @@ -200,7 +200,7 @@ signed int GalileoE1PcpsCccwsrAmbiguousAcquisition::mag() void GalileoE1PcpsCccwsrAmbiguousAcquisition::init() { acquisition_cc_->init(); - set_local_code(); + //set_local_code(); } diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc index e6be855d2..46faec6b4 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc @@ -240,7 +240,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisition::init() { acquisition_cc_->init(); - set_local_code(); + //set_local_code(); } diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc index dae111573..476a4b2a9 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc @@ -204,7 +204,7 @@ signed int GalileoE1PcpsTongAmbiguousAcquisition::mag() void GalileoE1PcpsTongAmbiguousAcquisition::init() { acquisition_cc_->init(); - set_local_code(); + //set_local_code(); } diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc index e7701a513..223e737f6 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc @@ -206,7 +206,7 @@ signed int GalileoE5aNoncoherentIQAcquisitionCaf::mag() void GalileoE5aNoncoherentIQAcquisitionCaf::init() { acquisition_cc_->init(); - set_local_code(); + //set_local_code(); } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc index 8ae477856..2531cb8d3 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc @@ -230,7 +230,7 @@ void GpsL1CaPcpsAcquisition::init() acquisition_cc_->init(); } - set_local_code(); + //set_local_code(); } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc index 254e71369..5f448e456 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc @@ -136,7 +136,7 @@ signed int GpsL1CaPcpsAcquisitionFineDoppler::mag() void GpsL1CaPcpsAcquisitionFineDoppler::init() { acquisition_cc_->init(); - set_local_code(); + //set_local_code(); } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc index beb45c323..71feb0088 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc @@ -137,7 +137,7 @@ signed int GpsL1CaPcpsAssistedAcquisition::mag() void GpsL1CaPcpsAssistedAcquisition::init() { acquisition_cc_->init(); - set_local_code(); + //set_local_code(); } void GpsL1CaPcpsAssistedAcquisition::set_local_code() diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc index 9bd8f8b3e..61f350eaa 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc @@ -197,7 +197,7 @@ signed int GpsL1CaPcpsMultithreadAcquisition::mag() void GpsL1CaPcpsMultithreadAcquisition::init() { acquisition_cc_->init(); - set_local_code(); + //set_local_code(); } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc index ba2c6b68c..6dd529913 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc @@ -194,7 +194,7 @@ signed int GpsL1CaPcpsOpenClAcquisition::mag() void GpsL1CaPcpsOpenClAcquisition::init() { acquisition_cc_->init(); - set_local_code(); + //set_local_code(); } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc index f732b5aba..6ea3a8f9f 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc @@ -227,7 +227,7 @@ signed int GpsL1CaPcpsQuickSyncAcquisition::mag() void GpsL1CaPcpsQuickSyncAcquisition::init() { acquisition_cc_->init(); - set_local_code(); + //set_local_code(); } diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc index e7a4bdb65..5fc39659b 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc @@ -186,7 +186,7 @@ signed int GpsL1CaPcpsTongAcquisition::mag() void GpsL1CaPcpsTongAcquisition::init() { acquisition_cc_->init(); - set_local_code(); + //set_local_code(); } void GpsL1CaPcpsTongAcquisition::set_local_code() diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc index baf00ff1f..c77c86f54 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc @@ -233,7 +233,7 @@ void GpsL2MPcpsAcquisition::init() acquisition_cc_->init(); } - set_local_code(); + //set_local_code(); }