Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-20 14:55:18 +03:00
Code Issues Wiki Activity

Merge pull request #7580 from JulioCesarMatias/FixBoolFlags

Browse source 
Fix Bool Flags Value
This commit is contained in:
Paweł Spychalski 2021-11-17 21:04:30 +01:00 • committed by GitHub
commit 23973cb1a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/navigation/navigation.c
View file

@ -3189,8 +3189,8 @@ void applyWaypointNavigationAndAltitudeHold(void)
} }
/* Reset flags */ /* Reset flags */
posControl.flags.horizontalPositionDataConsumed = 0; posControl.flags.horizontalPositionDataConsumed = false;
posControl.flags.verticalPositionDataConsumed = 0; posControl.flags.verticalPositionDataConsumed = false;
/* Process controllers */ /* Process controllers */
navigationFSMStateFlags_t navStateFlags = navGetStateFlags(posControl.navState); navigationFSMStateFlags_t navStateFlags = navGetStateFlags(posControl.navState);
@ -3772,7 +3772,7 @@ void navigationInit(void)
posControl.flags.estHeadingStatus = EST_NONE; posControl.flags.estHeadingStatus = EST_NONE;
posControl.flags.estAglStatus = EST_NONE; posControl.flags.estAglStatus = EST_NONE;
posControl.flags.forcedRTHActivated = 0; posControl.flags.forcedRTHActivated = false;
posControl.flags.forcedEmergLandingActivated = false; posControl.flags.forcedEmergLandingActivated = false;
posControl.waypointCount = 0; posControl.waypointCount = 0;
posControl.activeWaypointIndex = 0; posControl.activeWaypointIndex = 0;

6
src/main/navigation/navigation_fixedwing.c
View file

@ -188,7 +188,7 @@ void applyFixedWingAltitudeAndThrottleController(timeUs_t currentTimeUs)
} }
// Indicate that information is no longer usable // Indicate that information is no longer usable
posControl.flags.verticalPositionDataConsumed = 1; posControl.flags.verticalPositionDataConsumed = true;
} }
isPitchAdjustmentValid = true; isPitchAdjustmentValid = true;
@ -440,7 +440,7 @@ void applyFixedWingPositionController(timeUs_t currentTimeUs)
} }
// Indicate that information is no longer usable // Indicate that information is no longer usable
posControl.flags.horizontalPositionDataConsumed = 1; posControl.flags.horizontalPositionDataConsumed = true;
} }
isRollAdjustmentValid = true; isRollAdjustmentValid = true;
@ -480,7 +480,7 @@ int16_t applyFixedWingMinSpeedController(timeUs_t currentTimeUs)
} }
// Indicate that information is no longer usable // Indicate that information is no longer usable
posControl.flags.horizontalPositionDataConsumed = 1; posControl.flags.horizontalPositionDataConsumed = true;
} }
} }
else { else {

6
src/main/navigation/navigation_multicopter.c
View file

@ -235,7 +235,7 @@ static void applyMulticopterAltitudeController(timeUs_t currentTimeUs)
} }
// Indicate that information is no longer usable // Indicate that information is no longer usable
posControl.flags.verticalPositionDataConsumed = 1; posControl.flags.verticalPositionDataConsumed = true;
} }
// Update throttle controller // Update throttle controller
@ -654,7 +654,7 @@ static void applyMulticopterPositionController(timeUs_t currentTimeUs)
} }
// Indicate that information is no longer usable // Indicate that information is no longer usable
posControl.flags.horizontalPositionDataConsumed = 1; posControl.flags.horizontalPositionDataConsumed = true;
} }
} }
else { else {
@ -774,7 +774,7 @@ static void applyMulticopterEmergencyLandingController(timeUs_t currentTimeUs)
} }
// Indicate that information is no longer usable // Indicate that information is no longer usable
posControl.flags.verticalPositionDataConsumed = 1; posControl.flags.verticalPositionDataConsumed = true;
} }
// Update throttle controller // Update throttle controller

2
src/main/navigation/navigation_rover_boat.c
View file

@ -102,7 +102,7 @@ void applyRoverBoatPositionController(timeUs_t currentTimeUs)
} }
// Indicate that information is no longer usable // Indicate that information is no longer usable
posControl.flags.horizontalPositionDataConsumed = 1; posControl.flags.horizontalPositionDataConsumed = true;
} }
isYawAdjustmentValid = true; isYawAdjustmentValid = true;