From 2649056e17f29f21498601e425539c575ec50ec4 Mon Sep 17 00:00:00 2001 From: Victor Castillo Date: Mon, 9 Jun 2025 20:22:25 +0200 Subject: [PATCH] fix: formatting and linting issues --- .../libs/sensor_data/sensor_data_aggregator.cc | 6 +++--- src/algorithms/libs/sensor_data/sensor_data_file.h | 1 + src/algorithms/libs/sensor_data/sensor_data_source.h | 3 +-- .../sensor_data/sensor_data_source_configuration.cc | 12 ++++++------ src/algorithms/libs/sensor_data/sensor_data_type.h | 2 +- .../gnuradio_blocks/hybrid_observables_gs.h | 2 +- .../gnuradio_blocks/dll_pll_veml_tracking.cc | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/algorithms/libs/sensor_data/sensor_data_aggregator.cc b/src/algorithms/libs/sensor_data/sensor_data_aggregator.cc index 22e4c02c7..91b085be7 100644 --- a/src/algorithms/libs/sensor_data/sensor_data_aggregator.cc +++ b/src/algorithms/libs/sensor_data/sensor_data_aggregator.cc @@ -128,9 +128,9 @@ void SensorDataAggregator::append_data(const pmt::pmt_t& data_dict) case SensorDataType::F32: if (f32_data_.contains(sensor_id)) { - f32_data_.at(sensor_id).emplace_back( - sample_stamp, - pmt::to_float(val)); + f32_data_.at(sensor_id).push_back(SensorDataSample{ + .rf_sample_stamp = sample_stamp, + .value = pmt::to_float(val)}); } break; diff --git a/src/algorithms/libs/sensor_data/sensor_data_file.h b/src/algorithms/libs/sensor_data/sensor_data_file.h index e09f090b4..c8a9913d2 100644 --- a/src/algorithms/libs/sensor_data/sensor_data_file.h +++ b/src/algorithms/libs/sensor_data/sensor_data_file.h @@ -51,6 +51,7 @@ public: bool read_until_sample(std::size_t end_sample, std::size_t& sample_stamp, std::vector& buffer); std::size_t get_chunks_read() const; + private: bool read_item(std::vector& buffer); diff --git a/src/algorithms/libs/sensor_data/sensor_data_source.h b/src/algorithms/libs/sensor_data/sensor_data_source.h index f681ab65e..65e4d22a9 100644 --- a/src/algorithms/libs/sensor_data/sensor_data_source.h +++ b/src/algorithms/libs/sensor_data/sensor_data_source.h @@ -18,13 +18,12 @@ #ifndef GNSS_SDR_SENSOR_DATA_SOURCE_H #define GNSS_SDR_SENSOR_DATA_SOURCE_H +#include "gnss_block_interface.h" #include "sensor_data/sensor_data_file.h" #include "sensor_data/sensor_data_source_configuration.h" -#include "gnss_block_interface.h" #include // for sync_block #include // for gr_vector_const_void_star #include // for size_t -#include /** \addtogroup Algorithms_Library * \{ */ diff --git a/src/algorithms/libs/sensor_data/sensor_data_source_configuration.cc b/src/algorithms/libs/sensor_data/sensor_data_source_configuration.cc index 4ae8cd922..2e340a6cb 100644 --- a/src/algorithms/libs/sensor_data/sensor_data_source_configuration.cc +++ b/src/algorithms/libs/sensor_data/sensor_data_source_configuration.cc @@ -104,10 +104,10 @@ void SensorDataSourceConfiguration::configure_files(const ConfigurationInterface .id = id, .filename = filename, .repeat = configuration->property(role + ".repeat"s, false), - .chunk_size = configuration->property(role + ".chunk_size"s, 0UL), - .file_offset = configuration->property(role + ".file_offset"s, 0UL), - .sample_offset = configuration->property(role + ".sample_offset"s, 0UL), - .sample_period = configuration->property(role + ".sample_period"s, 0UL)}); + .chunk_size = configuration->property(role + ".chunk_size"s, uint64_t{0UL}), + .file_offset = configuration->property(role + ".file_offset"s, uint64_t{0UL}), + .sample_offset = configuration->property(role + ".sample_offset"s, uint64_t{0UL}), + .sample_period = configuration->property(role + ".sample_period"s, uint64_t{0UL})}); } } @@ -145,7 +145,7 @@ void SensorDataSourceConfiguration::configure_sensors(const ConfigurationInterfa } else { - offset = configuration->property(role + ".offset"s, 0UL); + offset = configuration->property(role + ".offset"s, uint64_t{0UL}); } // Configure file_id, default to previous sensor file_id @@ -156,7 +156,7 @@ void SensorDataSourceConfiguration::configure_sensors(const ConfigurationInterfa } else { - file_id = configuration->property(role + ".file"s, 0UL); + file_id = configuration->property(role + ".file"s, uint64_t{0UL}); } if (sensor_identifier != "UNDEFINED") diff --git a/src/algorithms/libs/sensor_data/sensor_data_type.h b/src/algorithms/libs/sensor_data/sensor_data_type.h index e6577ad8e..098d7d0e9 100644 --- a/src/algorithms/libs/sensor_data/sensor_data_type.h +++ b/src/algorithms/libs/sensor_data/sensor_data_type.h @@ -31,7 +31,7 @@ struct SensorDataType SensorDataType() = delete; enum value_type { - UINT64, // Used internally for SAMPLE_STAMP and CHUNK_COUNT + UINT64, // Used internally for SAMPLE_STAMP and CHUNK_COUNT F32, F64, I32, diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h index 92579eb63..ab9ce8a00 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_sensor_data(const std::vector &data); + void propagate_sensor_data(const std::vector& data); int32_t save_matfile() const; diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc index 5610543cb..94c37b5b6 100644 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc @@ -2105,7 +2105,7 @@ int dll_pll_veml_tracking::general_work(int noutput_items __attribute__((unused) { add_item_tag(0, this->nitems_written(0) + 1, tag.key, tag.value); } - + *out[0] = std::move(current_synchro_data); return 1; }