diff --git a/src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc b/src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc index 864b7e766..926eb77d6 100644 --- a/src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc +++ b/src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc @@ -44,6 +44,7 @@ galileo_e1_ls_pvt::galileo_e1_ls_pvt(int nchannels, std::string dump_filename, b d_dump_filename = dump_filename; d_flag_dump_enabled = flag_dump_to_file; d_galileo_current_time = 0; + d_flag_averaging = false; // ############# ENABLE DATA FILE LOG ################# if (d_flag_dump_enabled == true) diff --git a/src/algorithms/PVT/libs/geojson_printer.cc b/src/algorithms/PVT/libs/geojson_printer.cc index 930a3379a..f07f39651 100644 --- a/src/algorithms/PVT/libs/geojson_printer.cc +++ b/src/algorithms/PVT/libs/geojson_printer.cc @@ -37,7 +37,10 @@ #include #include -GeoJSON_Printer::GeoJSON_Printer () {} +GeoJSON_Printer::GeoJSON_Printer() +{ + first_pos = true; +} diff --git a/src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.cc b/src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.cc index d51f4e344..6b1ba45f3 100644 --- a/src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.cc +++ b/src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.cc @@ -44,7 +44,7 @@ gps_l1_ca_ls_pvt::gps_l1_ca_ls_pvt(int nchannels, std::string dump_filename, boo d_ephemeris = new Gps_Navigation_Message[nchannels]; d_dump_filename = dump_filename; d_flag_dump_enabled = flag_dump_to_file; - + d_flag_averaging = false; d_GPS_current_time = 0; // ############# ENABLE DATA FILE LOG ################# diff --git a/src/algorithms/PVT/libs/hybrid_ls_pvt.cc b/src/algorithms/PVT/libs/hybrid_ls_pvt.cc index 8bd853273..016fa3a21 100644 --- a/src/algorithms/PVT/libs/hybrid_ls_pvt.cc +++ b/src/algorithms/PVT/libs/hybrid_ls_pvt.cc @@ -48,6 +48,7 @@ hybrid_ls_pvt::hybrid_ls_pvt(int nchannels, std::string dump_filename, bool flag d_valid_GPS_obs = 0; d_valid_GAL_obs = 0; count_valid_position = 0; + d_flag_averaging = false; // ############# ENABLE DATA FILE LOG ################# if (d_flag_dump_enabled == true) { diff --git a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h index 4f577d3f0..4758abd87 100644 --- a/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/galileo_e1b_telemetry_decoder.h @@ -88,7 +88,6 @@ private: galileo_e1b_telemetry_decoder_cc_sptr telemetry_decoder_; Gnss_Satellite satellite_; int channel_; - unsigned int vector_length_; std::string item_type_; bool dump_; std::string dump_filename_; diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h index 3b6986b1e..ce00f3146 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.h @@ -83,7 +83,6 @@ private: gps_l1_ca_telemetry_decoder_cc_sptr telemetry_decoder_; Gnss_Satellite satellite_; int channel_; - unsigned int vector_length_; std::string item_type_; bool dump_; std::string dump_filename_; diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l2_m_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/gps_l2_m_telemetry_decoder.h index 506fdc4b5..1ddf9894a 100644 --- a/src/algorithms/telemetry_decoder/adapters/gps_l2_m_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/gps_l2_m_telemetry_decoder.h @@ -83,7 +83,6 @@ private: gps_l2_m_telemetry_decoder_cc_sptr telemetry_decoder_; Gnss_Satellite satellite_; int channel_; - unsigned int vector_length_; std::string item_type_; bool dump_; std::string dump_filename_; diff --git a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h index 1ee13ecef..d9edadc96 100644 --- a/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/sbas_l1_telemetry_decoder.h @@ -86,7 +86,6 @@ private: sbas_l1_telemetry_decoder_cc_sptr telemetry_decoder_; Gnss_Satellite satellite_; int channel_; - unsigned int vector_length_; std::string item_type_; bool dump_; std::string dump_filename_; diff --git 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 index c75a2afec..b7a3c5566 100644 --- 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 @@ -173,6 +173,9 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc::gps_l1_ca_dll_pll_c_aid_tracking_cc( d_code_phase_samples = 0.0; d_pll_to_dll_assist_secs_Ti = 0.0; + d_rem_code_phase_chips = 0.0; + d_code_phase_step_chips = 0.0; + d_carrier_phase_step_rad = 0.0; //set_min_output_buffer((long int)300); } diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator.cc b/src/algorithms/tracking/libs/cpu_multicorrelator.cc index 268aeb3cd..ac8cfcfb9 100644 --- a/src/algorithms/tracking/libs/cpu_multicorrelator.cc +++ b/src/algorithms/tracking/libs/cpu_multicorrelator.cc @@ -146,6 +146,7 @@ cpu_multicorrelator::cpu_multicorrelator() d_local_code_in = NULL; d_shifts_chips = NULL; d_corr_out = NULL; + d_local_codes_resampled = NULL; d_code_length_chips = 0; d_n_correlators = 0; } diff --git a/src/core/system_parameters/rtcm.cc b/src/core/system_parameters/rtcm.cc index 21dd39689..f7b05c3e6 100644 --- a/src/core/system_parameters/rtcm.cc +++ b/src/core/system_parameters/rtcm.cc @@ -2325,7 +2325,7 @@ int Rtcm::set_DF398(const Gnss_Synchro & gnss_synchro) int Rtcm::set_DF399(const Gnss_Synchro & gnss_synchro) { - double lambda; + double lambda = 0.0; std::string sig_(gnss_synchro.Signal); std::string sig = sig_.substr(0,2); @@ -2358,31 +2358,31 @@ int Rtcm::set_DF400(const Gnss_Synchro & gnss_synchro) double meters_to_miliseconds = GPS_C_m_s * 0.001; double rough_range_s = std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10) * meters_to_miliseconds * TWO_N10; double psrng_s; - double lambda; - std::string sig_(gnss_synchro.Signal); - std::string sig = sig_.substr(0,2); + double lambda = 0.0; + std::string sig_(gnss_synchro.Signal); + std::string sig = sig_.substr(0,2); - if (sig.compare("1C") == 0 ) - { - lambda = GPS_C_m_s / GPS_L1_FREQ_HZ; - } - if (sig.compare("2S") == 0 ) - { - lambda = GPS_C_m_s / GPS_L2_FREQ_HZ; - } + if (sig.compare("1C") == 0 ) + { + lambda = GPS_C_m_s / GPS_L1_FREQ_HZ; + } + if (sig.compare("2S") == 0 ) + { + lambda = GPS_C_m_s / GPS_L2_FREQ_HZ; + } - if (sig.compare("5X") == 0 ) - { - lambda = GPS_C_m_s / Galileo_E5a_FREQ_HZ; - } - if (sig.compare("1B") == 0 ) - { - lambda = GPS_C_m_s / Galileo_E1_FREQ_HZ; - } - psrng_s = (gnss_synchro.Carrier_phase_rads / GPS_TWO_PI) * lambda - rough_range_s; + if (sig.compare("5X") == 0 ) + { + lambda = GPS_C_m_s / Galileo_E5a_FREQ_HZ; + } + if (sig.compare("1B") == 0 ) + { + lambda = GPS_C_m_s / Galileo_E1_FREQ_HZ; + } + psrng_s = (gnss_synchro.Carrier_phase_rads / GPS_TWO_PI) * lambda - rough_range_s; - DF400 = std::bitset<15>(static_cast( psrng_s)); // Units!! + DF400 = std::bitset<15>(static_cast( psrng_s)); // Units!! return 0; }