rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

LP-295: fixed comments and formatting

Browse Source
This commit is contained in:
Corvus Corax 2016-04-25 18:12:31 +02:00
parent 37d9675924
commit bf80ede401
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/modules/PathFollower/fixedwinglandcontroller.cpp
View File

@ -98,7 +98,7 @@ int32_t FixedWingLandController::Initialize(FixedWingPathFollowerSettingsData *p
} }
/** /**
* reset integrals * reset globals, (integrals, accumulated errors and timers)
*/ */
void FixedWingLandController::resetGlobals() void FixedWingLandController::resetGlobals()
{ {

2
flight/modules/PathFollower/inc/vtolautotakeofffsm.h
View File

@ -47,7 +47,7 @@ typedef enum {
AUTOTAKEOFF_STATE_THRUSTDOWN, // Thrust down sequence AUTOTAKEOFF_STATE_THRUSTDOWN, // Thrust down sequence
AUTOTAKEOFF_STATE_THRUSTOFF, // Thrust is now off AUTOTAKEOFF_STATE_THRUSTOFF, // Thrust is now off
AUTOTAKEOFF_STATE_DISARMED, // Disarmed 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 AUTOTAKEOFF_STATE_SIZE
} PathFollowerFSM_AutoTakeoffState_T; } PathFollowerFSM_AutoTakeoffState_T;

6
flight/modules/PathFollower/vtolautotakeoffcontroller.cpp
View File

@ -130,8 +130,8 @@ uint8_t VtolAutoTakeoffController::Mode(void)
void VtolAutoTakeoffController::ObjectiveUpdated(void) void VtolAutoTakeoffController::ObjectiveUpdated(void)
{ {
if (mOverride) { if (mOverride) {
// override pathDesired from PathPLanner with current position, // override pathDesired from PathPlanner with current position,
// as we deliberately don' not care about the location of the waypoints on the map // as we deliberately don't care about the location of the waypoints on the map
float velocity_down; float velocity_down;
float autotakeoff_height; float autotakeoff_height;
PositionStateData positionState; PositionStateData positionState;
@ -161,6 +161,8 @@ void VtolAutoTakeoffController::ObjectiveUpdated(void)
controlDown.UpdatePositionSetpoint(pathDesired->End.Down); controlDown.UpdatePositionSetpoint(pathDesired->End.Down);
} }
} }
// Controller deactivated
void VtolAutoTakeoffController::Deactivate(void) void VtolAutoTakeoffController::Deactivate(void)
{ {
if (mActive) { if (mActive) {