Merge pull request #4162 from iNavFlight/dzikuvx-remove-state-helicopter

State HELICOPTER removed
iNavFlight · Feb 25, 2019 · a8ad4d9 · a8ad4d9
2 parents fa2cd90 + 5af6a3d
commit a8ad4d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/main/fc/runtime_config.h b/src/main/fc/runtime_config.h
@@ -100,10 +100,9 @@ typedef enum {
     COMPASS_CALIBRATED      = (1 << 8),
     ACCELEROMETER_CALIBRATED= (1 << 9),
     PWM_DRIVER_AVAILABLE    = (1 << 10),
-    HELICOPTER              = (1 << 11),
-    NAV_CRUISE_BRAKING      = (1 << 12),
-    NAV_CRUISE_BRAKING_BOOST = (1 << 13),
-    NAV_CRUISE_BRAKING_LOCKED = (1 << 14),
+    NAV_CRUISE_BRAKING      = (1 << 11),
+    NAV_CRUISE_BRAKING_BOOST = (1 << 12),
+    NAV_CRUISE_BRAKING_LOCKED = (1 << 13),
 } stateFlags_t;
 
 #define DISABLE_STATE(mask) (stateFlags &= ~(mask))

diff --git a/src/main/flight/mixer.c b/src/main/flight/mixer.c
@@ -128,13 +128,10 @@ void mixerUpdateStateFlags(void)
     // set flag that we're on something with wings
     if (mixerConfig()->platformType == PLATFORM_AIRPLANE) {
         ENABLE_STATE(FIXED_WING);
-        DISABLE_STATE(HELICOPTER);
     } else if (mixerConfig()->platformType == PLATFORM_HELICOPTER) {
         DISABLE_STATE(FIXED_WING);
-        ENABLE_STATE(HELICOPTER);
     } else {
         DISABLE_STATE(FIXED_WING);
-        DISABLE_STATE(HELICOPTER);
     }
 
     if (mixerConfig()->hasFlaps) {