renamed heading controller to wheel controller, added groundspeed dependency and separate parameters

This commit is contained in:
Andreas Antener
2015-09-24 15:57:51 +02:00
committed by Roman
parent 6c31421889
commit 234a200e60
9 changed files with 138 additions and 55 deletions
+4 -3
View File
@@ -123,10 +123,10 @@ void RunwayTakeoff::update(float airspeed, float alt_agl, int mavlink_fd)
}
}
bool RunwayTakeoff::controlYaw()
bool RunwayTakeoff::controlWheel()
{
// keep controlling yaw with rudder until we have enough ground clearance
return _state < RunwayTakeoffState::FLY;
// keep controlling wheel until takeoff
return _state < RunwayTakeoffState::TAKEOFF;
}
float RunwayTakeoff::getPitch(float tecsPitch)
@@ -140,6 +140,7 @@ float RunwayTakeoff::getPitch(float tecsPitch)
float RunwayTakeoff::getRoll(float navigatorRoll)
{
// until we have enough ground clearance, set roll to 0
if (_state < RunwayTakeoffState::FLY) {
return 0.0f;
}
+1 -1
View File
@@ -75,7 +75,7 @@ public:
bool runwayTakeoffEnabled() { return (bool)_runway_takeoff_enabled.get(); };
bool controlYaw();
bool controlWheel();
bool climbout() { return _climbout; };
float getPitch(float tecsPitch);
float getRoll(float navigatorRoll);