mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-04-17 20:31:26 +00:00
Code Issues Releases Wiki Activity

Transition to clang-format 19

Browse Source
This commit is contained in:
Carles Fernandez
2024-12-26 11:18:41 +01:00
parent e805a08ff5
commit 700d4403d5
66 changed files with 628 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/interfaces/gnss_block_interface.h
View File

@@ -83,7 +83,7 @@ public:
assert(RF_channel >= 0);
if (RF_channel == 0)
{
}; // avoid unused param warning
}; // avoid unused param warning
return nullptr; // added to support raw array access (non pure virtual to allow left unimplemented)= 0;
}
virtual gr::basic_block_sptr get_right_block(int RF_channel)
@@ -91,14 +91,14 @@ public:
assert(RF_channel >= 0);
if (RF_channel == 0)
{
}; // avoid unused param warning
}; // avoid unused param warning
return nullptr; // added to support raw array access (non pure virtual to allow left unimplemented)= 0;
}
/*!
* \brief Start the flow of samples if needed.
*/
virtual void start(){};
virtual void start() {};
};

6
src/core/libs/gnss_sdr_supl_client.cc
View File

@@ -871,9 +871,9 @@ bool Gnss_Sdr_Supl_Client::read_gal_almanac_from_gsa(const std::string& file_nam
return false;
}
for (pugi::xml_node almanac : doc.child("signalData")
.child("body")
.child("Almanacs")
.children("svAlmanac"))
.child("body")
.child("Almanacs")
.children("svAlmanac"))
{
Galileo_Almanac gal_alm;
try

2
src/core/libs/osnma_msg_receiver.cc
View File

@@ -206,7 +206,7 @@ void osnma_msg_receiver::msg_handler_osnma(const pmt::pmt_t& msg)
}
process_osnma_message(nma_msg);
} // OSNMA frame received
} // OSNMA frame received
else if (msg_type_hash_code == typeid(std::shared_ptr<std::tuple<uint32_t, std::string, uint32_t>>).hash_code()) // Navigation data bits for OSNMA received
{
const auto inav_data = wht::any_cast<std::shared_ptr<std::tuple<uint32_t, std::string, uint32_t>>>(pmt::any_ref(msg));

2
src/core/libs/supl/types/asn_internal.h
View File

@@ -19,7 +19,7 @@ extern "C"
{
#endif
// clang-format off
// clang-format off
/* Environment version might be used to avoid running with the old library */
#define ASN1C_ENVIRONMENT_VERSION 922 /* Compile-time version */
int get_asn1c_environment_version(void); /* Run-time version */

2
src/core/libs/supl/types/asn_system.h
View File

@@ -29,7 +29,7 @@
/* To avoid linking with ws2_32.lib, here's the definition of ntohl() */
#define sys_ntohl(l) \
((((l) << 24) & 0xff000000) | (((l) << 16) & 0xff0000) | \
(((l) << 8) & 0xff00) | ((l)&0xff))
(((l) << 8) & 0xff00) | ((l) & 0xff))
#ifdef _MSC_VER /* MSVS.Net */
#ifndef __cplusplus

2
src/core/libs/supl/types/ber_tlv_tag.h
View File

@@ -22,7 +22,7 @@ extern "C"
/*
* Tag class is encoded together with tag value for optimization purposes.
*/
#define BER_TAG_CLASS(tag) ((tag)&0x3)
#define BER_TAG_CLASS(tag) ((tag) & 0x3)
#define BER_TAG_VALUE(tag) ((tag) >> 2)
#define BER_TLV_CONSTRUCTED(tagptr) \
(((*(const uint8_t *)tagptr) & 0x20) ? 1 : 0)

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

@@ -244,9 +244,7 @@ void ControlThread::init()
else
{
// fill agnss_ref_time_
struct tm tm
{
};
struct tm tm{};
if (strptime(ref_time_str.c_str(), "%d/%m/%Y %H:%M:%S", &tm) != nullptr)
{
agnss_ref_time_.seconds = timegm(&tm);
@@ -560,8 +558,8 @@ bool ControlThread::read_assistance_from_XML()
{
std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter;
for (gps_eph_iter = supl_client_ephemeris_.gps_ephemeris_map.cbegin();
gps_eph_iter != supl_client_ephemeris_.gps_ephemeris_map.cend();
gps_eph_iter++)
gps_eph_iter != supl_client_ephemeris_.gps_ephemeris_map.cend();
gps_eph_iter++)
{
std::cout << "From XML file: Read NAV ephemeris for satellite " << Gnss_Satellite("GPS", gps_eph_iter->second.PRN) << '\n';
const std::shared_ptr<Gps_Ephemeris> tmp_obj = std::make_shared<Gps_Ephemeris>(gps_eph_iter->second);
@@ -590,8 +588,8 @@ bool ControlThread::read_assistance_from_XML()
{
std::map<int, Gps_Almanac>::const_iterator gps_alm_iter;
for (gps_alm_iter = supl_client_ephemeris_.gps_almanac_map.cbegin();
gps_alm_iter != supl_client_ephemeris_.gps_almanac_map.cend();
gps_alm_iter++)
gps_alm_iter != supl_client_ephemeris_.gps_almanac_map.cend();
gps_alm_iter++)
{
std::cout << "From XML file: Read GPS almanac for satellite " << Gnss_Satellite("GPS", gps_alm_iter->second.PRN) << '\n';
const std::shared_ptr<Gps_Almanac> tmp_obj = std::make_shared<Gps_Almanac>(gps_alm_iter->second);
@@ -608,8 +606,8 @@ bool ControlThread::read_assistance_from_XML()
{
std::map<int, Galileo_Ephemeris>::const_iterator gal_eph_iter;
for (gal_eph_iter = supl_client_ephemeris_.gal_ephemeris_map.cbegin();
gal_eph_iter != supl_client_ephemeris_.gal_ephemeris_map.cend();
gal_eph_iter++)
gal_eph_iter != supl_client_ephemeris_.gal_ephemeris_map.cend();
gal_eph_iter++)
{
std::cout << "From XML file: Read ephemeris for satellite " << Gnss_Satellite("Galileo", gal_eph_iter->second.PRN) << '\n';
const std::shared_ptr<Galileo_Ephemeris> tmp_obj = std::make_shared<Galileo_Ephemeris>(gal_eph_iter->second);
@@ -638,8 +636,8 @@ bool ControlThread::read_assistance_from_XML()
{
std::map<int, Galileo_Almanac>::const_iterator gal_alm_iter;
for (gal_alm_iter = supl_client_ephemeris_.gal_almanac_map.cbegin();
gal_alm_iter != supl_client_ephemeris_.gal_almanac_map.cend();
gal_alm_iter++)
gal_alm_iter != supl_client_ephemeris_.gal_almanac_map.cend();
gal_alm_iter++)
{
std::cout << "From XML file: Read Galileo almanac for satellite " << Gnss_Satellite("Galileo", gal_alm_iter->second.PRN) << '\n';
const std::shared_ptr<Galileo_Almanac> tmp_obj = std::make_shared<Galileo_Almanac>(gal_alm_iter->second);
@@ -655,8 +653,8 @@ bool ControlThread::read_assistance_from_XML()
{
std::map<int, Gps_CNAV_Ephemeris>::const_iterator gps_cnav_eph_iter;
for (gps_cnav_eph_iter = supl_client_ephemeris_.gps_cnav_ephemeris_map.cbegin();
gps_cnav_eph_iter != supl_client_ephemeris_.gps_cnav_ephemeris_map.cend();
gps_cnav_eph_iter++)
gps_cnav_eph_iter != supl_client_ephemeris_.gps_cnav_ephemeris_map.cend();
gps_cnav_eph_iter++)
{
std::cout << "From XML file: Read CNAV ephemeris for satellite " << Gnss_Satellite("GPS", gps_cnav_eph_iter->second.PRN) << '\n';
const std::shared_ptr<Gps_CNAV_Ephemeris> tmp_obj = std::make_shared<Gps_CNAV_Ephemeris>(gps_cnav_eph_iter->second);
@@ -680,8 +678,8 @@ bool ControlThread::read_assistance_from_XML()
{
std::map<int, Glonass_Gnav_Ephemeris>::const_iterator glo_gnav_eph_iter;
for (glo_gnav_eph_iter = supl_client_ephemeris_.glonass_gnav_ephemeris_map.cbegin();
glo_gnav_eph_iter != supl_client_ephemeris_.glonass_gnav_ephemeris_map.cend();
glo_gnav_eph_iter++)
glo_gnav_eph_iter != supl_client_ephemeris_.glonass_gnav_ephemeris_map.cend();
glo_gnav_eph_iter++)
{
std::cout << "From XML file: Read GLONASS GNAV ephemeris for satellite " << Gnss_Satellite("GLONASS", glo_gnav_eph_iter->second.PRN) << '\n';
const std::shared_ptr<Glonass_Gnav_Ephemeris> tmp_obj = std::make_shared<Glonass_Gnav_Ephemeris>(glo_gnav_eph_iter->second);
@@ -809,8 +807,8 @@ void ControlThread::assist_GNSS()
{
std::map<int, Gps_Ephemeris>::const_iterator gps_eph_iter;
for (gps_eph_iter = supl_client_ephemeris_.gps_ephemeris_map.cbegin();
gps_eph_iter != supl_client_ephemeris_.gps_ephemeris_map.cend();
gps_eph_iter++)
gps_eph_iter != supl_client_ephemeris_.gps_ephemeris_map.cend();
gps_eph_iter++)
{
std::cout << "SUPL: Received ephemeris data for satellite " << Gnss_Satellite("GPS", gps_eph_iter->second.PRN) << '\n';
const std::shared_ptr<Gps_Ephemeris> tmp_obj = std::make_shared<Gps_Ephemeris>(gps_eph_iter->second);
@@ -846,8 +844,8 @@ void ControlThread::assist_GNSS()
{
std::map<int, Gps_Almanac>::const_iterator gps_alm_iter;
for (gps_alm_iter = supl_client_ephemeris_.gps_almanac_map.cbegin();
gps_alm_iter != supl_client_ephemeris_.gps_almanac_map.cend();
gps_alm_iter++)
gps_alm_iter != supl_client_ephemeris_.gps_almanac_map.cend();
gps_alm_iter++)
{
std::cout << "SUPL: Received almanac data for satellite " << Gnss_Satellite("GPS", gps_alm_iter->second.PRN) << '\n';
const std::shared_ptr<Gps_Almanac> tmp_obj = std::make_shared<Gps_Almanac>(gps_alm_iter->second);
@@ -900,8 +898,8 @@ void ControlThread::assist_GNSS()
{
std::map<int, Gps_Acq_Assist>::const_iterator gps_acq_iter;
for (gps_acq_iter = supl_client_acquisition_.gps_acq_map.cbegin();
gps_acq_iter != supl_client_acquisition_.gps_acq_map.cend();
gps_acq_iter++)
gps_acq_iter != supl_client_acquisition_.gps_acq_map.cend();
gps_acq_iter++)
{
std::cout << "SUPL: Received acquisition assistance data for satellite " << Gnss_Satellite("GPS", gps_acq_iter->second.PRN) << '\n';
global_gps_acq_assist_map.write(gps_acq_iter->second.PRN, gps_acq_iter->second);
@@ -1046,9 +1044,7 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
std::vector<unsigned int> visible_gps;
std::vector<unsigned int> visible_gal;
const std::shared_ptr<PvtInterface> pvt_ptr = flowgraph_->get_pvt();
struct tm tstruct
{
};
struct tm tstruct{};
char buf[80];
tstruct = *gmtime(&rx_utc_time);
strftime(buf, sizeof(buf), "%d/%m/%Y %H:%M:%S ", &tstruct);

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

@@ -2485,8 +2485,8 @@ void GNSSFlowgraph::set_signals_list()
{
// Loop to create GPS L1 C/A signals
for (available_gnss_prn_iter = available_gps_prn.cbegin();
available_gnss_prn_iter != available_gps_prn.cend();
available_gnss_prn_iter++)
available_gnss_prn_iter != available_gps_prn.cend();
available_gnss_prn_iter++)
{
available_GPS_1C_signals_.emplace_back(
Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter),
@@ -2498,8 +2498,8 @@ void GNSSFlowgraph::set_signals_list()
{
// Loop to create GPS L2C M signals
for (available_gnss_prn_iter = available_gps_prn.cbegin();
available_gnss_prn_iter != available_gps_prn.cend();
available_gnss_prn_iter++)
available_gnss_prn_iter != available_gps_prn.cend();
available_gnss_prn_iter++)
{
available_GPS_2S_signals_.emplace_back(
Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter),
@@ -2511,8 +2511,8 @@ void GNSSFlowgraph::set_signals_list()
{
// Loop to create GPS L5 signals
for (available_gnss_prn_iter = available_gps_prn.cbegin();
available_gnss_prn_iter != available_gps_prn.cend();
available_gnss_prn_iter++)
available_gnss_prn_iter != available_gps_prn.cend();
available_gnss_prn_iter++)
{
available_GPS_L5_signals_.emplace_back(
Gnss_Satellite(std::string("GPS"), *available_gnss_prn_iter),
@@ -2524,8 +2524,8 @@ void GNSSFlowgraph::set_signals_list()
{
// Loop to create SBAS L1 C/A signals
for (available_gnss_prn_iter = available_sbas_prn.cbegin();
available_gnss_prn_iter != available_sbas_prn.cend();
available_gnss_prn_iter++)
available_gnss_prn_iter != available_sbas_prn.cend();
available_gnss_prn_iter++)
{
available_SBAS_1C_signals_.emplace_back(
Gnss_Satellite(std::string("SBAS"), *available_gnss_prn_iter),
@@ -2537,8 +2537,8 @@ void GNSSFlowgraph::set_signals_list()
{
// Loop to create the list of Galileo E1B signals
for (available_gnss_prn_iter = available_galileo_prn.cbegin();
available_gnss_prn_iter != available_galileo_prn.cend();
available_gnss_prn_iter++)
available_gnss_prn_iter != available_galileo_prn.cend();
available_gnss_prn_iter++)
{
available_GAL_1B_signals_.emplace_back(
Gnss_Satellite(std::string("Galileo"), *available_gnss_prn_iter),
@@ -2550,8 +2550,8 @@ void GNSSFlowgraph::set_signals_list()
{
// Loop to create the list of Galileo E5a signals
for (available_gnss_prn_iter = available_galileo_prn.cbegin();
available_gnss_prn_iter != available_galileo_prn.cend();
available_gnss_prn_iter++)
available_gnss_prn_iter != available_galileo_prn.cend();
available_gnss_prn_iter++)
{
available_GAL_5X_signals_.emplace_back(
Gnss_Satellite(std::string("Galileo"), *available_gnss_prn_iter),
@@ -2563,8 +2563,8 @@ void GNSSFlowgraph::set_signals_list()
{
// Loop to create the list of Galileo E5b signals
for (available_gnss_prn_iter = available_galileo_prn.cbegin();
available_gnss_prn_iter != available_galileo_prn.cend();
available_gnss_prn_iter++)
available_gnss_prn_iter != available_galileo_prn.cend();
available_gnss_prn_iter++)
{
available_GAL_7X_signals_.emplace_back(
Gnss_Satellite(std::string("Galileo"), *available_gnss_prn_iter),
@@ -2576,8 +2576,8 @@ void GNSSFlowgraph::set_signals_list()
{
// Loop to create the list of Galileo E6 signals
for (available_gnss_prn_iter = available_galileo_prn.cbegin();
available_gnss_prn_iter != available_galileo_prn.cend();
available_gnss_prn_iter++)
available_gnss_prn_iter != available_galileo_prn.cend();
available_gnss_prn_iter++)
{
available_GAL_E6_signals_.emplace_back(
Gnss_Satellite(std::string("Galileo"), *available_gnss_prn_iter),
@@ -2589,8 +2589,8 @@ void GNSSFlowgraph::set_signals_list()
{
// Loop to create the list of GLONASS L1 C/A signals
for (available_gnss_prn_iter = available_glonass_prn.cbegin();
available_gnss_prn_iter != available_glonass_prn.cend();
available_gnss_prn_iter++)
available_gnss_prn_iter != available_glonass_prn.cend();
available_gnss_prn_iter++)
{
available_GLO_1G_signals_.emplace_back(
Gnss_Satellite(std::string("Glonass"), *available_gnss_prn_iter),
@@ -2602,8 +2602,8 @@ void GNSSFlowgraph::set_signals_list()
{
// Loop to create the list of GLONASS L2 C/A signals
for (available_gnss_prn_iter = available_glonass_prn.cbegin();
available_gnss_prn_iter != available_glonass_prn.cend();
available_gnss_prn_iter++)
available_gnss_prn_iter != available_glonass_prn.cend();
available_gnss_prn_iter++)
{
available_GLO_2G_signals_.emplace_back(
Gnss_Satellite(std::string("Glonass"), *available_gnss_prn_iter),
@@ -2615,8 +2615,8 @@ void GNSSFlowgraph::set_signals_list()
{
// Loop to create the list of BeiDou B1C signals
for (available_gnss_prn_iter = available_beidou_prn.cbegin();
available_gnss_prn_iter != available_beidou_prn.cend();
available_gnss_prn_iter++)
available_gnss_prn_iter != available_beidou_prn.cend();
available_gnss_prn_iter++)
{
available_BDS_B1_signals_.emplace_back(
Gnss_Satellite(std::string("Beidou"), *available_gnss_prn_iter),
@@ -2628,8 +2628,8 @@ void GNSSFlowgraph::set_signals_list()
{
// Loop to create the list of BeiDou B1C signals
for (available_gnss_prn_iter = available_beidou_prn.cbegin();
available_gnss_prn_iter != available_beidou_prn.cend();
available_gnss_prn_iter++)
available_gnss_prn_iter != available_beidou_prn.cend();
available_gnss_prn_iter++)
{
available_BDS_B3_signals_.emplace_back(
Gnss_Satellite(std::string("Beidou"), *available_gnss_prn_iter),

12
src/core/receiver/tcp_cmd_interface.cc
View File

@@ -146,9 +146,7 @@ std::string TcpCmdInterface::status(const std::vector<std::string> &commandLine
&course_over_ground_deg,
&UTC_time) == true)
{
struct tm tstruct
{
};
struct tm tstruct{};
std::array<char, 80> buf1{};
tstruct = *gmtime(&UTC_time);
strftime(buf1.data(), buf1.size(), "%d/%m/%Y %H:%M:%S", &tstruct);
@@ -179,9 +177,7 @@ std::string TcpCmdInterface::hotstart(const std::vector<std::string> &commandLin
if (commandLine.size() > 5)
{
// Read commandline time parameter
struct tm tm
{
};
struct tm tm{};
const std::string tmp_str = commandLine.at(1) + commandLine.at(2);
if (strptime(tmp_str.c_str(), "%d/%m/%Y %H:%M:%S", &tm) == nullptr)
{
@@ -227,9 +223,7 @@ std::string TcpCmdInterface::warmstart(const std::vector<std::string> &commandLi
if (commandLine.size() > 5)
{
// Read commandline time parameter
struct tm tm
{
};
struct tm tm{};
const std::string tmp_str = commandLine.at(1) + commandLine.at(2);
if (strptime(tmp_str.c_str(), "%d/%m/%Y %H:%M:%S", &tm) == nullptr)
{

7
src/core/system_parameters/GLONASS_L1_L2_CA.h
View File

@@ -87,10 +87,9 @@ constexpr int32_t GLONASS_CA_NBR_SATS = 24; // STRING DATA WITHOUT PREAMBLE
constexpr int32_t GLONASS_L1_CA_HISTORY_DEEP = 100;
// NAVIGATION MESSAGE DEMODULATION AND DECODING
#define GLONASS_GNAV_PREAMBLE \
{ \
1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0 \
}
#define GLONASS_GNAV_PREAMBLE \
{ \
1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0}
constexpr double GLONASS_GNAV_PREAMBLE_DURATION_S = 0.300;
constexpr int32_t GLONASS_GNAV_PREAMBLE_LENGTH_BITS = 30;
constexpr int32_t GLONASS_GNAV_PREAMBLE_LENGTH_SYMBOLS = 300;

2
src/core/system_parameters/Galileo_OSNMA.h
View File

@@ -173,7 +173,7 @@ public:
const std::vector<std::string>& s2_) : msg(msg_),
nt(nt_),
sequence1(s1_),
sequence2(s2_){};
sequence2(s2_) {};
uint8_t msg{};
uint8_t nt{};
std::vector<std::string> sequence1;

2
src/core/system_parameters/galileo_inav_message.cc
View File

@@ -208,7 +208,7 @@ void Galileo_Inav_Message::split_page(std::string page_string, int32_t flag_even
flag_CRC_test = false;
}
} // end of CRC checksum control
} // end if (page_string.at(0)=='1')
} // end if (page_string.at(0)=='1')
else
{
page_Even = page_string.substr(0, 114);