mavlink stream: Heartbeat system status should neglect the actuator_a…

…rmed.lockdown flag in HIL, since this is always enabled for HIL.
PX4 · May 24, 2023 · f6790a8 · f6790a8
1 parent 822d784
commit f6790a8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/modules/mavlink/streams/HEARTBEAT.hpp b/src/modules/mavlink/streams/HEARTBEAT.hpp
@@ -122,7 +122,8 @@ class MavlinkStreamHeartbeat : public MavlinkStream
 			}
 
 			// system_status overrides
-			if (actuator_armed.force_failsafe || actuator_armed.lockdown || actuator_armed.manual_lockdown
+			if (actuator_armed.force_failsafe || (actuator_armed.lockdown
+							      && vehicle_status.hil_state == vehicle_status_s::HIL_STATE_OFF) || actuator_armed.manual_lockdown
 			    || vehicle_status.nav_state == vehicle_status_s::NAVIGATION_STATE_TERMINATION) {
 				system_status = MAV_STATE_FLIGHT_TERMINATION;