From 6201b8a425e3901a376e48545b85d32a1e9b7a38 Mon Sep 17 00:00:00 2001 From: Jonathan Challinger Date: Wed, 28 Jan 2015 15:58:01 -0800 Subject: [PATCH] AP_HAL_VRBRAIN: attempt to initialize USB while soft-disarmed --- libraries/AP_HAL_VRBRAIN/UARTDriver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/AP_HAL_VRBRAIN/UARTDriver.cpp b/libraries/AP_HAL_VRBRAIN/UARTDriver.cpp index 86df7c1cb7..3d4ee4202f 100644 --- a/libraries/AP_HAL_VRBRAIN/UARTDriver.cpp +++ b/libraries/AP_HAL_VRBRAIN/UARTDriver.cpp @@ -191,7 +191,7 @@ void VRBRAINUARTDriver::try_initialise(void) return; } _last_initialise_attempt_ms = hal.scheduler->millis(); - if (hal.util->safety_switch_state() != AP_HAL::Util::SAFETY_ARMED) { + if (hal.util->safety_switch_state() != AP_HAL::Util::SAFETY_ARMED || !hal.util->get_soft_armed()) { begin(0); } }