From ae3e39233e5aaddffb7d78041e028dd07da065d1 Mon Sep 17 00:00:00 2001 From: Frank Osterfeld Date: Sat, 23 Sep 2023 10:29:13 +0200 Subject: [PATCH] Clang-format --- blocklib/picoscope4000a/picoscope4000a.cc | 6 ++-- blocklib/picoscope4000a/picoscope4000a.h | 35 +++++++++++++++++++---- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/blocklib/picoscope4000a/picoscope4000a.cc b/blocklib/picoscope4000a/picoscope4000a.cc index 8c00c079..8f5d4b62 100644 --- a/blocklib/picoscope4000a/picoscope4000a.cc +++ b/blocklib/picoscope4000a/picoscope4000a.cc @@ -383,8 +383,7 @@ std::error_code Picoscope4000a::driver_initialize() return {}; } -std::error_code Picoscope4000a::set_buffers(std::size_t samples, - uint32_t block_number) +std::error_code Picoscope4000a::set_buffers(std::size_t samples, uint32_t block_number) { for (auto& channel : state.channels) { const auto aichan = convert_to_ps4000a_channel(channel.id); @@ -588,7 +587,8 @@ std::error_code Picoscope4000a::driver_poll() { const auto status = ps4000aGetStreamingLatestValues( state.handle, - static_cast(gr::picoscope::detail::invoke_streaming_callback), + static_cast( + gr::picoscope::detail::invoke_streaming_callback), &_streaming_callback); if (status == PICO_BUSY || status == PICO_DRIVER_FUNCTION) { return {}; diff --git a/blocklib/picoscope4000a/picoscope4000a.h b/blocklib/picoscope4000a/picoscope4000a.h index 59f1af67..073cdc86 100644 --- a/blocklib/picoscope4000a/picoscope4000a.h +++ b/blocklib/picoscope4000a/picoscope4000a.h @@ -23,7 +23,10 @@ struct Picoscope4000a : public gr::picoscope::Picoscope { fair::graph::OUT values7; fair::graph::OUT errors7; - explicit Picoscope4000a(gr::picoscope::Settings settings = {}) : gr::picoscope::Picoscope(std::move(settings)) {} + explicit Picoscope4000a(gr::picoscope::Settings settings = {}) + : gr::picoscope::Picoscope(std::move(settings)) + { + } fair::graph::work_return_status_t process_bulk(std::span v0, std::span e0, @@ -42,11 +45,17 @@ struct Picoscope4000a : public gr::picoscope::Picoscope { std::span v7, std::span e7) noexcept { - return this->process_bulk_impl<8>({{{v0, e0}, {v1, e1}, {v2, e2}, {v3, e3}, {v4, e4}, {v5, e5}, {v6, e6}, {v7, e7}}}); + return this->process_bulk_impl<8>({ { { v0, e0 }, + { v1, e1 }, + { v2, e2 }, + { v3, e3 }, + { v4, e4 }, + { v5, e5 }, + { v6, e6 }, + { v7, e7 } } }); } - std::make_signed_t - available_samples(const Picoscope&) const noexcept + std::make_signed_t available_samples(const Picoscope&) const noexcept { return this->available_samples_impl(); } @@ -67,6 +76,22 @@ struct Picoscope4000a : public gr::picoscope::Picoscope { } // namespace gr::picoscope4000a -ENABLE_REFLECTION(gr::picoscope4000a::Picoscope4000a, values0, errors0, values1, errors1, values2, errors2, values3, errors3, values4, errors4, values5, errors5, values6, errors6, values7, errors7); +ENABLE_REFLECTION(gr::picoscope4000a::Picoscope4000a, + values0, + errors0, + values1, + errors1, + values2, + errors2, + values3, + errors3, + values4, + errors4, + values5, + errors5, + values6, + errors6, + values7, + errors7); #endif