mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-02-09 07:30:08 +00:00
Code Issues Releases Wiki Activity

Fixed lint and formatting errors

Browse Source
This commit is contained in:
Victor Castillo 2024-10-06 17:58:36 +02:00
parent 3aae8c1614
commit 15d6bb5d19
No known key found for this signature in database
GPG Key ID: 8EF1FC8B7182F608
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/algorithms/PVT/libs/rtklib_solver.cc
View File

@ -1203,7 +1203,7 @@ void Rtklib_Solver::get_current_has_obs_correction(const std::string &signal, ui
} }
} }
bool Rtklib_Solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_map, double kf_update_interval_s, bool flag_averaging, bool enable_vtl, bool close_vtl_loop, const Vtl_Data::imu_data_t& imu_data) bool Rtklib_Solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_map, double kf_update_interval_s, bool flag_averaging, bool enable_vtl, bool close_vtl_loop, const Vtl_Data::imu_data_t &imu_data)
{ {
std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter; std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
std::map<int, Galileo_Ephemeris>::const_iterator galileo_ephemeris_iter; std::map<int, Galileo_Ephemeris>::const_iterator galileo_ephemeris_iter;
@ -1949,7 +1949,7 @@ bool Rtklib_Solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_
vtl_data.sat_dts(n, 1) = dts[1 + 2 * n]; vtl_data.sat_dts(n, 1) = dts[1 + 2 * n];
vtl_data.sat_var(n) = var[n]; vtl_data.sat_var(n) = var[n];
vtl_data.sat_health_flag(n) = svh.at(n); vtl_data.sat_health_flag(n) = svh.at(n);
vtl_data.sat_CN0_dB_hz(n) = d_obs_data.at(n).SNR[0] * 0.25; //(0.25 dBHz) vtl_data.sat_CN0_dB_hz(n) = d_obs_data.at(n).SNR[0] * 0.25; //(0.25 dBHz)
// TODO: first version of VTL works only with ONE frequency band (band #0 is L1) // TODO: first version of VTL works only with ONE frequency band (band #0 is L1)
// To.Do: check it VTL uses all the information as in rtklib rescode function: v[nv] = P - (r + dtr - SPEED_OF_LIGHT_M_S * dts[i * 2] + dion + dtrp); // To.Do: check it VTL uses all the information as in rtklib rescode function: v[nv] = P - (r + dtr - SPEED_OF_LIGHT_M_S * dts[i * 2] + dion + dtrp);
// corrected pr with code bias, iono and tropo. Still needs the dtr(rx clock bias) and satellite clock bias (dts) // corrected pr with code bias, iono and tropo. Still needs the dtr(rx clock bias) and satellite clock bias (dts)

2
src/algorithms/PVT/libs/vtl_engine.cc
View File

@ -36,7 +36,7 @@ Vtl_Engine::~Vtl_Engine()
{ {
} }
bool Vtl_Engine::vtl_loop(const Vtl_Data& new_data) bool Vtl_Engine::vtl_loop(const Vtl_Data &new_data)
{ {
// TODO: Implement main VTL loop here // TODO: Implement main VTL loop here
using arma::as_scalar; using arma::as_scalar;

2
src/algorithms/PVT/libs/vtl_engine.h
View File

@ -42,7 +42,7 @@ public:
void configure(Vtl_Conf config_); // set config parameters void configure(Vtl_Conf config_); // set config parameters
// TODO: output functions here (output for tracking KF updates, VTL computed user PVT, etc...) // TODO: output functions here (output for tracking KF updates, VTL computed user PVT, etc...)
bool vtl_loop(const Vtl_Data& new_data); bool vtl_loop(const Vtl_Data &new_data);
void reset(); // reset all internal states void reset(); // reset all internal states
void debug_print(); // print debug information void debug_print(); // print debug information

2
src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h
View File

@ -80,7 +80,7 @@ private:
void set_tag_timestamp_in_sdr_timeframe(const std::vector<Gnss_Synchro>& data, uint64_t rx_clock); void set_tag_timestamp_in_sdr_timeframe(const std::vector<Gnss_Synchro>& data, uint64_t rx_clock);
void propagate_extra_data(const std::vector<Gnss_Synchro> &data); void propagate_extra_data(const std::vector<Gnss_Synchro>& data);
int32_t save_matfile() const; int32_t save_matfile() const;

11
src/algorithms/signal_source/adapters/file_source_base.cc
View File

@ -64,11 +64,11 @@ FileSourceBase::FileSourceBase(ConfigurationInterface const* configuration, std:
// Configuration for attaching extra data to the sample stream // Configuration for attaching extra data to the sample stream
attach_extra_data_(configuration->property(role_ + ".extra_data.enabled"s, false)), attach_extra_data_(configuration->property(role_ + ".extra_data.enabled"s, false)),
ed_path_(configuration->property(role_ + ".extra_data.filename"s, "../data/extra_data.dat"s)), ed_path_(configuration->property(role_ + ".extra_data.filename"s, "../data/extra_data.dat"s)),
ed_offset_in_file_(configuration->property(role_ + ".extra_data.file_offset"s, 0UL)), ed_offset_in_file_(configuration->property(role_ + ".extra_data.file_offset"s, std::size_t{0UL})),
ed_item_size_(configuration->property(role_ + ".extra_data.item_size"s, 1UL)), ed_item_size_(configuration->property(role_ + ".extra_data.item_size"s, std::size_t{1UL})),
ed_repeat_(configuration->property(role_ + ".extra_data.repeat"s, false)), ed_repeat_(configuration->property(role_ + ".extra_data.repeat"s, false)),
ed_offset_in_samples_(configuration->property(role_ + ".extra_data.sample_offset"s, 0UL)), ed_offset_in_samples_(configuration->property(role_ + ".extra_data.sample_offset"s, std::size_t{0UL})),
ed_sample_period_(configuration->property(role_ + ".extra_data.sample_period"s, 1UL)) ed_sample_period_(configuration->property(role_ + ".extra_data.sample_period"s, std::size_t{1UL}))
{ {
minimum_tail_s_ = std::max(configuration->property("Acquisition_1C.coherent_integration_time_ms", 0.0) * 0.001 * 2.0, minimum_tail_s_); minimum_tail_s_ = std::max(configuration->property("Acquisition_1C.coherent_integration_time_ms", 0.0) * 0.001 * 2.0, minimum_tail_s_);
minimum_tail_s_ = std::max(configuration->property("Acquisition_2S.coherent_integration_time_ms", 0.0) * 0.001 * 2.0, minimum_tail_s_); minimum_tail_s_ = std::max(configuration->property("Acquisition_2S.coherent_integration_time_ms", 0.0) * 0.001 * 2.0, minimum_tail_s_);
@ -605,7 +605,7 @@ ExtraDataSource::sptr FileSourceBase::create_extra_data_source()
{ {
if (attach_extra_data_) if (attach_extra_data_)
{ {
extra_data_source_ = std::make_shared<ExtraDataSource>( extra_data_source_ = gnss_make_shared<ExtraDataSource>(
ed_path_, ed_path_,
ed_offset_in_file_, ed_offset_in_file_,
ed_item_size_, ed_item_size_,
@ -619,7 +619,6 @@ ExtraDataSource::sptr FileSourceBase::create_extra_data_source()
} }
// Subclass hooks to augment created objects, as required // Subclass hooks to augment created objects, as required
void FileSourceBase::create_file_source_hook() {} void FileSourceBase::create_file_source_hook() {}
void FileSourceBase::create_throttle_hook() {} void FileSourceBase::create_throttle_hook() {}

3
src/algorithms/signal_source/adapters/file_source_base.h
View File

@ -19,6 +19,7 @@
#define GNSS_SDR_FILE_SOURCE_BASE_H #define GNSS_SDR_FILE_SOURCE_BASE_H
#include "concurrent_queue.h" #include "concurrent_queue.h"
#include "extra_data_source.h"
#include "signal_source_base.h" #include "signal_source_base.h"
#include <gnuradio/blocks/file_sink.h> // for dump #include <gnuradio/blocks/file_sink.h> // for dump
#include <gnuradio/blocks/file_source.h> #include <gnuradio/blocks/file_source.h>
@ -28,8 +29,6 @@
#include <string> #include <string>
#include <tuple> #include <tuple>
#include "extra_data_source.h"
/** \addtogroup Signal_Source /** \addtogroup Signal_Source
* \{ */ * \{ */
/** \addtogroup Signal_Source_adapters /** \addtogroup Signal_Source_adapters

7
src/algorithms/signal_source/gnuradio_blocks/extra_data_source.cc
View File

@ -16,6 +16,7 @@
#include "extra_data_source.h" #include "extra_data_source.h"
#include <pmt/pmt.h> #include <pmt/pmt.h>
#include <vector>
ExtraDataSource::ExtraDataSource( ExtraDataSource::ExtraDataSource(
@ -25,8 +26,7 @@ ExtraDataSource::ExtraDataSource(
const bool& repeat, const bool& repeat,
const std::size_t& offset_in_samples, const std::size_t& offset_in_samples,
const std::size_t& sample_period, const std::size_t& sample_period,
const gr::io_signature::sptr& io_signature const gr::io_signature::sptr& io_signature)
)
: gr::sync_block("Extra Data Source", : gr::sync_block("Extra Data Source",
io_signature, io_signature), io_signature, io_signature),
extra_data_file_( extra_data_file_(
@ -40,7 +40,8 @@ ExtraDataSource::ExtraDataSource(
{ {
if (io_signature->min_streams() != 1 and io_signature->max_streams() != 1) if (io_signature->min_streams() != 1 and io_signature->max_streams() != 1)
{ {
std::cout << "ERROR: This block only supports adding data to a single stream." << "\n"; std::cout << "ERROR: This block only supports adding data to a single stream."
<< "\n";
} }
} }

7
src/algorithms/signal_source/gnuradio_blocks/extra_data_source.h
View File

@ -18,13 +18,14 @@
#ifndef GNSS_SDR_EXTRA_DATA_SOURCE_H #ifndef GNSS_SDR_EXTRA_DATA_SOURCE_H
#define GNSS_SDR_EXTRA_DATA_SOURCE_H #define GNSS_SDR_EXTRA_DATA_SOURCE_H
#include "gnss_block_interface.h"
#include "extra_data_file.h" #include "extra_data_file.h"
#include "gnss_block_interface.h"
#include <gnuradio/sync_block.h> // for sync_block #include <gnuradio/sync_block.h> // for sync_block
#include <gnuradio/types.h> // for gr_vector_const_void_star #include <gnuradio/types.h> // for gr_vector_const_void_star
#include <cstddef> // for size_t #include <cstddef> // for size_t
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include <vector>
/** \addtogroup Signal_Source /** \addtogroup Signal_Source
* \{ */ * \{ */
@ -32,7 +33,7 @@
* \{ */ * \{ */
class ExtraDataSource: public gr::sync_block class ExtraDataSource : public gr::sync_block
{ {
public: public:
using sptr = gnss_shared_ptr<ExtraDataSource>; using sptr = gnss_shared_ptr<ExtraDataSource>;