From 1850061a96081309824d7cecd6880b0a39d09bdc Mon Sep 17 00:00:00 2001 From: juanalfarom Date: Sun, 6 Oct 2024 15:05:46 +0200 Subject: [PATCH] clang format and cpplint corrections --- .../sbas_l1_telemetry_decoder_gs.cc | 19 +++++++++---------- src/core/system_parameters/gnss_satellite.cc | 6 +++--- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc index 57850224c..9461d311e 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc @@ -16,8 +16,8 @@ #include "sbas_l1_telemetry_decoder_gs.h" #include "gnss_synchro.h" -#include "viterbi_decoder_sbas.h" #include "tlm_utils.h" +#include "viterbi_decoder_sbas.h" #include #include // for mp #include // for copy @@ -51,14 +51,14 @@ sbas_l1_telemetry_decoder_gs_sptr sbas_l1_make_telemetry_decoder_gs( sbas_l1_telemetry_decoder_gs::sbas_l1_telemetry_decoder_gs( const Gnss_Satellite &satellite, const Tlm_Conf &conf) : gr::block("sbas_l1_telemetry_decoder_gs", - gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)), - gr::io_signature::make(1, 1, sizeof(Gnss_Synchro))), - d_dump(true), - d_dump_mat(true), - d_remove_dat(true), - d_dump_filename("tele"), - d_channel(0), - d_block_size(D_SAMPLES_PER_SYMBOL * D_SYMBOLS_PER_BIT * D_BLOCK_SIZE_IN_BITS) + gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)), + gr::io_signature::make(1, 1, sizeof(Gnss_Synchro))), + d_dump(true), + d_dump_mat(true), + d_remove_dat(true), + d_dump_filename("tele"), + d_channel(0), + d_block_size(D_SAMPLES_PER_SYMBOL * D_SYMBOLS_PER_BIT * D_BLOCK_SIZE_IN_BITS) { // prevent telemetry symbols accumulation in output buffers this->set_max_noutput_items(1); @@ -120,7 +120,6 @@ void sbas_l1_telemetry_decoder_gs::set_satellite(const Gnss_Satellite &satellite void sbas_l1_telemetry_decoder_gs::set_channel(int32_t channel) { d_channel = channel; - //d_nav.set_channel(channel); DLOG(INFO) << "Navigation channel set to " << channel; // ############# ENABLE DATA FILE LOG ################# if (d_dump == true) diff --git a/src/core/system_parameters/gnss_satellite.cc b/src/core/system_parameters/gnss_satellite.cc index c84dbb6ce..241f85c89 100644 --- a/src/core/system_parameters/gnss_satellite.cc +++ b/src/core/system_parameters/gnss_satellite.cc @@ -182,7 +182,7 @@ void Gnss_Satellite::set_PRN(uint32_t PRN_) } if (system == "GPS") { - if (PRN_ < 1 or (PRN_ > 32 and PRN_<120)) + if (PRN_ < 1 or (PRN_ > 32 and PRN_ < 120)) { DLOG(INFO) << "This PRN is not defined"; PRN = 0; @@ -272,7 +272,7 @@ void Gnss_Satellite::set_rf_link(int32_t rf_link_) uint32_t Gnss_Satellite::get_PRN() const { // Get satellite's PRN - uint32_t PRN_ = PRN; + uint32_t PRN_ = PRN; return PRN_; } @@ -421,7 +421,7 @@ std::string Gnss_Satellite::what_block(const std::string& system_, uint32_t PRN_ break; case 138: block_ = std::string("WAAS"); // WAAS Anik F1R - break; + break; default: block_ = std::string("Unknown"); }