From c5280cd9d74967da9f56dfbe28bf504df0851f57 Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Mon, 13 Oct 2014 00:53:41 +0100 Subject: [PATCH] Ensure mode flags are correctly generated after the switch to a bitmask for activated modes. --- src/main/io/serial_msp.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/io/serial_msp.c b/src/main/io/serial_msp.c index 867da90956..1c8c0604e3 100755 --- a/src/main/io/serial_msp.c +++ b/src/main/io/serial_msp.c @@ -508,20 +508,20 @@ static bool processOutCommand(uint8_t cmdMSP) IS_ENABLED(FLIGHT_MODE(BARO_MODE)) << BOXBARO | IS_ENABLED(FLIGHT_MODE(MAG_MODE)) << BOXMAG | IS_ENABLED(FLIGHT_MODE(HEADFREE_MODE)) << BOXHEADFREE | - IS_RC_MODE_ACTIVE(BOXHEADADJ) << BOXHEADADJ | - IS_RC_MODE_ACTIVE(BOXCAMSTAB) << BOXCAMSTAB | - IS_RC_MODE_ACTIVE(BOXCAMTRIG) << BOXCAMTRIG | + IS_ENABLED(IS_RC_MODE_ACTIVE(BOXHEADADJ)) << BOXHEADADJ | + IS_ENABLED(IS_RC_MODE_ACTIVE(BOXCAMSTAB)) << BOXCAMSTAB | + IS_ENABLED(IS_RC_MODE_ACTIVE(BOXCAMTRIG)) << BOXCAMTRIG | IS_ENABLED(FLIGHT_MODE(GPS_HOME_MODE)) << BOXGPSHOME | IS_ENABLED(FLIGHT_MODE(GPS_HOLD_MODE)) << BOXGPSHOLD | IS_ENABLED(FLIGHT_MODE(PASSTHRU_MODE)) << BOXPASSTHRU | - IS_RC_MODE_ACTIVE(BOXBEEPERON) << BOXBEEPERON | - IS_RC_MODE_ACTIVE(BOXLEDMAX) << BOXLEDMAX | - IS_RC_MODE_ACTIVE(BOXLLIGHTS) << BOXLLIGHTS | - IS_RC_MODE_ACTIVE(BOXCALIB) << BOXCALIB | - IS_RC_MODE_ACTIVE(BOXGOV) << BOXGOV | - IS_RC_MODE_ACTIVE(BOXOSD) << BOXOSD | - IS_RC_MODE_ACTIVE(BOXTELEMETRY) << BOXTELEMETRY | - IS_RC_MODE_ACTIVE(BOXAUTOTUNE) << BOXAUTOTUNE | + IS_ENABLED(IS_RC_MODE_ACTIVE(BOXBEEPERON)) << BOXBEEPERON | + IS_ENABLED(IS_RC_MODE_ACTIVE(BOXLEDMAX)) << BOXLEDMAX | + IS_ENABLED(IS_RC_MODE_ACTIVE(BOXLLIGHTS)) << BOXLLIGHTS | + IS_ENABLED(IS_RC_MODE_ACTIVE(BOXCALIB)) << BOXCALIB | + IS_ENABLED(IS_RC_MODE_ACTIVE(BOXGOV)) << BOXGOV | + IS_ENABLED(IS_RC_MODE_ACTIVE(BOXOSD)) << BOXOSD | + IS_ENABLED(IS_RC_MODE_ACTIVE(BOXTELEMETRY)) << BOXTELEMETRY | + IS_ENABLED(IS_RC_MODE_ACTIVE(BOXAUTOTUNE)) << BOXAUTOTUNE | IS_ENABLED(FLIGHT_MODE(SONAR_MODE)) << BOXSONAR | IS_ENABLED(ARMING_FLAG(ARMED)) << BOXARM; for (i = 0; i < activeBoxIdCount; i++) {