From c0dbde03188e3b301bf25d028e702a75b219d09f Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Fri, 26 Dec 2014 20:04:17 +0000 Subject: [PATCH] Fix unable to arm using after setting mode range for arm and being able to arm using sticks after removing all mode ranges for arm. --- src/main/io/rc_controls.c | 2 ++ src/main/io/serial_msp.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/main/io/rc_controls.c b/src/main/io/rc_controls.c index 7247a8a22..d8662e1ad 100644 --- a/src/main/io/rc_controls.c +++ b/src/main/io/rc_controls.c @@ -519,6 +519,8 @@ void useRcControlsConfig(modeActivationCondition_t *modeActivationConditions, es escAndServoConfig = escAndServoConfigToUse; pidProfile = pidProfileToUse; + isUsingSticksToArm = true; + for (index = 0; index < MAX_MODE_ACTIVATION_CONDITION_COUNT; index++) { modeActivationCondition_t *modeActivationCondition = &modeActivationConditions[index]; if (modeActivationCondition->modeId == BOXARM && IS_RANGE_USABLE(&modeActivationCondition->range)) { diff --git a/src/main/io/serial_msp.c b/src/main/io/serial_msp.c index e5a7f69d5..ca74d0c08 100644 --- a/src/main/io/serial_msp.c +++ b/src/main/io/serial_msp.c @@ -80,6 +80,8 @@ extern uint16_t cycleTime; // FIXME dependency on mw.c extern uint16_t rssi; // FIXME dependency on mw.c extern int16_t debug[4]; // FIXME dependency on mw.c +void useRcControlsConfig(modeActivationCondition_t *modeActivationConditions, escAndServoConfig_t *escAndServoConfigToUse, pidProfile_t *pidProfileToUse); + /** * MSP Guidelines, emphasis is used to clarify. * @@ -1172,6 +1174,8 @@ static bool processInCommand(void) mac->auxChannelIndex = read8(); mac->range.startStep = read8(); mac->range.endStep = read8(); + + useRcControlsConfig(currentProfile->modeActivationConditions, &masterConfig.escAndServoConfig, ¤tProfile->pidProfile); } else { headSerialError(0); }