diff options
| author | Julian Oes <joes@student.ethz.ch> | 2012-11-06 19:03:08 -0800 |
|---|---|---|
| committer | Julian Oes <joes@student.ethz.ch> | 2012-11-06 19:03:08 -0800 |
| commit | 74f76006029ad6b209c1a409e8e35044b1c53bbb (patch) | |
| tree | 9266ab3e8fd3fb51ef91a0970cc2b476fe46c2ee /apps/px4io/safety.c | |
| parent | 7da799d154f6f3c5f0c1a92cbad4288f83c90650 (diff) | |
| download | px4-firmware-74f76006029ad6b209c1a409e8e35044b1c53bbb.tar.gz px4-firmware-74f76006029ad6b209c1a409e8e35044b1c53bbb.tar.bz2 px4-firmware-74f76006029ad6b209c1a409e8e35044b1c53bbb.zip | |
Again some hacking to make arming/disarming work for now
Diffstat (limited to 'apps/px4io/safety.c')
| -rw-r--r-- | apps/px4io/safety.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/px4io/safety.c b/apps/px4io/safety.c index f27432664..0ad636c0b 100644 --- a/apps/px4io/safety.c +++ b/apps/px4io/safety.c @@ -76,9 +76,9 @@ safety_check_button(void *arg) /* * Debounce the safety button, change state if it has been held for long enough. * - * Ignore the button if FMU has not said it's OK to arm yet. */ - if (BUTTON_SAFETY && system_state.arm_ok) { + + if (BUTTON_SAFETY) { if (arm_counter < ARM_COUNTER_THRESHOLD) { arm_counter++; } else if (arm_counter == ARM_COUNTER_THRESHOLD) { |