mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-31 23:33:03 +00:00
Code Issues Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Carles Fernandez
2018-01-18 15:27:38 +01:00
parent bc92240443
commit dc717db61e
1 changed files with 203 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc
View File

@@ -194,7 +194,7 @@ galileo_e1_dll_pll_veml_tracking_cc::galileo_e1_dll_pll_veml_tracking_cc(
d_track_pilot = track_pilot; d_track_pilot = track_pilot;
if (d_track_pilot) if (d_track_pilot)
{ {
//extended integration control // extended integration control
if (d_extend_correlation_symbols > 1) if (d_extend_correlation_symbols > 1)
{ {
d_enable_extended_integration = true; d_enable_extended_integration = true;
@@ -203,7 +203,7 @@ galileo_e1_dll_pll_veml_tracking_cc::galileo_e1_dll_pll_veml_tracking_cc(
{ {
d_enable_extended_integration = false; d_enable_extended_integration = false;
} }
//Extra correlator for the data component // Extra correlator for the data component
d_local_code_data_shift_chips = static_cast<float*>(volk_gnsssdr_malloc(sizeof(float), volk_gnsssdr_get_alignment())); d_local_code_data_shift_chips = static_cast<float*>(volk_gnsssdr_malloc(sizeof(float), volk_gnsssdr_get_alignment()));
d_local_code_data_shift_chips[0] = 0.0; d_local_code_data_shift_chips[0] = 0.0;
correlator_data_cpu.init(2 * d_correlation_length_samples, 1); correlator_data_cpu.init(2 * d_correlation_length_samples, 1);
@@ -251,7 +251,7 @@ galileo_e1_dll_pll_veml_tracking_cc::galileo_e1_dll_pll_veml_tracking_cc(
d_carrier_doppler_hz = 0.0; d_carrier_doppler_hz = 0.0;
d_acc_carrier_phase_rad = 0.0; d_acc_carrier_phase_rad = 0.0;
d_state = 0;// intial state: stanby d_state = 0; // initial state: standby
} }
@@ -320,7 +320,7 @@ void galileo_e1_dll_pll_veml_tracking_cc::start_tracking()
d_acquisition_gnss_synchro->PRN, d_acquisition_gnss_synchro->PRN,
Galileo_E1_CODE_CHIP_RATE_HZ, Galileo_E1_CODE_CHIP_RATE_HZ,
0); 0);
d_Prompt_Data[0] = gr_complex(0,0); //clean data correlator output d_Prompt_Data[0] = gr_complex(0,0); // clean data correlator output
correlator_data_cpu.set_local_code_and_taps(static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS), correlator_data_cpu.set_local_code_and_taps(static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS),
d_data_code, d_data_code,
d_local_code_shift_chips); d_local_code_shift_chips);
@@ -685,7 +685,7 @@ int galileo_e1_dll_pll_veml_tracking_cc::general_work (int noutput_items __attri
{ {
// Fill the acquisition data // Fill the acquisition data
current_synchro_data = *d_acquisition_gnss_synchro; current_synchro_data = *d_acquisition_gnss_synchro;
//Current NCO and code generator parameters // Current NCO and code generator parameters
d_carrier_phase_step_rad = GALILEO_TWO_PI * d_carrier_doppler_hz / static_cast<double>(d_fs_in); d_carrier_phase_step_rad = GALILEO_TWO_PI * d_carrier_doppler_hz / static_cast<double>(d_fs_in);
d_code_phase_step_chips = d_code_freq_chips / static_cast<double>(d_fs_in); d_code_phase_step_chips = d_code_freq_chips / static_cast<double>(d_fs_in);
d_rem_code_phase_chips = d_rem_code_phase_samples * d_code_freq_chips / d_fs_in; d_rem_code_phase_chips = d_rem_code_phase_samples * d_code_freq_chips / d_fs_in;
@@ -697,7 +697,7 @@ int galileo_e1_dll_pll_veml_tracking_cc::general_work (int noutput_items __attri
d_P_accu = *d_Prompt; d_P_accu = *d_Prompt;
d_L_accu = *d_Late; d_L_accu = *d_Late;
d_VL_accu = *d_Very_Late; d_VL_accu = *d_Very_Late;
//check lock status // check lock status
if (cn0_and_tracking_lock_status() == false) if (cn0_and_tracking_lock_status() == false)
{ {
clear_tracking_vars(); clear_tracking_vars();
@@ -727,7 +727,7 @@ int galileo_e1_dll_pll_veml_tracking_cc::general_work (int noutput_items __attri
double T_prn_seconds = T_chip_seconds * Galileo_E1_B_CODE_LENGTH_CHIPS; double T_prn_seconds = T_chip_seconds * Galileo_E1_B_CODE_LENGTH_CHIPS;
double T_prn_samples = T_prn_seconds * static_cast<double>(d_fs_in); double T_prn_samples = T_prn_seconds * static_cast<double>(d_fs_in);
double K_blk_samples = T_prn_samples + d_rem_code_phase_samples + code_error_filt_secs * static_cast<double>(d_fs_in); double K_blk_samples = T_prn_samples + d_rem_code_phase_samples + code_error_filt_secs * static_cast<double>(d_fs_in);
d_current_prn_length_samples = round(K_blk_samples); // round to a discrete samples d_current_prn_length_samples = round(K_blk_samples); // round to a discrete number of samples
// ########### Output the tracking results to Telemetry block ########## // ########### Output the tracking results to Telemetry block ##########
if (d_track_pilot) if (d_track_pilot)
@@ -763,7 +763,7 @@ int galileo_e1_dll_pll_veml_tracking_cc::general_work (int noutput_items __attri
if (acquire_secondary() == true) if (acquire_secondary() == true)
{ {
d_extend_correlation_symbols_count = 0; d_extend_correlation_symbols_count = 0;
//reset extended correlator // reset extended correlator
d_VE_accu = gr_complex(0,0); d_VE_accu = gr_complex(0,0);
d_E_accu = gr_complex(0,0); d_E_accu = gr_complex(0,0);
d_P_accu = gr_complex(0,0); d_P_accu = gr_complex(0,0);