Skip to content

Commit

Permalink
PWM out sim: Do not obey hardware lockdown flag
Browse files Browse the repository at this point in the history
  • Loading branch information
LorenzMeier committed Feb 16, 2017
1 parent ea5caf2 commit 7bd8514
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/drivers/pwm_out_sim/pwm_out_sim.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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;
}
}

Expand Down

0 comments on commit 7bd8514

Please sign in to comment.