mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-06-01 14:14:08 +00:00
Code Issues Releases Wiki Activity

minor cleaning

Browse Source
This commit is contained in:
Carles Fernandez 2016-04-10 10:29:25 +02:00
parent a10ca1a840
commit 4d072833c5
2 changed files with 137 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
View File

@ -131,6 +131,7 @@ pcps_acquisition_cc::pcps_acquisition_cc(
d_grid_doppler_wipeoffs = 0; d_grid_doppler_wipeoffs = 0;
} }
pcps_acquisition_cc::~pcps_acquisition_cc() pcps_acquisition_cc::~pcps_acquisition_cc()
{ {
if (d_num_doppler_bins > 0) if (d_num_doppler_bins > 0)
@ -154,6 +155,7 @@ pcps_acquisition_cc::~pcps_acquisition_cc()
} }
} }
void pcps_acquisition_cc::set_local_code(std::complex<float> * code) void pcps_acquisition_cc::set_local_code(std::complex<float> * code)
{ {
// COD // COD
@ -171,6 +173,7 @@ void pcps_acquisition_cc::set_local_code(std::complex<float> * code)
volk_32fc_conjugate_32fc(d_fft_codes, d_fft_if->get_outbuf(), d_fft_size); volk_32fc_conjugate_32fc(d_fft_codes, d_fft_if->get_outbuf(), d_fft_size);
} }
void pcps_acquisition_cc::update_local_carrier(gr_complex* carrier_vector, int correlator_length_samples, float freq) void pcps_acquisition_cc::update_local_carrier(gr_complex* carrier_vector, int correlator_length_samples, float freq)
{ {
float phase_step_rad = GPS_TWO_PI * freq / static_cast<float>(d_fs_in); float phase_step_rad = GPS_TWO_PI * freq / static_cast<float>(d_fs_in);
@ -179,6 +182,7 @@ void pcps_acquisition_cc::update_local_carrier(gr_complex* carrier_vector, int c
volk_gnsssdr_s32f_sincos_32fc(carrier_vector, - phase_step_rad, _phase, correlator_length_samples); volk_gnsssdr_s32f_sincos_32fc(carrier_vector, - phase_step_rad, _phase, correlator_length_samples);
} }
void pcps_acquisition_cc::init() void pcps_acquisition_cc::init()
{ {
d_gnss_synchro->Flag_valid_acquisition = false; d_gnss_synchro->Flag_valid_acquisition = false;
@ -207,7 +211,6 @@ void pcps_acquisition_cc::init()
} }
void pcps_acquisition_cc::set_state(int state) void pcps_acquisition_cc::set_state(int state)
{ {
d_state = state; d_state = state;
@ -229,6 +232,7 @@ void pcps_acquisition_cc::set_state(int state)
} }
} }
int pcps_acquisition_cc::general_work(int noutput_items, int pcps_acquisition_cc::general_work(int noutput_items,
gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, gr_vector_int &ninput_items, gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items __attribute__((unused))) gr_vector_void_star &output_items __attribute__((unused)))
@ -308,7 +312,6 @@ int pcps_acquisition_cc::general_work(int noutput_items,
for (unsigned int doppler_index = 0; doppler_index < d_num_doppler_bins; doppler_index++) for (unsigned int doppler_index = 0; doppler_index < d_num_doppler_bins; doppler_index++)
{ {
// doppler search steps // doppler search steps
doppler = -static_cast<int>(d_doppler_max) + d_doppler_step * doppler_index; doppler = -static_cast<int>(d_doppler_max) + d_doppler_step * doppler_index;
volk_32fc_x2_multiply_32fc(d_fft_if->get_inbuf(), in, volk_32fc_x2_multiply_32fc(d_fft_if->get_inbuf(), in,

5
src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc
View File

@ -132,6 +132,7 @@ pcps_acquisition_sc::pcps_acquisition_sc(
d_grid_doppler_wipeoffs = 0; d_grid_doppler_wipeoffs = 0;
} }
pcps_acquisition_sc::~pcps_acquisition_sc() pcps_acquisition_sc::~pcps_acquisition_sc()
{ {
if (d_num_doppler_bins > 0) if (d_num_doppler_bins > 0)
@ -156,6 +157,7 @@ pcps_acquisition_sc::~pcps_acquisition_sc()
} }
} }
void pcps_acquisition_sc::set_local_code(std::complex<float> * code) void pcps_acquisition_sc::set_local_code(std::complex<float> * code)
{ {
// COD // COD
@ -173,6 +175,7 @@ void pcps_acquisition_sc::set_local_code(std::complex<float> * code)
volk_32fc_conjugate_32fc(d_fft_codes, d_fft_if->get_outbuf(), d_fft_size); volk_32fc_conjugate_32fc(d_fft_codes, d_fft_if->get_outbuf(), d_fft_size);
} }
void pcps_acquisition_sc::update_local_carrier(gr_complex* carrier_vector, int correlator_length_samples, float freq) void pcps_acquisition_sc::update_local_carrier(gr_complex* carrier_vector, int correlator_length_samples, float freq)
{ {
float phase_step_rad = GPS_TWO_PI * freq / static_cast<float>(d_fs_in); float phase_step_rad = GPS_TWO_PI * freq / static_cast<float>(d_fs_in);
@ -181,6 +184,7 @@ void pcps_acquisition_sc::update_local_carrier(gr_complex* carrier_vector, int c
volk_gnsssdr_s32f_sincos_32fc(carrier_vector, - phase_step_rad, _phase, correlator_length_samples); volk_gnsssdr_s32f_sincos_32fc(carrier_vector, - phase_step_rad, _phase, correlator_length_samples);
} }
void pcps_acquisition_sc::init() void pcps_acquisition_sc::init()
{ {
d_gnss_synchro->Flag_valid_acquisition = false; d_gnss_synchro->Flag_valid_acquisition = false;
@ -340,7 +344,6 @@ int pcps_acquisition_sc::general_work(int noutput_items,
magt = d_magnitude[indext] / (fft_normalization_factor * fft_normalization_factor); magt = d_magnitude[indext] / (fft_normalization_factor * fft_normalization_factor);
} }
// 4- record the maximum peak and the associated synchronization parameters // 4- record the maximum peak and the associated synchronization parameters
if (d_mag < magt) if (d_mag < magt)
{ {