Info options update

ShikOfTheRa · Aug 8, 2018 · 781fb3a · 781fb3a
1 parent 459417d
commit 781fb3a
Showing 1 changed file with 28 additions and 13 deletions.
diff --git a/MW_OSD/Def.h b/MW_OSD/Def.h
@@ -842,19 +842,6 @@ enum {
   #define USE_FC_VOLTS_CONFIG
 #endif
 
-/********************  OPTIONS enabled definitions  *********************/
-#ifdef USE_MENU_VTX
-  #define INFO_OPTIONS_4 1<<4
-#else
-  #define INFO_OPTIONS_4 0
-#endif
-#if defined TX_GUI_CONTROL   //PITCH,YAW,THROTTLE,ROLL order controlled by GUI 
-  #define INFO_OPTIONS_5 1<<5
-#else
-  #define INFO_OPTIONS_5 0
-#endif
-#define INFO_OPTIONS 0|INFO_OPTIONS_4|INFO_OPTIONS_5
-
 /********************  FIXEDWING definitions  *********************/
 #ifdef FIXEDWING                     
   //#define LONG_RANGE_DISPLAY
@@ -1297,6 +1284,34 @@ enum {
 #endif
 
 
+/********************  OPTIONS enabled definitions  *********************/
+#ifdef PROTOCOL_MAVLINK
+  #define INFO_OPTIONS_0 1<<0
+#else
+  #define INFO_OPTIONS_0 0
+#endif
+
+#ifdef GPSOSD
+  #define INFO_OPTIONS_1 1<<1
+#else
+  #define INFO_OPTIONS_1 0
+#endif
+
+#ifdef USE_MENU_VTX
+  #define INFO_OPTIONS_4 1<<4
+#else
+  #define INFO_OPTIONS_4 0
+#endif
+
+#if defined TX_GUI_CONTROL   //PITCH,YAW,THROTTLE,ROLL order controlled by GUI 
+  #define INFO_OPTIONS_5 1<<5
+#else
+  #define INFO_OPTIONS_5 0
+#endif
+
+#define INFO_OPTIONS 0|INFO_OPTIONS_0|INFO_OPTIONS_1|INFO_OPTIONS_4|INFO_OPTIONS_5
+
+
 /********************  info for GUI  *********************/
 #ifndef INFO_CONTROLLER
   #define INFO_CONTROLLER          0            // default - unknown