mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-14 13:54:57 +00:00
Code Issues Releases Wiki Activity

clang format and cpplint corrections

Browse Source
This commit is contained in:
juanalfarom 2024-10-06 15:05:46 +02:00
parent d6c60fd7c4
commit 1850061a96
No known key found for this signature in database
GPG Key ID: 23C5912D94E1382D
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_gs.cc
View File

@ -16,8 +16,8 @@
#include "sbas_l1_telemetry_decoder_gs.h" #include "sbas_l1_telemetry_decoder_gs.h"
#include "gnss_synchro.h" #include "gnss_synchro.h"
#include "viterbi_decoder_sbas.h"
#include "tlm_utils.h" #include "tlm_utils.h"
#include "viterbi_decoder_sbas.h"
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <pmt/pmt_sugar.h> // for mp #include <pmt/pmt_sugar.h> // for mp
#include <algorithm> // for copy #include <algorithm> // 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( sbas_l1_telemetry_decoder_gs::sbas_l1_telemetry_decoder_gs(
const Gnss_Satellite &satellite, const Gnss_Satellite &satellite,
const Tlm_Conf &conf) : gr::block("sbas_l1_telemetry_decoder_gs", 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)),
gr::io_signature::make(1, 1, sizeof(Gnss_Synchro))), gr::io_signature::make(1, 1, sizeof(Gnss_Synchro))),
d_dump(true), d_dump(true),
d_dump_mat(true), d_dump_mat(true),
d_remove_dat(true), d_remove_dat(true),
d_dump_filename("tele"), d_dump_filename("tele"),
d_channel(0), d_channel(0),
d_block_size(D_SAMPLES_PER_SYMBOL * D_SYMBOLS_PER_BIT * D_BLOCK_SIZE_IN_BITS) d_block_size(D_SAMPLES_PER_SYMBOL * D_SYMBOLS_PER_BIT * D_BLOCK_SIZE_IN_BITS)
{ {
// prevent telemetry symbols accumulation in output buffers // prevent telemetry symbols accumulation in output buffers
this->set_max_noutput_items(1); 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) void sbas_l1_telemetry_decoder_gs::set_channel(int32_t channel)
{ {
d_channel = channel; d_channel = channel;
//d_nav.set_channel(channel);
DLOG(INFO) << "Navigation channel set to " << channel; DLOG(INFO) << "Navigation channel set to " << channel;
// ############# ENABLE DATA FILE LOG ################# // ############# ENABLE DATA FILE LOG #################
if (d_dump == true) if (d_dump == true)

6
src/core/system_parameters/gnss_satellite.cc
View File

@ -182,7 +182,7 @@ void Gnss_Satellite::set_PRN(uint32_t PRN_)
} }
if (system == "GPS") 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"; DLOG(INFO) << "This PRN is not defined";
PRN = 0; PRN = 0;
@ -272,7 +272,7 @@ void Gnss_Satellite::set_rf_link(int32_t rf_link_)
uint32_t Gnss_Satellite::get_PRN() const uint32_t Gnss_Satellite::get_PRN() const
{ {
// Get satellite's PRN // Get satellite's PRN
uint32_t PRN_ = PRN; uint32_t PRN_ = PRN;
return PRN_; return PRN_;
} }
@ -421,7 +421,7 @@ std::string Gnss_Satellite::what_block(const std::string& system_, uint32_t PRN_
break; break;
case 138: case 138:
block_ = std::string("WAAS"); // WAAS Anik F1R block_ = std::string("WAAS"); // WAAS Anik F1R
break; break;
default: default:
block_ = std::string("Unknown"); block_ = std::string("Unknown");
} }