From 79d846d21a23cf9842e83a8bc7df3a5a0f8efcbb Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 21 Nov 2020 20:26:43 +0100 Subject: [PATCH] Clang-format fixes --- .github/workflows/main.yml | 2 +- .../gnuradio_blocks/pcps_opencl_acquisition_cc.cc | 4 ++-- .../adapters/beidou_b1i_telemetry_decoder.h | 2 +- .../gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h | 8 ++++---- .../gnuradio_blocks/gps_l2c_telemetry_decoder_gs.h | 6 +++--- .../gnuradio_blocks/gps_l5_telemetry_decoder_gs.h | 6 +++--- src/core/monitor/gnss_synchro_monitor.cc | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 40cc1abc4..c943e0f58 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,7 +44,7 @@ jobs: - name: install dependencies run: brew install clang-format - name: run clang-format - run: find . -iname \*.h -o -iname \*.c -o -iname \*.cpp | xargs clang-format -style=file -i + run: find . -iname \*.h -o -iname \*.c -o -iname \*.cc | xargs clang-format -style=file -i - name: check run: git diff > clang_format.patch && echo -e "if \n [ -s clang_format.patch ] \nthen \n echo "clang-format not applied:"; echo ""; more clang_format.patch; exit 1 \nfi \n" > detect && chmod +x ./detect && ./detect diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc index 2778ca7bc..4472dad08 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc @@ -81,8 +81,8 @@ pcps_opencl_acquisition_cc::pcps_opencl_acquisition_cc( bool dump, const std::string &dump_filename, bool enable_monitor_output) : gr::block("pcps_opencl_acquisition_cc", - gr::io_signature::make(1, 1, static_cast(sizeof(gr_complex) * sampled_ms * samples_per_ms)), - gr::io_signature::make(0, 1, sizeof(Gnss_Synchro))) + gr::io_signature::make(1, 1, static_cast(sizeof(gr_complex) * sampled_ms * samples_per_ms)), + gr::io_signature::make(0, 1, sizeof(Gnss_Synchro))) { this->message_port_register_out(pmt::mp("events")); d_sample_counter = 0ULL; // SAMPLE COUNTER diff --git a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h index 7d074f896..dc20d3838 100644 --- a/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h +++ b/src/algorithms/telemetry_decoder/adapters/beidou_b1i_telemetry_decoder.h @@ -26,8 +26,8 @@ #include "beidou_b1i_telemetry_decoder_gs.h" #include "gnss_satellite.h" // for Gnss_Satellite #include "gnss_synchro.h" -#include "tlm_conf.h" #include "telemetry_decoder_interface.h" +#include "tlm_conf.h" #include // for basic_block_sptr, top_block_sptr #include // for size_t #include diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h index 1351fff50..3f72d117a 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_gs.h @@ -24,8 +24,8 @@ #include "gnss_block_interface.h" #include "gnss_satellite.h" #include "gnss_synchro.h" -#include "tlm_conf.h" #include "gps_navigation_message.h" +#include "tlm_conf.h" #include #include // for block #include // for gr_vector_const_void_star @@ -47,7 +47,7 @@ using gps_l1_ca_telemetry_decoder_gs_sptr = gnss_shared_ptr(udp_addresses, udp_port, enable_protobuf); } -void gnss_synchro_monitor::forecast(int noutput_items __attribute__((unused)), gr_vector_int &ninput_items_required) +void gnss_synchro_monitor::forecast(int noutput_items __attribute__((unused)), gr_vector_int& ninput_items_required) { for (int32_t channel_index = 0; channel_index < d_nchannels; channel_index++) {