simplify hold state logic

breadoven · breadoven · commit 8ad1e5dbdec4 · 2024-05-04T13:41:21.000+01:00
diff --git a/src/main/navigation/navigation.c b/src/main/navigation/navigation.c
@@ -4092,10 +4092,7 @@ bool isNavHoldPositionActive(void)
         return posControl.waypointList[posControl.activeWaypointIndex].action != NAV_WP_ACTION_WAYPOINT || isLastMissionWaypoint();
     }
 
-    return posControl.navState != NAV_STATE_FW_LANDING_APPROACH &&
-           posControl.navState != NAV_STATE_FW_LANDING_GLIDE &&
-           posControl.navState != NAV_STATE_FW_LANDING_FLARE &&
-           !posControl.flags.rthTrackbackActive;
+    return !FLIGHT_MODE(NAV_FW_AUTOLAND) && !posControl.flags.rthTrackbackActive;
 }
 
 float getActiveSpeed(void)

Original file line number	Diff line number	Diff line change
`@@ -4092,10 +4092,7 @@ bool isNavHoldPositionActive(void)`
`4092`	`4092`	`return posControl.waypointList[posControl.activeWaypointIndex].action != NAV_WP_ACTION_WAYPOINT \|\| isLastMissionWaypoint();`
`4093`	`4093`	`}`
`4094`	`4094`
`4095`		`- return posControl.navState != NAV_STATE_FW_LANDING_APPROACH &&`
`4096`		`- posControl.navState != NAV_STATE_FW_LANDING_GLIDE &&`
`4097`		`- posControl.navState != NAV_STATE_FW_LANDING_FLARE &&`
`4098`		`- !posControl.flags.rthTrackbackActive;`
	`4095`	`+ return !FLIGHT_MODE(NAV_FW_AUTOLAND) && !posControl.flags.rthTrackbackActive;`
`4099`	`4096`	`}`
`4100`	`4097`
`4101`	`4098`	`float getActiveSpeed(void)`