Skip to content

Commit 61e741e

Browse files
committed
FlightTask manual acc: handle ekf position reset properly
1 parent b740a43 commit 61e741e

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

src/modules/flight_mode_manager/tasks/ManualAcceleration/FlightTaskManualAcceleration.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ bool FlightTaskManualAcceleration::update()
106106

107107
void FlightTaskManualAcceleration::_ekfResetHandlerPositionXY(const matrix::Vector2f &delta_xy)
108108
{
109-
_stick_acceleration_xy.resetPosition();
109+
_stick_acceleration_xy.addToPositionSetpoint(delta_xy);
110110
}
111111

112112
void FlightTaskManualAcceleration::_ekfResetHandlerVelocityXY(const matrix::Vector2f &delta_vxy)

src/modules/flight_mode_manager/tasks/Utility/StickAccelerationXY.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ void StickAccelerationXY::resetPosition(const matrix::Vector2f &position)
5555
_position_setpoint = position;
5656
}
5757

58+
void StickAccelerationXY::addToPositionSetpoint(const matrix::Vector2f &delta)
59+
{
60+
_position_setpoint += delta;
61+
}
62+
5863
void StickAccelerationXY::resetVelocity(const matrix::Vector2f &velocity)
5964
{
6065
if (velocity.isAllFinite()) {

src/modules/flight_mode_manager/tasks/Utility/StickAccelerationXY.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ class StickAccelerationXY : public ModuleParams
5656

5757
void resetPosition();
5858
void resetPosition(const matrix::Vector2f &position);
59+
void addToPositionSetpoint(const matrix::Vector2f &delta);
5960
void resetVelocity(const matrix::Vector2f &velocity);
6061
void resetAcceleration(const matrix::Vector2f &acceleration);
6162
void generateSetpoints(matrix::Vector2f stick_xy, const float yaw, const float yaw_sp, const matrix::Vector3f &pos,

0 commit comments

Comments
 (0)