From 9409646a8903643a3e37b2bd140b8e8ea42c1b7c Mon Sep 17 00:00:00 2001 From: Per Frivik <94360401+PerFrivik@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:38:29 +0100 Subject: [PATCH] Update RoverPositionControl.cpp --- src/modules/rover_pos_control/RoverPositionControl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/rover_pos_control/RoverPositionControl.cpp b/src/modules/rover_pos_control/RoverPositionControl.cpp index 1c80808ec0..24909280e9 100644 --- a/src/modules/rover_pos_control/RoverPositionControl.cpp +++ b/src/modules/rover_pos_control/RoverPositionControl.cpp @@ -113,7 +113,7 @@ RoverPositionControl::vehicle_control_mode_poll() void RoverPositionControl::manual_control_setpoint_poll() { - if (true) { + if (_control_mode.flag_control_manual_enabled) { if (_manual_control_setpoint_sub.copy(&_manual_control_setpoint)) { float dt = math::constrain(hrt_elapsed_time(&_manual_setpoint_last_called) * 1e-6f, 0.0002f, 0.04f); @@ -431,7 +431,7 @@ RoverPositionControl::Run() matrix::Vector2d current_position(_global_pos.lat, _global_pos.lon); matrix::Vector3f current_velocity(_local_pos.vx, _local_pos.vy, _local_pos.vz); - if (false) { + if (!_control_mode.flag_control_manual_enabled && _control_mode.flag_control_position_enabled) { if (control_position(current_position, ground_speed, _pos_sp_triplet)) {