mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Apply fixes by clang-tidy

This commit is contained in:
Carles Fernandez 2019-06-30 00:01:54 +02:00
parent d75abe6758
commit d5e5e5725d
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
19 changed files with 91 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/algorithms/PVT/libs/rtcm.cc
View File

@ -2419,7 +2419,7 @@ std::string Rtcm::get_MSM_1_content_sat_data(const std::map<int32_t, Gnss_Synchr
if (it == pos.end()) if (it == pos.end())
{ {
pos.push_back(65 - gnss_synchro_iter->second.PRN); pos.push_back(65 - gnss_synchro_iter->second.PRN);
observables_vector.push_back(*gnss_synchro_iter); observables_vector.emplace_back(*gnss_synchro_iter);
} }
} }
@ -2448,7 +2448,7 @@ std::string Rtcm::get_MSM_1_content_signal_data(const std::map<int32_t, Gnss_Syn
map_iter != observables.cend(); map_iter != observables.cend();
map_iter++) map_iter++)
{ {
observables_vector.push_back(*map_iter); observables_vector.emplace_back(*map_iter);
} }
std::vector<std::pair<int32_t, Gnss_Synchro> > ordered_by_signal = Rtcm::sort_by_signal(observables_vector); std::vector<std::pair<int32_t, Gnss_Synchro> > ordered_by_signal = Rtcm::sort_by_signal(observables_vector);
@ -2556,7 +2556,7 @@ std::string Rtcm::get_MSM_2_content_signal_data(const Gps_Ephemeris& ephNAV,
map_iter != observables.cend(); map_iter != observables.cend();
map_iter++) map_iter++)
{ {
observables_vector.push_back(*map_iter); observables_vector.emplace_back(*map_iter);
} }
std::vector<std::pair<int32_t, Gnss_Synchro> > ordered_by_signal = Rtcm::sort_by_signal(observables_vector); std::vector<std::pair<int32_t, Gnss_Synchro> > ordered_by_signal = Rtcm::sort_by_signal(observables_vector);
@ -2670,7 +2670,7 @@ std::string Rtcm::get_MSM_3_content_signal_data(const Gps_Ephemeris& ephNAV,
map_iter != observables.cend(); map_iter != observables.cend();
map_iter++) map_iter++)
{ {
observables_vector.push_back(*map_iter); observables_vector.emplace_back(*map_iter);
} }
std::vector<std::pair<int32_t, Gnss_Synchro> > ordered_by_signal = Rtcm::sort_by_signal(observables_vector); std::vector<std::pair<int32_t, Gnss_Synchro> > ordered_by_signal = Rtcm::sort_by_signal(observables_vector);
@ -2786,7 +2786,7 @@ std::string Rtcm::get_MSM_4_content_sat_data(const std::map<int32_t, Gnss_Synchr
if (it == pos.end()) if (it == pos.end())
{ {
pos.push_back(65 - gnss_synchro_iter->second.PRN); pos.push_back(65 - gnss_synchro_iter->second.PRN);
observables_vector.push_back(*gnss_synchro_iter); observables_vector.emplace_back(*gnss_synchro_iter);
} }
} }
@ -2827,7 +2827,7 @@ std::string Rtcm::get_MSM_4_content_signal_data(const Gps_Ephemeris& ephNAV,
map_iter != observables.cend(); map_iter != observables.cend();
map_iter++) map_iter++)
{ {
observables_vector.push_back(*map_iter); observables_vector.emplace_back(*map_iter);
} }
std::vector<std::pair<int32_t, Gnss_Synchro> > ordered_by_signal = Rtcm::sort_by_signal(observables_vector); std::vector<std::pair<int32_t, Gnss_Synchro> > ordered_by_signal = Rtcm::sort_by_signal(observables_vector);
@ -2947,7 +2947,7 @@ std::string Rtcm::get_MSM_5_content_sat_data(const std::map<int32_t, Gnss_Synchr
if (it == pos.end()) if (it == pos.end())
{ {
pos.push_back(65 - gnss_synchro_iter->second.PRN); pos.push_back(65 - gnss_synchro_iter->second.PRN);
observables_vector.push_back(*gnss_synchro_iter); observables_vector.emplace_back(*gnss_synchro_iter);
} }
} }
@ -2993,7 +2993,7 @@ std::string Rtcm::get_MSM_5_content_signal_data(const Gps_Ephemeris& ephNAV,
map_iter != observables.cend(); map_iter != observables.cend();
map_iter++) map_iter++)
{ {
observables_vector.push_back(*map_iter); observables_vector.emplace_back(*map_iter);
} }
std::vector<std::pair<int32_t, Gnss_Synchro> > ordered_by_signal = Rtcm::sort_by_signal(observables_vector); std::vector<std::pair<int32_t, Gnss_Synchro> > ordered_by_signal = Rtcm::sort_by_signal(observables_vector);
@ -3114,7 +3114,7 @@ std::string Rtcm::get_MSM_6_content_signal_data(const Gps_Ephemeris& ephNAV,
map_iter != observables.cend(); map_iter != observables.cend();
map_iter++) map_iter++)
{ {
observables_vector.push_back(*map_iter); observables_vector.emplace_back(*map_iter);
} }
std::vector<std::pair<int32_t, Gnss_Synchro> > ordered_by_signal = Rtcm::sort_by_signal(observables_vector); std::vector<std::pair<int32_t, Gnss_Synchro> > ordered_by_signal = Rtcm::sort_by_signal(observables_vector);
@ -3234,7 +3234,7 @@ std::string Rtcm::get_MSM_7_content_signal_data(const Gps_Ephemeris& ephNAV,
map_iter != observables.cend(); map_iter != observables.cend();
map_iter++) map_iter++)
{ {
observables_vector.push_back(*map_iter); observables_vector.emplace_back(*map_iter);
} }
std::vector<std::pair<int32_t, Gnss_Synchro> > ordered_by_signal = Rtcm::sort_by_signal(observables_vector); std::vector<std::pair<int32_t, Gnss_Synchro> > ordered_by_signal = Rtcm::sort_by_signal(observables_vector);
@ -3685,7 +3685,7 @@ uint32_t Rtcm::msm_extended_lock_time_indicator(uint32_t lock_time_period_s)
if( 16777216 <= lock_time_period_s && lock_time_period_s < 33554432 ) return (640 + (lock_time_period_s - 16777216) / 524288 ); if( 16777216 <= lock_time_period_s && lock_time_period_s < 33554432 ) return (640 + (lock_time_period_s - 16777216) / 524288 );
if( 33554432 <= lock_time_period_s && lock_time_period_s < 67108864 ) return (672 + (lock_time_period_s - 33554432) / 1048576); if( 33554432 <= lock_time_period_s && lock_time_period_s < 67108864 ) return (672 + (lock_time_period_s - 33554432) / 1048576);
if( 67108864 <= lock_time_period_s ) return (704 ); if( 67108864 <= lock_time_period_s ) return (704 );
return 1023; // will never happen return 1023; // will never happen
} }
// clang-format on // clang-format on

5
src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc
View File

@ -66,7 +66,10 @@ BeidouB3iPcpsAcquisition::BeidouB3iPcpsAcquisition(
blocking_ = configuration_->property(role + ".blocking", true); blocking_ = configuration_->property(role + ".blocking", true);
acq_parameters.blocking = blocking_; acq_parameters.blocking = blocking_;
doppler_max_ = configuration_->property(role + ".doppler_max", 5000); doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max; if (FLAGS_doppler_max != 0)
{
doppler_max_ = FLAGS_doppler_max;
}
acq_parameters.doppler_max = doppler_max_; acq_parameters.doppler_max = doppler_max_;
sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 1); sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 1);
acq_parameters.sampled_ms = sampled_ms_; acq_parameters.sampled_ms = sampled_ms_;

5
src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc
View File

@ -60,7 +60,10 @@ GpsL1CaPcpsOpenClAcquisition::GpsL1CaPcpsOpenClAcquisition(
fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
dump_ = configuration_->property(role + ".dump", false); dump_ = configuration_->property(role + ".dump", false);
doppler_max_ = configuration->property(role + ".doppler_max", 5000); doppler_max_ = configuration->property(role + ".doppler_max", 5000);
if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max; if (FLAGS_doppler_max != 0)
{
doppler_max_ = FLAGS_doppler_max;
}
sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 1); sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 1);
bit_transition_flag_ = configuration_->property("Acquisition.bit_transition_flag", false); bit_transition_flag_ = configuration_->property("Acquisition.bit_transition_flag", false);

2
src/algorithms/libs/galileo_e1_signal_processing.cc
View File

@ -217,7 +217,7 @@ void galileo_e1_code_gen_float_sampled(gsl::span<float> _dest, const std::array<
{ {
for (unsigned k = 0; k < _samplesPerCode; k++) for (unsigned k = 0; k < _samplesPerCode; k++)
{ {
_signal_E1C_secondary_span[i * _samplesPerCode + k] = _signal_E1_span_aux[k] * (GALILEO_E1_C_SECONDARY_CODE.at(i) == '0' ? 1.0f : -1.0f); _signal_E1C_secondary_span[i * _samplesPerCode + k] = _signal_E1_span_aux[k] * (GALILEO_E1_C_SECONDARY_CODE.at(i) == '0' ? 1.0F : -1.0F);
} }
} }

4
src/algorithms/signal_source/adapters/custom_udp_signal_source.cc
View File

@ -81,7 +81,7 @@ CustomUDPSignalSource::CustomUDPSignalSource(ConfigurationInterface* configurati
{ {
for (int n = 0; n < channels_in_udp_; n++) for (int n = 0; n < channels_in_udp_; n++)
{ {
null_sinks_.push_back(gr::blocks::null_sink::make(sizeof(gr_complex))); null_sinks_.emplace_back(gr::blocks::null_sink::make(sizeof(gr_complex)));
} }
} }
else else
@ -95,7 +95,7 @@ CustomUDPSignalSource::CustomUDPSignalSource(ConfigurationInterface* configurati
for (int n = 0; n < channels_in_udp_; n++) for (int n = 0; n < channels_in_udp_; n++)
{ {
DLOG(INFO) << "Dumping output into file " << (dump_filename_ + "c_h" + std::to_string(n) + ".bin"); DLOG(INFO) << "Dumping output into file " << (dump_filename_ + "c_h" + std::to_string(n) + ".bin");
file_sink_.push_back(gr::blocks::file_sink::make(item_size_, (dump_filename_ + "_ch" + std::to_string(n) + ".bin").c_str())); file_sink_.emplace_back(gr::blocks::file_sink::make(item_size_, (dump_filename_ + "_ch" + std::to_string(n) + ".bin").c_str()));
} }
} }
if (in_stream_ > 0) if (in_stream_ > 0)

15
src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc
View File

@ -290,7 +290,10 @@ void Gr_Complex_Ip_Packet_Source::pcap_callback(__attribute__((unused)) u_char *
// write all in a single memcpy // write all in a single memcpy
memcpy(&fifo_buff[fifo_write_ptr], &udp_payload[0], payload_length_bytes); // size in bytes memcpy(&fifo_buff[fifo_write_ptr], &udp_payload[0], payload_length_bytes); // size in bytes
fifo_write_ptr += payload_length_bytes; fifo_write_ptr += payload_length_bytes;
if (fifo_write_ptr == FIFO_SIZE) fifo_write_ptr = 0; if (fifo_write_ptr == FIFO_SIZE)
{
fifo_write_ptr = 0;
}
fifo_items += payload_length_bytes; fifo_items += payload_length_bytes;
} }
else else
@ -378,7 +381,10 @@ void Gr_Complex_Ip_Packet_Source::demux_samples(gr_vector_void_star output_items
std::cout << "Unknown wire sample type\n"; std::cout << "Unknown wire sample type\n";
exit(0); exit(0);
} }
if (fifo_read_ptr == FIFO_SIZE) fifo_read_ptr = 0; if (fifo_read_ptr == FIFO_SIZE)
{
fifo_read_ptr = 0;
}
} }
} }
@ -389,7 +395,10 @@ int Gr_Complex_Ip_Packet_Source::work(int noutput_items,
{ {
// send samples to next GNU Radio block // send samples to next GNU Radio block
boost::mutex::scoped_lock lock(d_mutex); // hold mutex for duration of this function boost::mutex::scoped_lock lock(d_mutex); // hold mutex for duration of this function
if (fifo_items == 0) return 0; if (fifo_items == 0)
{
return 0;
}
if (output_items.size() > static_cast<uint64_t>(d_n_baseband_channels)) if (output_items.size() > static_cast<uint64_t>(d_n_baseband_channels))
{ {

10
src/algorithms/tracking/adapters/beidou_b3i_dll_pll_tracking.cc
View File

@ -59,14 +59,20 @@ BeidouB3iDllPllTracking::BeidouB3iDllPllTracking(
bool dump = configuration->property(role + ".dump", false); bool dump = configuration->property(role + ".dump", false);
trk_param.dump = dump; trk_param.dump = dump;
float pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0); float pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0);
if (FLAGS_pll_bw_hz != 0.0) pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz); if (FLAGS_pll_bw_hz != 0.0)
{
pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
}
trk_param.pll_bw_hz = pll_bw_hz; trk_param.pll_bw_hz = pll_bw_hz;
float pll_bw_narrow_hz = configuration->property(role + ".pll_bw_narrow_hz", 20.0); float pll_bw_narrow_hz = configuration->property(role + ".pll_bw_narrow_hz", 20.0);
trk_param.pll_bw_narrow_hz = pll_bw_narrow_hz; trk_param.pll_bw_narrow_hz = pll_bw_narrow_hz;
float dll_bw_narrow_hz = configuration->property(role + ".dll_bw_narrow_hz", 2.0); float dll_bw_narrow_hz = configuration->property(role + ".dll_bw_narrow_hz", 2.0);
trk_param.dll_bw_narrow_hz = dll_bw_narrow_hz; trk_param.dll_bw_narrow_hz = dll_bw_narrow_hz;
float dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0); float dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz); if (FLAGS_dll_bw_hz != 0.0)
{
dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
}
trk_param.dll_bw_hz = dll_bw_hz; trk_param.dll_bw_hz = dll_bw_hz;
int dll_filter_order = configuration->property(role + ".dll_filter_order", 2); int dll_filter_order = configuration->property(role + ".dll_filter_order", 2);

16
src/core/receiver/control_thread.cc
View File

@ -933,8 +933,8 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
if (El > 0) if (El > 0)
{ {
std::cout << "Using GPS Ephemeris: Sat " << it.second.i_satellite_PRN << " Az: " << Az << " El: " << El << std::endl; std::cout << "Using GPS Ephemeris: Sat " << it.second.i_satellite_PRN << " Az: " << Az << " El: " << El << std::endl;
available_satellites.push_back(std::pair<int, Gnss_Satellite>(floor(El), available_satellites.emplace_back(floor(El),
(Gnss_Satellite(std::string("GPS"), it.second.i_satellite_PRN)))); (Gnss_Satellite(std::string("GPS"), it.second.i_satellite_PRN)));
visible_gps.push_back(it.second.i_satellite_PRN); visible_gps.push_back(it.second.i_satellite_PRN);
} }
} }
@ -956,8 +956,8 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
if (El > 0) if (El > 0)
{ {
std::cout << "Using Galileo Ephemeris: Sat " << it.second.i_satellite_PRN << " Az: " << Az << " El: " << El << std::endl; std::cout << "Using Galileo Ephemeris: Sat " << it.second.i_satellite_PRN << " Az: " << Az << " El: " << El << std::endl;
available_satellites.push_back(std::pair<int, Gnss_Satellite>(floor(El), available_satellites.emplace_back(floor(El),
(Gnss_Satellite(std::string("Galileo"), it.second.i_satellite_PRN)))); (Gnss_Satellite(std::string("Galileo"), it.second.i_satellite_PRN)));
visible_gal.push_back(it.second.i_satellite_PRN); visible_gal.push_back(it.second.i_satellite_PRN);
} }
} }
@ -984,8 +984,8 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
if (it2 == visible_gps.end()) if (it2 == visible_gps.end())
{ {
std::cout << "Using GPS Almanac: Sat " << it.second.i_satellite_PRN << " Az: " << Az << " El: " << El << std::endl; std::cout << "Using GPS Almanac: Sat " << it.second.i_satellite_PRN << " Az: " << Az << " El: " << El << std::endl;
available_satellites.push_back(std::pair<int, Gnss_Satellite>(floor(El), available_satellites.emplace_back(floor(El),
(Gnss_Satellite(std::string("GPS"), it.second.i_satellite_PRN)))); (Gnss_Satellite(std::string("GPS"), it.second.i_satellite_PRN)));
} }
} }
} }
@ -1012,8 +1012,8 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
if (it2 == visible_gal.end()) if (it2 == visible_gal.end())
{ {
std::cout << "Using Galileo Almanac: Sat " << it.second.i_satellite_PRN << " Az: " << Az << " El: " << El << std::endl; std::cout << "Using Galileo Almanac: Sat " << it.second.i_satellite_PRN << " Az: " << Az << " El: " << El << std::endl;
available_satellites.push_back(std::pair<int, Gnss_Satellite>(floor(El), available_satellites.emplace_back(floor(El),
(Gnss_Satellite(std::string("Galileo"), it.second.i_satellite_PRN)))); (Gnss_Satellite(std::string("Galileo"), it.second.i_satellite_PRN)));
} }
} }
} }

50
src/core/receiver/gnss_flowgraph.cc
View File

@ -1854,9 +1854,9 @@ void GNSSFlowgraph::set_signals_list()
available_gnss_prn_iter != available_gps_prn.cend(); available_gnss_prn_iter != available_gps_prn.cend();
available_gnss_prn_iter++) available_gnss_prn_iter++)
{ {
available_GPS_1C_signals_.push_back(Gnss_Signal( available_GPS_1C_signals_.emplace_back(
Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter), Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter),
std::string("1C"))); std::string("1C"));
} }
} }
@ -1867,9 +1867,9 @@ void GNSSFlowgraph::set_signals_list()
available_gnss_prn_iter != available_gps_prn.cend(); available_gnss_prn_iter != available_gps_prn.cend();
available_gnss_prn_iter++) available_gnss_prn_iter++)
{ {
available_GPS_2S_signals_.push_back(Gnss_Signal( available_GPS_2S_signals_.emplace_back(
Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter), Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter),
std::string("2S"))); std::string("2S"));
} }
} }
@ -1880,9 +1880,9 @@ void GNSSFlowgraph::set_signals_list()
available_gnss_prn_iter != available_gps_prn.cend(); available_gnss_prn_iter != available_gps_prn.cend();
available_gnss_prn_iter++) available_gnss_prn_iter++)
{ {
available_GPS_L5_signals_.push_back(Gnss_Signal( available_GPS_L5_signals_.emplace_back(
Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter), Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter),
std::string("L5"))); std::string("L5"));
} }
} }
@ -1893,9 +1893,9 @@ void GNSSFlowgraph::set_signals_list()
available_gnss_prn_iter != available_sbas_prn.cend(); available_gnss_prn_iter != available_sbas_prn.cend();
available_gnss_prn_iter++) available_gnss_prn_iter++)
{ {
available_SBAS_1C_signals_.push_back(Gnss_Signal( available_SBAS_1C_signals_.emplace_back(
Gnss_Satellite(std::string("SBAS"), *available_gnss_prn_iter), Gnss_Satellite(std::string("SBAS"), *available_gnss_prn_iter),
std::string("1C"))); std::string("1C"));
} }
} }
@ -1906,9 +1906,9 @@ void GNSSFlowgraph::set_signals_list()
available_gnss_prn_iter != available_galileo_prn.cend(); available_gnss_prn_iter != available_galileo_prn.cend();
available_gnss_prn_iter++) available_gnss_prn_iter++)
{ {
available_GAL_1B_signals_.push_back(Gnss_Signal( available_GAL_1B_signals_.emplace_back(
Gnss_Satellite(std::string("Galileo"), *available_gnss_prn_iter), Gnss_Satellite(std::string("Galileo"), *available_gnss_prn_iter),
std::string("1B"))); std::string("1B"));
} }
} }
@ -1919,9 +1919,9 @@ void GNSSFlowgraph::set_signals_list()
available_gnss_prn_iter != available_galileo_prn.cend(); available_gnss_prn_iter != available_galileo_prn.cend();
available_gnss_prn_iter++) available_gnss_prn_iter++)
{ {
available_GAL_5X_signals_.push_back(Gnss_Signal( available_GAL_5X_signals_.emplace_back(
Gnss_Satellite(std::string("Galileo"), *available_gnss_prn_iter), Gnss_Satellite(std::string("Galileo"), *available_gnss_prn_iter),
std::string("5X"))); std::string("5X"));
} }
} }
@ -1932,9 +1932,9 @@ void GNSSFlowgraph::set_signals_list()
available_gnss_prn_iter != available_glonass_prn.cend(); available_gnss_prn_iter != available_glonass_prn.cend();
available_gnss_prn_iter++) available_gnss_prn_iter++)
{ {
available_GLO_1G_signals_.push_back(Gnss_Signal( available_GLO_1G_signals_.emplace_back(
Gnss_Satellite(std::string("Glonass"), *available_gnss_prn_iter), Gnss_Satellite(std::string("Glonass"), *available_gnss_prn_iter),
std::string("1G"))); std::string("1G"));
} }
} }
@ -1945,9 +1945,9 @@ void GNSSFlowgraph::set_signals_list()
available_gnss_prn_iter != available_glonass_prn.cend(); available_gnss_prn_iter != available_glonass_prn.cend();
available_gnss_prn_iter++) available_gnss_prn_iter++)
{ {
available_GLO_2G_signals_.push_back(Gnss_Signal( available_GLO_2G_signals_.emplace_back(
Gnss_Satellite(std::string("Glonass"), *available_gnss_prn_iter), Gnss_Satellite(std::string("Glonass"), *available_gnss_prn_iter),
std::string("2G"))); std::string("2G"));
} }
} }
@ -1960,9 +1960,9 @@ void GNSSFlowgraph::set_signals_list()
available_gnss_prn_iter != available_beidou_prn.cend(); available_gnss_prn_iter != available_beidou_prn.cend();
available_gnss_prn_iter++) available_gnss_prn_iter++)
{ {
available_BDS_B1_signals_.push_back(Gnss_Signal( available_BDS_B1_signals_.emplace_back(
Gnss_Satellite(std::string("Beidou"), *available_gnss_prn_iter), Gnss_Satellite(std::string("Beidou"), *available_gnss_prn_iter),
std::string("B1"))); std::string("B1"));
} }
} }
@ -1975,9 +1975,9 @@ void GNSSFlowgraph::set_signals_list()
available_gnss_prn_iter != available_beidou_prn.cend(); available_gnss_prn_iter != available_beidou_prn.cend();
available_gnss_prn_iter++) available_gnss_prn_iter++)
{ {
available_BDS_B3_signals_.push_back(Gnss_Signal( available_BDS_B3_signals_.emplace_back(
Gnss_Satellite(std::string("Beidou"), *available_gnss_prn_iter), Gnss_Satellite(std::string("Beidou"), *available_gnss_prn_iter),
std::string("B3"))); std::string("B3"));
} }
} }
} }
@ -2243,7 +2243,10 @@ Gnss_Signal GNSSFlowgraph::search_next_signal(const std::string& searched_signal
{ {
for (unsigned int ch = 0; ch < channels_count_; ch++) for (unsigned int ch = 0; ch < channels_count_; ch++)
{ {
if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "2G")) untracked_satellite = false; if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "2G"))
{
untracked_satellite = false;
}
} }
if (untracked_satellite) if (untracked_satellite)
{ {
@ -2268,7 +2271,10 @@ Gnss_Signal GNSSFlowgraph::search_next_signal(const std::string& searched_signal
{ {
for (unsigned int ch = 0; ch < channels_count_; ch++) for (unsigned int ch = 0; ch < channels_count_; ch++)
{ {
if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "2G")) untracked_satellite = false; if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "2G"))
{
untracked_satellite = false;
}
} }
if (untracked_satellite) if (untracked_satellite)
{ {

4
src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
View File

@ -88,7 +88,7 @@ private:
public: public:
int rx_message; int rx_message;
~GpsL1CaPcpsAcquisitionTest_msg_rx(); //!< Default destructor ~GpsL1CaPcpsAcquisitionTest_msg_rx() override; //!< Default destructor
}; };
@ -139,7 +139,7 @@ protected:
doppler_step = 100; doppler_step = 100;
} }
~GpsL1CaPcpsAcquisitionTest() = default; ~GpsL1CaPcpsAcquisitionTest() override = default;
void init(); void init();
void plot_grid(); void plot_grid();

2
src/tests/unit-tests/signal-processing-blocks/adapter/adapter_test.cc
View File

@ -51,7 +51,7 @@ class DataTypeAdapter : public ::testing::Test
{ {
public: public:
DataTypeAdapter(); DataTypeAdapter();
~DataTypeAdapter(); ~DataTypeAdapter() override;
int run_byte_to_short_block(); int run_byte_to_short_block();
int run_ibyte_to_cbyte_block(); int run_ibyte_to_cbyte_block();
int run_ibyte_to_complex_block(); int run_ibyte_to_complex_block();

2
src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc
View File

@ -63,7 +63,7 @@ protected:
item_size = sizeof(gr_complex); item_size = sizeof(gr_complex);
config = std::make_shared<InMemoryConfiguration>(); config = std::make_shared<InMemoryConfiguration>();
} }
~FirFilterTest() = default; ~FirFilterTest() override = default;
void init(); void init();
void configure_cbyte_cbyte(); void configure_cbyte_cbyte();

2
src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc
View File

@ -62,7 +62,7 @@ protected:
config = std::make_shared<InMemoryConfiguration>(); config = std::make_shared<InMemoryConfiguration>();
nsamples = FLAGS_notch_filter_lite_test_nsamples; nsamples = FLAGS_notch_filter_lite_test_nsamples;
} }
~NotchFilterLiteTest() = default; ~NotchFilterLiteTest() override = default;
void init(); void init();
void configure_gr_complex_gr_complex(); void configure_gr_complex_gr_complex();

2
src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc
View File

@ -62,7 +62,7 @@ protected:
config = std::make_shared<InMemoryConfiguration>(); config = std::make_shared<InMemoryConfiguration>();
nsamples = FLAGS_notch_filter_test_nsamples; nsamples = FLAGS_notch_filter_test_nsamples;
} }
~NotchFilterTest() = default; ~NotchFilterTest() override = default;
void init(); void init();
void configure_gr_complex_gr_complex(); void configure_gr_complex_gr_complex();

2
src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc
View File

@ -62,7 +62,7 @@ protected:
config = std::make_shared<InMemoryConfiguration>(); config = std::make_shared<InMemoryConfiguration>();
nsamples = FLAGS_pb_filter_test_nsamples; nsamples = FLAGS_pb_filter_test_nsamples;
} }
~PulseBlankingFilterTest() = default; ~PulseBlankingFilterTest() override = default;
void init(); void init();
void configure_gr_complex_gr_complex(); void configure_gr_complex_gr_complex();

4
src/tests/unit-tests/signal-processing-blocks/tracking/cubature_filter_test.cc
View File

@ -40,7 +40,7 @@ class TransitionModel : public ModelFunction
{ {
public: public:
explicit TransitionModel(const arma::mat& kf_F) { coeff_mat = kf_F; }; explicit TransitionModel(const arma::mat& kf_F) { coeff_mat = kf_F; };
virtual arma::vec operator()(const arma::vec& input) { return coeff_mat * input; }; arma::vec operator()(const arma::vec& input) override { return coeff_mat * input; };
private: private:
arma::mat coeff_mat; arma::mat coeff_mat;
@ -50,7 +50,7 @@ class MeasurementModel : public ModelFunction
{ {
public: public:
explicit MeasurementModel(const arma::mat& kf_H) { coeff_mat = kf_H; }; explicit MeasurementModel(const arma::mat& kf_H) { coeff_mat = kf_H; };
virtual arma::vec operator()(const arma::vec& input) { return coeff_mat * input; }; arma::vec operator()(const arma::vec& input) override { return coeff_mat * input; };
private: private:
arma::mat coeff_mat; arma::mat coeff_mat;

2
src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc
View File

@ -64,7 +64,7 @@ protected:
gnss_synchro = Gnss_Synchro(); gnss_synchro = Gnss_Synchro();
} }
~GalileoE1DllPllVemlTrackingInternalTest() = default; ~GalileoE1DllPllVemlTrackingInternalTest() override = default;
void init(); void init();

4
src/tests/unit-tests/signal-processing-blocks/tracking/unscented_filter_test.cc
View File

@ -40,7 +40,7 @@ class TransitionModelUKF : public ModelFunction
{ {
public: public:
explicit TransitionModelUKF(const arma::mat& kf_F) { coeff_mat = kf_F; }; explicit TransitionModelUKF(const arma::mat& kf_F) { coeff_mat = kf_F; };
virtual arma::vec operator()(const arma::vec& input) { return coeff_mat * input; }; arma::vec operator()(const arma::vec& input) override { return coeff_mat * input; };
private: private:
arma::mat coeff_mat; arma::mat coeff_mat;
@ -50,7 +50,7 @@ class MeasurementModelUKF : public ModelFunction
{ {
public: public:
explicit MeasurementModelUKF(const arma::mat& kf_H) { coeff_mat = kf_H; }; explicit MeasurementModelUKF(const arma::mat& kf_H) { coeff_mat = kf_H; };
virtual arma::vec operator()(const arma::vec& input) { return coeff_mat * input; }; arma::vec operator()(const arma::vec& input) override { return coeff_mat * input; };
private: private:
arma::mat coeff_mat; arma::mat coeff_mat;

2
src/utils/front-end-cal/main.cc
View File

@ -122,7 +122,7 @@ private:
public: public:
int rx_message; int rx_message;
~FrontEndCal_msg_rx(); //!< Default destructor ~FrontEndCal_msg_rx() override; //!< Default destructor
}; };