mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-06-30 17:03:15 +00:00
Code Issues Releases Wiki Activity

Solve conflicts

Browse Source
This commit is contained in:
Gastd 2017-08-23 14:12:55 -03:00
commit 296942ff23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,6 +240,20 @@ void pcps_acquisition_cc::init()
}
}
void pcps_acquisition_cc::update_grid_doppler_wipeoffs()
{
// Create the carrier Doppler wipeoff signals
d_grid_doppler_wipeoffs = new gr_complex*[d_num_doppler_bins];
for (unsigned int doppler_index = 0; doppler_index < d_num_doppler_bins; doppler_index++)
{
d_grid_doppler_wipeoffs[doppler_index] = static_cast<gr_complex*>(volk_gnsssdr_malloc(d_fft_size * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
int doppler = -static_cast<int>(d_doppler_max) + d_doppler_step * doppler_index;
update_local_carrier(d_grid_doppler_wipeoffs[doppler_index], d_fft_size, d_freq + doppler);
}
}
void pcps_acquisition_cc::update_grid_doppler_wipeoffs()
{

1
src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc
View File

@ -141,6 +141,7 @@ gr::basic_block_sptr GlonassL1CaDllPllTracking::get_left_block()
return tracking_;
}
gr::basic_block_sptr GlonassL1CaDllPllTracking::get_right_block()
{
return tracking_;