From 8dc73c462129dc0434915d402ea7db862a61c052 Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Tue, 9 May 2023 16:08:24 +0200 Subject: [PATCH] ManualControl: correct manual control input subscription name --- src/modules/manual_control/ManualControl.cpp | 6 +++--- src/modules/manual_control/ManualControl.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/manual_control/ManualControl.cpp b/src/modules/manual_control/ManualControl.cpp index 851ae0f24f..8759904290 100644 --- a/src/modules/manual_control/ManualControl.cpp +++ b/src/modules/manual_control/ManualControl.cpp @@ -92,7 +92,7 @@ void ManualControl::Run() for (int i = 0; i < MAX_MANUAL_INPUT_COUNT; i++) { manual_control_setpoint_s manual_control_input; - if (_manual_control_setpoint_subs[i].update(&manual_control_input)) { + if (_manual_control_input_subs[i].update(&manual_control_input)) { _selector.updateWithNewInputSample(now, manual_control_input, i); } } @@ -239,11 +239,11 @@ void ManualControl::Run() if (instance != _previous_manual_control_input_instance) { if ((0 <= _previous_manual_control_input_instance) && (_previous_manual_control_input_instance < MAX_MANUAL_INPUT_COUNT)) { - _manual_control_setpoint_subs[_previous_manual_control_input_instance].unregisterCallback(); + _manual_control_input_subs[_previous_manual_control_input_instance].unregisterCallback(); } if ((0 <= instance) && (instance < MAX_MANUAL_INPUT_COUNT)) { - _manual_control_setpoint_subs[instance].registerCallback(); + _manual_control_input_subs[instance].registerCallback(); } _previous_manual_control_input_instance = instance; diff --git a/src/modules/manual_control/ManualControl.hpp b/src/modules/manual_control/ManualControl.hpp index bc056d45f0..8859d72f5b 100644 --- a/src/modules/manual_control/ManualControl.hpp +++ b/src/modules/manual_control/ManualControl.hpp @@ -104,7 +104,7 @@ private: uORB::Subscription _vehicle_status_sub{ORB_ID(vehicle_status)}; int _previous_manual_control_input_instance{-1}; - uORB::SubscriptionCallbackWorkItem _manual_control_setpoint_subs[MAX_MANUAL_INPUT_COUNT] { + uORB::SubscriptionCallbackWorkItem _manual_control_input_subs[MAX_MANUAL_INPUT_COUNT] { {this, ORB_ID(manual_control_input), 0}, {this, ORB_ID(manual_control_input), 1}, {this, ORB_ID(manual_control_input), 2},