mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-18 21:23:02 +00:00
Code Issues Releases Wiki Activity

clang-format

Browse Source 
This was much worse than I thought. I had run clang-format at some point, but
apparently I subsequently made some non-compliant changes in pretty much every
file I touched.
This commit is contained in:
Jim Melton 2021-02-15 15:34:48 -07:00
parent 3bf2deb2ae
commit 6e04a42c8a
No known key found for this signature in database
GPG Key ID: C46392D9AACAB216
34 changed files with 58 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,12 +18,11 @@
#ifndef GNSS_SDR_AD9361_FPGA_SIGNAL_SOURCE_H
#define GNSS_SDR_AD9361_FPGA_SIGNAL_SOURCE_H
#include "signal_source_base.h"
#include "concurrent_queue.h"
#include "fpga_dynamic_bit_selection.h"
#include "fpga_switch.h"
#include "gnss_block_interface.h"
#include "signal_source_base.h"
#include <pmt/pmt.h>
#include <cstdint>
#include <memory>

3
src/algorithms/signal_source/adapters/custom_udp_signal_source.cc
View File

@ -26,8 +26,7 @@ using namespace std::string_literals;
CustomUDPSignalSource::CustomUDPSignalSource(const ConfigurationInterface* configuration,
const std::string& role, unsigned int in_stream, unsigned int out_stream,
Concurrent_Queue<pmt::pmt_t>* queue __attribute__((unused)))
: SignalSourceBase(configuration, role, "Custom_UDP_Signal_Source"s)
, in_stream_(in_stream), out_stream_(out_stream)
: SignalSourceBase(configuration, role, "Custom_UDP_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
{
// DUMP PARAMETERS
const std::string default_dump_file("./data/signal_source.dat");

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

@ -18,10 +18,9 @@
#ifndef GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H
#define GNSS_SDR_CUSTOM_UDP_SIGNAL_SOURCE_H
#include "signal_source_base.h"
#include "concurrent_queue.h"
#include "gr_complex_ip_packet_source.h"
#include "signal_source_base.h"
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/blocks/null_sink.h>
#include <pmt/pmt.h>

2
src/algorithms/signal_source/adapters/file_signal_source.cc
View File

@ -35,5 +35,3 @@ FileSignalSource::FileSignalSource(ConfigurationInterface const* configuration,
LOG(ERROR) << "This implementation only supports one output stream";
}
}

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

@ -177,29 +177,33 @@ uint64_t FileSourceBase::samples() const
FileSourceBase::FileSourceBase(ConfigurationInterface const* configuration, std::string role, std::string impl,
Concurrent_Queue<pmt::pmt_t>* queue,
std::string default_item_type)
: SignalSourceBase(configuration, role, impl)
, filename_(configuration->property(role + ".filename"s, "../data/example_capture.dat"s))
, file_source_()
: SignalSourceBase(configuration, role, impl), filename_(configuration->property(role + ".filename"s, "../data/example_capture.dat"s)), file_source_()
, item_type_(configuration->property(role + ".item_type"s, default_item_type))
, item_size_(0) // invalid
, is_complex_(false)
,
item_type_(configuration->property(role + ".item_type"s, default_item_type)),
item_size_(0) // invalid
,
is_complex_(false)
, header_size_(configuration->property(role + ".header_size"s, 0UL))
, seconds_to_skip_(configuration->property(role + ".seconds_to_skip", 0.0))
, repeat_(configuration->property(role + ".repeat"s, false))
,
header_size_(configuration->property(role + ".header_size"s, 0UL)),
seconds_to_skip_(configuration->property(role + ".seconds_to_skip", 0.0)),
repeat_(configuration->property(role + ".repeat"s, false))
, samples_(configuration->property(role + ".samples"s, 0UL))
, sampling_frequency_(configuration->property(role + ".sampling_frequency"s, 0UL))
, valve_()
, queue_(queue)
,
samples_(configuration->property(role + ".samples"s, 0UL)),
sampling_frequency_(configuration->property(role + ".sampling_frequency"s, 0UL)),
valve_(),
queue_(queue)
, enable_throttle_control_(configuration->property(role + ".enable_throttle_control"s, false))
, throttle_()
,
enable_throttle_control_(configuration->property(role + ".enable_throttle_control"s, false)),
throttle_()
, dump_(configuration->property(role + ".dump"s, false))
, dump_filename_(configuration->property(role + ".dump_filename"s, "../data/my_capture.dat"s))
, sink_()
,
dump_(configuration->property(role + ".dump"s, false)),
dump_filename_(configuration->property(role + ".dump_filename"s, "../data/my_capture.dat"s)),
sink_()
{
// override value with commandline flag, if present
if (FLAGS_signal_source != "-")

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

@ -20,9 +20,8 @@
#ifndef GNSS_SDR_FLEXIBAND_SIGNAL_SOURCE_H
#define GNSS_SDR_FLEXIBAND_SIGNAL_SOURCE_H
#include "signal_source_base.h"
#include "concurrent_queue.h"
#include "signal_source_base.h"
#include <gnuradio/blocks/char_to_float.h>
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/blocks/float_to_complex.h>

1
src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
View File

@ -21,7 +21,6 @@
#define GNSS_SDR_FMCOMMS2_SIGNAL_SOURCE_H
#include "signal_source_base.h"
#include <gnuradio/blocks/file_sink.h>
#if GRIIO_INCLUDE_HAS_GNURADIO
#include <gnuradio/iio/fmcomms2_source.h>

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

@ -20,10 +20,9 @@
#define GNSS_SDR_GEN_SIGNAL_SOURCE_H
#include "signal_source_interface.h"
#include "concurrent_queue.h"
#include "gnss_block_interface.h"
#include "signal_source_interface.h"
#include <pmt/pmt.h>
#include <memory>
#include <string>

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

@ -18,9 +18,8 @@
#ifndef GNSS_SDR_GN3S_SIGNAL_SOURCE_H
#define GNSS_SDR_GN3S_SIGNAL_SOURCE_H
#include "signal_source_base.h"
#include "concurrent_queue.h"
#include "signal_source_base.h"
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/hier_block2.h>
#include <pmt/pmt.h>

3
src/algorithms/signal_source/adapters/labsat_signal_source.cc
View File

@ -23,8 +23,7 @@ using namespace std::string_literals;
LabsatSignalSource::LabsatSignalSource(const ConfigurationInterface* configuration,
const std::string& role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue<pmt::pmt_t>* queue)
: SignalSourceBase(configuration, role, "Labsat_Signal_Source"s)
, in_stream_(in_stream), out_stream_(out_stream)
: SignalSourceBase(configuration, role, "Labsat_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
{
const std::string default_item_type("gr_complex");
const std::string default_dump_file("./labsat_output.dat");

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

@ -18,10 +18,9 @@
#ifndef GNSS_SDR_LABSAT_SIGNAL_SOURCE_H
#define GNSS_SDR_LABSAT_SIGNAL_SOURCE_H
#include "signal_source_base.h"
#include "concurrent_queue.h"
#include "gnss_block_interface.h"
#include "signal_source_base.h"
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/blocks/throttle.h>
#include <gnuradio/hier_block2.h>

3
src/algorithms/signal_source/adapters/multichannel_file_signal_source.cc
View File

@ -32,8 +32,7 @@ using namespace std::string_literals;
MultichannelFileSignalSource::MultichannelFileSignalSource(const ConfigurationInterface* configuration,
const std::string& role, unsigned int in_streams, unsigned int out_streams,
Concurrent_Queue<pmt::pmt_t>* queue)
: SignalSourceBase(configuration, role, "Multichannel_File_Signal_Source"s)
, in_streams_(in_streams), out_streams_(out_streams)
: SignalSourceBase(configuration, role, "Multichannel_File_Signal_Source"s), in_streams_(in_streams), out_streams_(out_streams)
{
const std::string default_filename("./example_capture.dat"s);
const std::string default_item_type("short"s);

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

@ -21,10 +21,9 @@
#ifndef GNSS_SDR_MULTICHANNEL_FILE_SIGNAL_SOURCE_H
#define GNSS_SDR_MULTICHANNEL_FILE_SIGNAL_SOURCE_H
#include "signal_source_base.h"
#include "concurrent_queue.h"
#include "gnss_block_interface.h"
#include "signal_source_base.h"
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/blocks/file_source.h>
#include <gnuradio/blocks/throttle.h>

1
src/algorithms/signal_source/adapters/nsr_file_signal_source.h
View File

@ -22,7 +22,6 @@
#define GNSS_SDR_NSR_FILE_SIGNAL_SOURCE_H
#include "file_source_base.h"
#include "unpack_byte_2bit_samples.h"
/** \addtogroup Signal_Source

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

@ -19,9 +19,8 @@
#ifndef GNSS_SDR_OSMOSDR_SIGNAL_SOURCE_H
#define GNSS_SDR_OSMOSDR_SIGNAL_SOURCE_H
#include "signal_source_base.h"
#include "concurrent_queue.h"
#include "signal_source_base.h"
#include <gnuradio/blocks/file_sink.h>
#include <pmt/pmt.h>
#include <cstdint>

1
src/algorithms/signal_source/adapters/plutosdr_signal_source.h
View File

@ -20,7 +20,6 @@
#define GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H
#include "signal_source_base.h"
#include <gnuradio/blocks/file_sink.h>
#if GRIIO_INCLUDE_HAS_GNURADIO
#include <gnuradio/iio/pluto_source.h>

2
src/algorithms/signal_source/adapters/raw_array_signal_source.cc
View File

@ -27,7 +27,7 @@ using namespace std::string_literals;
RawArraySignalSource::RawArraySignalSource(const ConfigurationInterface* configuration,
std::string role, unsigned int in_stream, unsigned int out_stream, Concurrent_Queue<pmt::pmt_t>* queue)
: SignalSourceBase(configuration, role, "Raw_Array_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
: SignalSourceBase(configuration, role, "Raw_Array_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
{
const std::string default_item_type("gr_complex");
const std::string default_dump_file("./data/raw_array_source.dat");

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

@ -18,9 +18,8 @@
#ifndef GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H
#define GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H
#include "signal_source_base.h"
#include "concurrent_queue.h"
#include "signal_source_base.h"
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/hier_block2.h>
#include <pmt/pmt.h>

3
src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
View File

@ -32,8 +32,7 @@ RtlTcpSignalSource::RtlTcpSignalSource(const ConfigurationInterface* configurati
unsigned int in_stream,
unsigned int out_stream,
Concurrent_Queue<pmt::pmt_t>* queue)
: SignalSourceBase(configuration, role, "RtlTcp_Signal_Source"s)
, in_stream_(in_stream), out_stream_(out_stream)
: SignalSourceBase(configuration, role, "RtlTcp_Signal_Source"s), in_stream_(in_stream), out_stream_(out_stream)
{
// DUMP PARAMETERS
const std::string default_dump_file("./data/signal_source.dat");

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

@ -18,10 +18,9 @@
#ifndef GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H
#define GNSS_SDR_RTL_TCP_SIGNAL_SOURCE_H
#include "signal_source_base.h"
#include "concurrent_queue.h"
#include "rtl_tcp_signal_source_c.h"
#include "signal_source_base.h"
#include <gnuradio/blocks/deinterleave.h>
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/blocks/float_to_complex.h>

7
src/algorithms/signal_source/adapters/signal_source_base.cc
View File

@ -19,7 +19,6 @@
*/
#include "signal_source_base.h"
#include "configuration_interface.h"
using namespace std::string_literals;
@ -40,10 +39,6 @@ size_t SignalSourceBase::getRfChannels() const
}
SignalSourceBase::SignalSourceBase(ConfigurationInterface const* configuration, std::string role, std::string impl)
: SignalSourceInterface()
, role_(role)
, implementation_(impl)
, rfChannels_(configuration->property(role + ".RF_channels"s, 1u))
: SignalSourceInterface(), role_(role), implementation_(impl), rfChannels_(configuration->property(role + ".RF_channels"s, 1u))
{
}

1
src/algorithms/signal_source/adapters/signal_source_base.h
View File

@ -19,7 +19,6 @@
#define GNSS_SDR_SIGNAL_SOURCE_BASE_H
#include "signal_source_interface.h"
#include <cstddef>
#include <string>

3
src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc
View File

@ -29,8 +29,7 @@ using namespace std::string_literals;
SpirGSS6450FileSignalSource::SpirGSS6450FileSignalSource(const ConfigurationInterface* configuration,
const std::string& role, uint32_t in_streams, uint32_t out_streams, Concurrent_Queue<pmt::pmt_t>* queue)
: SignalSourceBase(configuration, role, "Spir_GSS6450_File_Signal_Source"s)
, in_streams_(in_streams), out_streams_(out_streams)
: SignalSourceBase(configuration, role, "Spir_GSS6450_File_Signal_Source"s), in_streams_(in_streams), out_streams_(out_streams)
{
const std::string default_filename("../data/my_capture.dat");
const std::string default_dump_filename("../data/my_capture_dump.dat");

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

@ -21,10 +21,9 @@
#ifndef GNSS_SDR_SPIR_GSS6450_FILE_SIGNAL_SOURCE_H
#define GNSS_SDR_SPIR_GSS6450_FILE_SIGNAL_SOURCE_H
#include "signal_source_base.h"
#include "concurrent_queue.h"
#include "gnss_sdr_valve.h"
#include "signal_source_base.h"
#include "unpack_spir_gss6450_samples.h"
#include <gnuradio/blocks/deinterleave.h>
#include <gnuradio/blocks/endian_swap.h>

9
src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc
View File

@ -29,11 +29,10 @@ TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(
unsigned int in_streams,
unsigned int out_streams,
Concurrent_Queue<pmt::pmt_t>* queue)
: FileSourceBase(configuration, role, "Two_Bit_Packed_File_Signal_Source"s, queue, "byte"s)
, sample_type_(configuration->property(role + ".sample_type", "real"s)) // options: "real", "iq", "qi"
, big_endian_items_(configuration->property(role + ".big_endian_items", true))
, big_endian_bytes_(configuration->property(role + ".big_endian_bytes", false))
, reverse_interleaving_(false)
: FileSourceBase(configuration, role, "Two_Bit_Packed_File_Signal_Source"s, queue, "byte"s), sample_type_(configuration->property(role + ".sample_type", "real"s)), // options: "real", "iq", "qi"
big_endian_items_(configuration->property(role + ".big_endian_items", true)),
big_endian_bytes_(configuration->property(role + ".big_endian_bytes", false)),
reverse_interleaving_(false)
{
if (in_streams > 0)
{

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

@ -17,9 +17,8 @@
#ifndef GNSS_SDR_UHD_SIGNAL_SOURCE_H
#define GNSS_SDR_UHD_SIGNAL_SOURCE_H
#include "signal_source_base.h"
#include "concurrent_queue.h"
#include "signal_source_base.h"
#include <gnuradio/blocks/file_sink.h>
#include <gnuradio/hier_block2.h>
#include <gnuradio/uhd/usrp_source.h>