Ensure mode flags are correctly generated after the switch to a bitmask

for activated modes.
This commit is contained in:
Dominic Clifton 2014-10-13 00:53:41 +01:00
parent 50ba314116
commit c5280cd9d7
1 changed files with 11 additions and 11 deletions

View File

@ -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++) {