[hamradio-commits] [gnss-sdr] 72/126: Merge branch 'next' of git://github.com/Arribas/gnss-sdr into tracking_arribas
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Sat Dec 26 18:38:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.
commit bfbea68c8f6de14b73bff1009a19934ce3a84722
Merge: df6996f 38e8fee
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Fri Nov 27 14:53:33 2015 +0100
Merge branch 'next' of git://github.com/Arribas/gnss-sdr into
tracking_arribas
# Conflicts:
# src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
# src/core/receiver/gnss_block_factory.cc
conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf | 2 +-
conf/gnss-sdr_Hybrid_byte_sim.conf | 4 +-
src/algorithms/tracking/adapters/CMakeLists.txt | 2 +-
...king.cc => gps_l1_ca_dll_pll_c_aid_tracking.cc} | 26 ++++----
...acking.h => gps_l1_ca_dll_pll_c_aid_tracking.h} | 22 +++----
.../tracking/gnuradio_blocks/CMakeLists.txt | 1 +
...c.cc => gps_l1_ca_dll_pll_c_aid_tracking_cc.cc} | 72 +++++++++++-----------
..._cc.h => gps_l1_ca_dll_pll_c_aid_tracking_cc.h} | 28 ++++-----
src/core/receiver/gnss_block_factory.cc | 7 +++
9 files changed, 85 insertions(+), 79 deletions(-)
diff --cc src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 17a4e9a,72b4b86..195f412
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@@ -116,19 -116,19 +116,19 @@@ gps_l1_ca_dll_pll_c_aid_tracking_cc::gp
d_ca_code = static_cast<gr_complex*>(volk_malloc(static_cast<int>(GPS_L1_CA_CODE_LENGTH_CHIPS) * sizeof(gr_complex), volk_get_alignment()));
// correlator outputs (scalar)
-- d_n_correlator_taps=3; // Early, Prompt, and Late
++ d_n_correlator_taps = 3; // Early, Prompt, and Late
d_correlator_outs = static_cast<gr_complex*>(volk_malloc(d_n_correlator_taps*sizeof(gr_complex), volk_get_alignment()));
-- for (int n=0;n<d_n_correlator_taps;n++)
++ for (int n = 0; n < d_n_correlator_taps; n++)
{
d_correlator_outs[n] = gr_complex(0,0);
}
d_local_code_shift_chips = static_cast<float*>(volk_malloc(d_n_correlator_taps*sizeof(float), volk_get_alignment()));
// Set TAPs delay values [chips]
-- d_local_code_shift_chips[0]=-d_early_late_spc_chips;
-- d_local_code_shift_chips[1]=0.0;
-- d_local_code_shift_chips[2]=d_early_late_spc_chips;
++ d_local_code_shift_chips[0] = - d_early_late_spc_chips;
++ d_local_code_shift_chips[1] = 0.0;
++ d_local_code_shift_chips[2] = d_early_late_spc_chips;
-- multicorrelator_cpu.init(2*d_correlation_length_samples,d_n_correlator_taps);
++ multicorrelator_cpu.init(2 * d_correlation_length_samples, d_n_correlator_taps);
//--- Perform initializations ------------------------------
// define initial code frequency basis of NCO
@@@ -158,8 -158,8 +158,7 @@@
systemName["G"] = std::string("GPS");
systemName["S"] = std::string("SBAS");
--
-- set_relative_rate(1.0/((double)d_vector_length*2));
++ set_relative_rate(1.0 / (static_cast<double>(d_vector_length) * 2.0));
d_channel_internal_queue = 0;
d_acquisition_gnss_synchro = 0;
@@@ -170,7 -170,7 +169,7 @@@
d_acc_carrier_phase_cycles = 0.0;
d_code_phase_samples = 0.0;
-- d_pll_to_dll_assist_secs_Ti=0.0;
++ d_pll_to_dll_assist_secs_Ti = 0.0;
//set_min_output_buffer((long int)300);
}
@@@ -182,7 -182,7 +181,7 @@@ void gps_l1_ca_dll_pll_c_aid_tracking_c
*/
d_acq_code_phase_samples = d_acquisition_gnss_synchro->Acq_delay_samples;
d_acq_carrier_doppler_hz = d_acquisition_gnss_synchro->Acq_doppler_hz;
-- d_acq_sample_stamp = d_acquisition_gnss_synchro->Acq_samplestamp_samples;
++ d_acq_sample_stamp = d_acquisition_gnss_synchro->Acq_samplestamp_samples;
long int acq_trk_diff_samples;
double acq_trk_diff_seconds;
@@@ -206,7 -206,7 +205,7 @@@
double T_prn_true_seconds = GPS_L1_CA_CODE_LENGTH_CHIPS / GPS_L1_CA_CODE_RATE_HZ;
double T_prn_true_samples = T_prn_true_seconds * static_cast<double>(d_fs_in);
-- double T_prn_diff_seconds= T_prn_true_seconds - T_prn_mod_seconds;
++ double T_prn_diff_seconds = T_prn_true_seconds - T_prn_mod_seconds;
double N_prn_diff = acq_trk_diff_seconds / T_prn_true_seconds;
double corrected_acq_phase_samples, delay_correction_samples;
corrected_acq_phase_samples = fmod((d_acq_code_phase_samples + T_prn_diff_seconds * N_prn_diff * static_cast<double>(d_fs_in)), T_prn_true_samples);
@@@ -219,7 -219,7 +218,7 @@@
d_acq_code_phase_samples = corrected_acq_phase_samples;
d_carrier_doppler_hz = d_acq_carrier_doppler_hz;
-- d_carrier_phase_step_rad=GPS_TWO_PI*d_carrier_doppler_hz/static_cast<double>(d_fs_in);
++ d_carrier_phase_step_rad = GPS_TWO_PI * d_carrier_doppler_hz/static_cast<double>(d_fs_in);
// DLL/PLL filter initialization
d_carrier_loop_filter.initialize(d_acq_carrier_doppler_hz); //The carrier loop filter implements the Doppler accumulator
@@@ -228,9 -228,9 +227,8 @@@
// generate local reference ALWAYS starting at chip 1 (1 sample per chip)
gps_l1_ca_code_gen_complex(d_ca_code, d_acquisition_gnss_synchro->PRN, 0);
--
-- multicorrelator_cpu.set_local_code_and_taps(static_cast<int>(GPS_L1_CA_CODE_LENGTH_CHIPS),d_ca_code,d_local_code_shift_chips);
-- for (int n=0;n<d_n_correlator_taps;n++)
++ multicorrelator_cpu.set_local_code_and_taps(static_cast<int>(GPS_L1_CA_CODE_LENGTH_CHIPS), d_ca_code, d_local_code_shift_chips);
++ for (int n = 0; n < d_n_correlator_taps; n++)
{
d_correlator_outs[n] = gr_complex(0,0);
}
@@@ -238,9 -238,9 +236,9 @@@
d_carrier_lock_fail_counter = 0;
d_rem_code_phase_samples = 0.0;
d_rem_carrier_phase_rad = 0.0;
-- d_rem_code_phase_chips =0.0;
++ d_rem_code_phase_chips = 0.0;
d_acc_carrier_phase_cycles = 0.0;
-- d_pll_to_dll_assist_secs_Ti=0.0;
++ d_pll_to_dll_assist_secs_Ti = 0.0;
d_code_phase_samples = d_acq_code_phase_samples;
@@@ -287,13 -287,13 +285,13 @@@ int gps_l1_ca_dll_pll_c_aid_tracking_cc
Gnss_Synchro current_synchro_data = Gnss_Synchro();
// process vars
-- double code_error_chips_Ti=0.0;
-- double code_error_filt_chips=0.0;
-- double code_error_filt_secs_Ti=0.0;
++ double code_error_chips_Ti = 0.0;
++ double code_error_filt_chips = 0.0;
++ double code_error_filt_secs_Ti = 0.0;
double CURRENT_INTEGRATION_TIME_S;
double CORRECTED_INTEGRATION_TIME_S;
-- double dll_code_error_secs_Ti=0.0;
-- double carr_phase_error_secs_Ti=0.0;
++ double dll_code_error_secs_Ti = 0.0;
++ double carr_phase_error_secs_Ti = 0.0;
double old_d_rem_code_phase_samples;
if (d_enable_tracking == true)
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list