mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-06 02:03:04 +00:00
Code Issues Releases Wiki Activity

Apply fixes by clang-tidy

Browse Source
This commit is contained in:
Carles Fernandez
2019-06-30 00:01:54 +02:00
parent d75abe6758
commit d5e5e5725d
19 changed files with 91 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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_1C_signals_.push_back(Gnss_Signal(
available_GPS_1C_signals_.emplace_back(
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_2S_signals_.push_back(Gnss_Signal(
available_GPS_2S_signals_.emplace_back(
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_L5_signals_.push_back(Gnss_Signal(
available_GPS_L5_signals_.emplace_back(
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_1C_signals_.push_back(Gnss_Signal(
available_SBAS_1C_signals_.emplace_back(
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_GAL_1B_signals_.push_back(Gnss_Signal(
available_GAL_1B_signals_.emplace_back(
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_GAL_5X_signals_.push_back(Gnss_Signal(
available_GAL_5X_signals_.emplace_back(
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_GLO_1G_signals_.push_back(Gnss_Signal(
available_GLO_1G_signals_.emplace_back(
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_GLO_2G_signals_.push_back(Gnss_Signal(
available_GLO_2G_signals_.emplace_back(
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_BDS_B1_signals_.push_back(Gnss_Signal(
available_BDS_B1_signals_.emplace_back(
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_BDS_B3_signals_.push_back(Gnss_Signal(
available_BDS_B3_signals_.emplace_back(
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++)
{
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)
{
@@ -2268,7 +2271,10 @@ Gnss_Signal GNSSFlowgraph::search_next_signal(const std::string& searched_signal
{
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)
{