mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 20:50:33 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into acq_performance

Browse Source
This commit is contained in:
Carles Fernandez 2018-06-22 12:31:55 +02:00
commit e0e82a09a2
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc
View File

@ -314,7 +314,7 @@ void pcps_acquisition::send_positive_acquisition()
<< ", doppler " << d_gnss_synchro->Acq_doppler_hz << ", doppler " << d_gnss_synchro->Acq_doppler_hz
<< ", magnitude " << d_mag << ", magnitude " << d_mag
<< ", input signal power " << d_input_power; << ", input signal power " << d_input_power;
d_positive_acq = 1;
this->message_port_pub(pmt::mp("events"), pmt::from_long(1)); this->message_port_pub(pmt::mp("events"), pmt::from_long(1));
} }
@ -332,7 +332,7 @@ void pcps_acquisition::send_negative_acquisition()
<< ", doppler " << d_gnss_synchro->Acq_doppler_hz << ", doppler " << d_gnss_synchro->Acq_doppler_hz
<< ", magnitude " << d_mag << ", magnitude " << d_mag
<< ", input signal power " << d_input_power; << ", input signal power " << d_input_power;
d_positive_acq = 0;
this->message_port_pub(pmt::mp("events"), pmt::from_long(2)); this->message_port_pub(pmt::mp("events"), pmt::from_long(2));
} }
@ -598,7 +598,6 @@ void pcps_acquisition::acquisition_core(unsigned long int samp_count)
send_positive_acquisition(); send_positive_acquisition();
d_step_two = false; d_step_two = false;
d_state = 0; // Positive acquisition d_state = 0; // Positive acquisition
d_positive_acq = 1;
} }
else else
{ {
@ -610,7 +609,6 @@ void pcps_acquisition::acquisition_core(unsigned long int samp_count)
{ {
send_positive_acquisition(); send_positive_acquisition();
d_state = 0; // Positive acquisition d_state = 0; // Positive acquisition
d_positive_acq = 1;
} }
} }
else if (d_well_count == acq_parameters.max_dwells) else if (d_well_count == acq_parameters.max_dwells)
@ -633,7 +631,6 @@ void pcps_acquisition::acquisition_core(unsigned long int samp_count)
send_positive_acquisition(); send_positive_acquisition();
d_step_two = false; d_step_two = false;
d_state = 0; // Positive acquisition d_state = 0; // Positive acquisition
d_positive_acq = 1;
} }
else else
{ {
@ -645,7 +642,6 @@ void pcps_acquisition::acquisition_core(unsigned long int samp_count)
{ {
send_positive_acquisition(); send_positive_acquisition();
d_state = 0; // Positive acquisition d_state = 0; // Positive acquisition
d_positive_acq = 1;
} }
} }
else else