diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc index 683d2c9c7..a6fa8f9fd 100644 --- a/src/algorithms/PVT/libs/rtklib_solver.cc +++ b/src/algorithms/PVT/libs/rtklib_solver.cc @@ -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 &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 &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::const_iterator gnss_observables_iter; std::map::const_iterator galileo_ephemeris_iter; @@ -1949,7 +1949,7 @@ bool Rtklib_Solver::get_PVT(const std::map &gnss_observables_ vtl_data.sat_dts(n, 1) = dts[1 + 2 * n]; vtl_data.sat_var(n) = var[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) // 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) diff --git a/src/algorithms/PVT/libs/vtl_engine.cc b/src/algorithms/PVT/libs/vtl_engine.cc index a290c8300..cb1753fe9 100644 --- a/src/algorithms/PVT/libs/vtl_engine.cc +++ b/src/algorithms/PVT/libs/vtl_engine.cc @@ -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 using arma::as_scalar; diff --git a/src/algorithms/PVT/libs/vtl_engine.h b/src/algorithms/PVT/libs/vtl_engine.h index b86dde257..cedb72396 100644 --- a/src/algorithms/PVT/libs/vtl_engine.h +++ b/src/algorithms/PVT/libs/vtl_engine.h @@ -42,7 +42,7 @@ public: void configure(Vtl_Conf config_); // set config parameters // 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 debug_print(); // print debug information diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h index 81f9d61d5..a2a950044 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h @@ -80,7 +80,7 @@ private: void set_tag_timestamp_in_sdr_timeframe(const std::vector& data, uint64_t rx_clock); - void propagate_extra_data(const std::vector &data); + void propagate_extra_data(const std::vector& data); int32_t save_matfile() const; diff --git a/src/algorithms/signal_source/adapters/file_source_base.cc b/src/algorithms/signal_source/adapters/file_source_base.cc index 567ae92e3..48dd72881 100644 --- a/src/algorithms/signal_source/adapters/file_source_base.cc +++ b/src/algorithms/signal_source/adapters/file_source_base.cc @@ -64,11 +64,11 @@ FileSourceBase::FileSourceBase(ConfigurationInterface const* configuration, std: // Configuration for attaching extra data to the sample stream 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_offset_in_file_(configuration->property(role_ + ".extra_data.file_offset"s, 0UL)), - ed_item_size_(configuration->property(role_ + ".extra_data.item_size"s, 1UL)), + 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, std::size_t{1UL})), ed_repeat_(configuration->property(role_ + ".extra_data.repeat"s, false)), - ed_offset_in_samples_(configuration->property(role_ + ".extra_data.sample_offset"s, 0UL)), - ed_sample_period_(configuration->property(role_ + ".extra_data.sample_period"s, 1UL)) + 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, 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_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_) { - extra_data_source_ = std::make_shared( + extra_data_source_ = gnss_make_shared( ed_path_, ed_offset_in_file_, ed_item_size_, @@ -619,7 +619,6 @@ ExtraDataSource::sptr FileSourceBase::create_extra_data_source() } - // Subclass hooks to augment created objects, as required void FileSourceBase::create_file_source_hook() {} void FileSourceBase::create_throttle_hook() {} diff --git a/src/algorithms/signal_source/adapters/file_source_base.h b/src/algorithms/signal_source/adapters/file_source_base.h index 9f9737ff5..9cc012cf7 100644 --- a/src/algorithms/signal_source/adapters/file_source_base.h +++ b/src/algorithms/signal_source/adapters/file_source_base.h @@ -19,6 +19,7 @@ #define GNSS_SDR_FILE_SOURCE_BASE_H #include "concurrent_queue.h" +#include "extra_data_source.h" #include "signal_source_base.h" #include // for dump #include @@ -28,8 +29,6 @@ #include #include -#include "extra_data_source.h" - /** \addtogroup Signal_Source * \{ */ /** \addtogroup Signal_Source_adapters diff --git a/src/algorithms/signal_source/gnuradio_blocks/extra_data_source.cc b/src/algorithms/signal_source/gnuradio_blocks/extra_data_source.cc index dff779ba7..19093936a 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/extra_data_source.cc +++ b/src/algorithms/signal_source/gnuradio_blocks/extra_data_source.cc @@ -16,6 +16,7 @@ #include "extra_data_source.h" #include +#include ExtraDataSource::ExtraDataSource( @@ -25,8 +26,7 @@ ExtraDataSource::ExtraDataSource( const bool& repeat, const std::size_t& offset_in_samples, 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", io_signature, io_signature), extra_data_file_( @@ -40,7 +40,8 @@ ExtraDataSource::ExtraDataSource( { 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"; } } diff --git a/src/algorithms/signal_source/gnuradio_blocks/extra_data_source.h b/src/algorithms/signal_source/gnuradio_blocks/extra_data_source.h index 1ed2d7539..510d57e43 100644 --- a/src/algorithms/signal_source/gnuradio_blocks/extra_data_source.h +++ b/src/algorithms/signal_source/gnuradio_blocks/extra_data_source.h @@ -18,13 +18,14 @@ #ifndef GNSS_SDR_EXTRA_DATA_SOURCE_H #define GNSS_SDR_EXTRA_DATA_SOURCE_H -#include "gnss_block_interface.h" #include "extra_data_file.h" +#include "gnss_block_interface.h" #include // for sync_block #include // for gr_vector_const_void_star -#include // for size_t +#include // for size_t #include #include +#include /** \addtogroup Signal_Source * \{ */ @@ -32,7 +33,7 @@ * \{ */ -class ExtraDataSource: public gr::sync_block +class ExtraDataSource : public gr::sync_block { public: using sptr = gnss_shared_ptr;