From 994e2dddfe53ef582aa72d4f8a2d098a54bf8baa Mon Sep 17 00:00:00 2001 From: Luis Esteve Date: Sat, 26 Nov 2011 14:20:47 +0000 Subject: [PATCH] Bug fixed in gps_l1_ca_pcps_acquisition_cc. Re-acquisition is ok now. git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@81 64b25241-fba3-4117-9849-534c7e92360d --- .../gps_l1_ca_pcps_acquisition_cc.cc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/algorithms/acquisition/gnuradio_blocks/gps_l1_ca_pcps_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/gps_l1_ca_pcps_acquisition_cc.cc index e2a9b43fd..e2c4b540d 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/gps_l1_ca_pcps_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/gps_l1_ca_pcps_acquisition_cc.cc @@ -131,7 +131,7 @@ void gps_l1_ca_pcps_acquisition_cc::set_satellite(unsigned int satellite) d_satellite = satellite; d_code_phase = 0; d_doppler_freq = 0; - d_mag = 0; + d_mag = 0.0; d_input_power = 0.0; // Now the GPS codes are generated on the fly using a custom version of the GPS code generator @@ -190,6 +190,14 @@ int gps_l1_ca_pcps_acquisition_cc::general_work(int noutput_items, else { d_sample_counter += d_fft_size; // sample counter + + //restart acquisition variables + + d_code_phase = 0; + d_doppler_freq = 0; + d_mag = 0.0; + d_input_power = 0.0; + // initialize acquisition algorithm int doppler; @@ -287,7 +295,7 @@ int gps_l1_ca_pcps_acquisition_cc::general_work(int noutput_items, d_acq_sample_stamp = d_sample_counter; LOG_AT_LEVEL(INFO) << "positive acquisition"; LOG_AT_LEVEL(INFO) << "satellite " << d_satellite; - LOG_AT_LEVEL(INFO) << "sample_stamp" << d_sample_counter; + LOG_AT_LEVEL(INFO) << "sample_stamp " << d_sample_counter; LOG_AT_LEVEL(INFO) << "test statistics value " << d_test_statistics; LOG_AT_LEVEL(INFO) << "test statistics threshold " << d_threshold; @@ -305,13 +313,11 @@ int gps_l1_ca_pcps_acquisition_cc::general_work(int noutput_items, LOG_AT_LEVEL(INFO) << "test statistics value " << d_test_statistics; LOG_AT_LEVEL(INFO) << "test statistics threshold " << d_threshold; + LOG_AT_LEVEL(INFO) << "code phase " << d_code_phase; + LOG_AT_LEVEL(INFO) << "doppler " << d_doppler_freq; LOG_AT_LEVEL(INFO) << "magnitude " << d_mag; LOG_AT_LEVEL(INFO) << "input signal power " << d_input_power; - //restart acquisition variables - d_input_power = 0.0; - d_mag = 0.0; - } d_active = false;