mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-31 07:13:03 +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
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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";
} }
} }

3
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
* \{ */ * \{ */