diff --git a/flight/modules/PathFollower/fixedwinglandcontroller.cpp b/flight/modules/PathFollower/fixedwinglandcontroller.cpp index d11d4c4fe..cabc21060 100644 --- a/flight/modules/PathFollower/fixedwinglandcontroller.cpp +++ b/flight/modules/PathFollower/fixedwinglandcontroller.cpp @@ -98,7 +98,7 @@ int32_t FixedWingLandController::Initialize(FixedWingPathFollowerSettingsData *p } /** - * reset integrals + * reset globals, (integrals, accumulated errors and timers) */ void FixedWingLandController::resetGlobals() { diff --git a/flight/modules/PathFollower/inc/vtolautotakeofffsm.h b/flight/modules/PathFollower/inc/vtolautotakeofffsm.h index f683ee33c..0ac6b919d 100644 --- a/flight/modules/PathFollower/inc/vtolautotakeofffsm.h +++ b/flight/modules/PathFollower/inc/vtolautotakeofffsm.h @@ -47,7 +47,7 @@ typedef enum { AUTOTAKEOFF_STATE_THRUSTDOWN, // Thrust down sequence AUTOTAKEOFF_STATE_THRUSTOFF, // Thrust is now off AUTOTAKEOFF_STATE_DISARMED, // Disarmed - AUTOTAKEOFF_STATE_ABORT, // Abort on error triggerig fallback to land + AUTOTAKEOFF_STATE_ABORT, // Abort on error triggers fallback to land AUTOTAKEOFF_STATE_SIZE } PathFollowerFSM_AutoTakeoffState_T; diff --git a/flight/modules/PathFollower/vtolautotakeoffcontroller.cpp b/flight/modules/PathFollower/vtolautotakeoffcontroller.cpp index 444535194..6fa6c8620 100644 --- a/flight/modules/PathFollower/vtolautotakeoffcontroller.cpp +++ b/flight/modules/PathFollower/vtolautotakeoffcontroller.cpp @@ -130,8 +130,8 @@ uint8_t VtolAutoTakeoffController::Mode(void) void VtolAutoTakeoffController::ObjectiveUpdated(void) { if (mOverride) { - // override pathDesired from PathPLanner with current position, - // as we deliberately don' not care about the location of the waypoints on the map + // override pathDesired from PathPlanner with current position, + // as we deliberately don't care about the location of the waypoints on the map float velocity_down; float autotakeoff_height; PositionStateData positionState; @@ -161,6 +161,8 @@ void VtolAutoTakeoffController::ObjectiveUpdated(void) controlDown.UpdatePositionSetpoint(pathDesired->End.Down); } } + +// Controller deactivated void VtolAutoTakeoffController::Deactivate(void) { if (mActive) {