From ffe0ec27e6068b5ece3d0b8f2b9a49e55dd8860b Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Tue, 23 May 2023 17:53:54 +0200 Subject: [PATCH] Unify MixingOutput constructor calls to make them easy to search for and check the arguments. --- src/drivers/actuators/modal_io/modal_io.cpp | 1 - src/drivers/actuators/modal_io/modal_io.hpp | 2 +- src/drivers/dshot/DShot.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/drivers/actuators/modal_io/modal_io.cpp b/src/drivers/actuators/modal_io/modal_io.cpp index 6a9c6e0a24..dea9fe42f9 100644 --- a/src/drivers/actuators/modal_io/modal_io.cpp +++ b/src/drivers/actuators/modal_io/modal_io.cpp @@ -48,7 +48,6 @@ const char *_device; ModalIo::ModalIo() : OutputModuleInterface(MODULE_NAME, px4::serial_port_to_wq(MODAL_IO_DEFAULT_PORT)), - _mixing_output{"MODAL_IO", MODAL_IO_OUTPUT_CHANNELS, *this, MixingOutput::SchedulingPolicy::Auto, false, false}, _cycle_perf(perf_alloc(PC_ELAPSED, MODULE_NAME": cycle")), _output_update_perf(perf_alloc(PC_INTERVAL, MODULE_NAME": output update interval")) { diff --git a/src/drivers/actuators/modal_io/modal_io.hpp b/src/drivers/actuators/modal_io/modal_io.hpp index a61c269e6b..196728aab7 100644 --- a/src/drivers/actuators/modal_io/modal_io.hpp +++ b/src/drivers/actuators/modal_io/modal_io.hpp @@ -174,7 +174,7 @@ private: } led_rsc_t; ch_assign_t _output_map[MODAL_IO_OUTPUT_CHANNELS] {{1, 1}, {2, 1}, {3, 1}, {4, 1}}; - MixingOutput _mixing_output; + MixingOutput _mixing_output{"MODAL_IO", MODAL_IO_OUTPUT_CHANNELS, *this, MixingOutput::SchedulingPolicy::Auto, false, false}; perf_counter_t _cycle_perf; perf_counter_t _output_update_perf; diff --git a/src/drivers/dshot/DShot.h b/src/drivers/dshot/DShot.h index f0cb4458f4..4f314cebb7 100644 --- a/src/drivers/dshot/DShot.h +++ b/src/drivers/dshot/DShot.h @@ -143,7 +143,7 @@ private: void handle_vehicle_commands(); - MixingOutput _mixing_output {PARAM_PREFIX, DIRECT_PWM_OUTPUT_CHANNELS, *this, MixingOutput::SchedulingPolicy::Auto, false, false}; + MixingOutput _mixing_output{PARAM_PREFIX, DIRECT_PWM_OUTPUT_CHANNELS, *this, MixingOutput::SchedulingPolicy::Auto, false, false}; uint32_t _reversible_outputs{}; Telemetry *_telemetry{nullptr};