From 7bd851469796f16d51938c318f2b45dd0e2201e0 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Thu, 16 Feb 2017 12:34:21 +0100 Subject: [PATCH] PWM out sim: Do not obey hardware lockdown flag --- src/drivers/pwm_out_sim/pwm_out_sim.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/drivers/pwm_out_sim/pwm_out_sim.cpp b/src/drivers/pwm_out_sim/pwm_out_sim.cpp index 507fa165c2ae..49f89d78170e 100644 --- a/src/drivers/pwm_out_sim/pwm_out_sim.cpp +++ b/src/drivers/pwm_out_sim/pwm_out_sim.cpp @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2012-2015 PX4 Development Team. All rights reserved. + * Copyright (c) 2012-2017 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -543,10 +543,10 @@ PWMSim::task_main() if (updated) { orb_copy(ORB_ID(actuator_armed), _armed_sub, &aa); - /* do not obey the lockdown value, as lockdown is for PWMSim */ + /* do not obey the lockdown value, as lockdown is for PWMSim. Only obey manual lockdown */ _armed = aa.armed; _failsafe = aa.force_failsafe; - _lockdown = aa.lockdown || aa.manual_lockdown; + _lockdown = aa.manual_lockdown; } }