From 90e264d56a291ba53d43695efc0df0a9f5a01c21 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 27 Jan 2013 12:52:03 +1100
Subject: [PATCH] HAL_PX4: disable manual override in PX4 for now

---
 libraries/AP_HAL_PX4/RCOutput.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libraries/AP_HAL_PX4/RCOutput.cpp b/libraries/AP_HAL_PX4/RCOutput.cpp
index e49baff3d6..2cb8225ea4 100644
--- a/libraries/AP_HAL_PX4/RCOutput.cpp
+++ b/libraries/AP_HAL_PX4/RCOutput.cpp
@@ -23,7 +23,10 @@ void PX4RCOutput::init(void* unused)
     if (_pwm_fd == -1) {
         hal.scheduler->panic("Unable to open " PWM_OUTPUT_DEVICE_PATH);
     }
-    ioctl(_pwm_fd, PWM_SERVO_ARM, 0);
+    if (ioctl(_pwm_fd, PWM_IO_SET_FEATURES, PWM_IO_FEATURE_ARM_OK) != 0 ||
+        ioctl(_pwm_fd, PWM_SERVO_ARM, 0) != 0) {
+        hal.console->printf("RCOutput: Unable to setup IO arming\n");
+    }
 }
 
 void PX4RCOutput::set_freq(uint32_t chmask, uint16_t freq_hz)