fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-02 02:51:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

PWM out sim: Do not obey hardware lockdown flag

Browse Source
This commit is contained in:
Lorenz Meier
2017-02-16 12:34:51 +01:00
parent ea5caf258f
commit 7bd8514697
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/pwm_out_sim/pwm_out_sim.cpp
+3 -3
View File
@@ -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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -543,10 +543,10 @@ PWMSim::task_main()
if (updated) { if (updated) {
orb_copy(ORB_ID(actuator_armed), _armed_sub, &aa); 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; _armed = aa.armed;
_failsafe = aa.force_failsafe; _failsafe = aa.force_failsafe;
_lockdown = aa.lockdown || aa.manual_lockdown; _lockdown = aa.manual_lockdown;
} }
} }