1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-25 17:25:18 +03:00

Merge pull request #8330 from JulioCesarMatias/RenameASFunction

Rename pitotCalculateAirSpeed()
This commit is contained in:
Paweł Spychalski 2022-08-22 13:56:54 +02:00 committed by GitHub
commit cdaf835822
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 32 additions and 30 deletions

View file

@ -660,12 +660,12 @@ bool isFixedWingAutoThrottleManuallyIncreased()
bool isFixedWingFlying(void)
{
float airspeed = 0;
float airspeed = 0.0f;
#ifdef USE_PITOT
airspeed = pitot.airSpeed;
airspeed = getAirspeedEstimate();
#endif
bool throttleCondition = getMotorCount() == 0 || rcCommand[THROTTLE] > currentBatteryProfile->nav.fw.cruise_throttle;
bool velCondition = posControl.actualState.velXY > 250 || airspeed > 250;
bool velCondition = posControl.actualState.velXY > 250.0f || airspeed > 250.0f;
bool launchCondition = isNavLaunchEnabled() && fixedWingLaunchStatus() == FW_LAUNCH_FLYING;
return (isImuHeadingValid() && throttleCondition && velCondition) || launchCondition;