From 591c95ce2f549712a3b21d0649a40008eb423dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Fri, 4 Mar 2022 08:54:06 +0100 Subject: [PATCH] mixer_module: print actual failsafe value --- src/lib/mixer_module/mixer_module.cpp | 8 ++++---- src/lib/mixer_module/mixer_module.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/mixer_module/mixer_module.cpp b/src/lib/mixer_module/mixer_module.cpp index 16c78d3420..615c2b6ff0 100644 --- a/src/lib/mixer_module/mixer_module.cpp +++ b/src/lib/mixer_module/mixer_module.cpp @@ -159,9 +159,9 @@ void MixingOutput::printStatus() const if (_use_dynamic_mixing) { for (unsigned i = 0; i < _max_num_outputs; i++) { - PX4_INFO_RAW("Channel %i: func: %i, value: %i, failsafe: %d, disarmed: %d, min: %d, max: %d\n", i, + PX4_INFO_RAW("Channel %i: func: %3i, value: %i, failsafe: %d, disarmed: %d, min: %d, max: %d\n", i, (int)_function_assignment[i], _current_output_value[i], - _failsafe_value[i], _disarmed_value[i], _min_value[i], _max_value[i]); + actualFailsafeValue(i), _disarmed_value[i], _min_value[i], _max_value[i]); } } else { @@ -1103,10 +1103,10 @@ MixingOutput::updateLatencyPerfCounter(const actuator_outputs_s &actuator_output } uint16_t -MixingOutput::actualFailsafeValue(int index) +MixingOutput::actualFailsafeValue(int index) const { if (!_use_dynamic_mixing) { - return failsafeValue(index); + return _failsafe_value[index]; } uint16_t value = 0; diff --git a/src/lib/mixer_module/mixer_module.hpp b/src/lib/mixer_module/mixer_module.hpp index c5dfedab4e..3cbe3bcb65 100644 --- a/src/lib/mixer_module/mixer_module.hpp +++ b/src/lib/mixer_module/mixer_module.hpp @@ -194,7 +194,7 @@ public: /** * Returns the actual failsafe value taking into account the assigned function */ - uint16_t actualFailsafeValue(int index); + uint16_t actualFailsafeValue(int index) const; /** * Get the motor index that maps from PX4 convention to the configured one