Remove mixermon option (make it always true) (#4573)

* Remove mixermon option (make it always true)

* Cosmetics

* Compile fix

radio/src/gui/128x64/view_channels.cpp

@@ -25,9 +25,8 @@ void menuChannelsView(event_t event)
   static bool longNames = false;
   bool newLongNames = false;
   static bool secondPage = false;
-#ifdef MIXERS_MONITOR
   static bool mixersView = false;
-#endif
+
   uint8_t ch;
 
   switch(event)
@@ -39,11 +38,9 @@ void menuChannelsView(event_t event)
     case EVT_KEY_FIRST(KEY_LEFT):
       secondPage = !secondPage;
       break;
-#ifdef MIXERS_MONITOR
     case EVT_KEY_FIRST(KEY_ENTER):
       mixersView = !mixersView;
       break;
-#endif
   }
 
   if (secondPage)
@@ -51,12 +48,12 @@ void menuChannelsView(event_t event)
   else
     ch = 0;
 
-#ifdef MIXERS_MONITOR
-  if (mixersView)
-  lcdDrawTextAlignedCenter(0*FH, MIXERS_MONITOR);
-  else
-#endif
-  lcdDrawTextAlignedCenter(0*FH, CHANNELS_MONITOR);
+  if (mixersView) {
+    lcdDrawTextAlignedCenter(0, MIXERS_MONITOR);
+  }
+  else {
+    lcdDrawTextAlignedCenter(0, CHANNELS_MONITOR);
+  }
 
   lcdInvertLine(0);
 
@@ -70,11 +67,7 @@ void menuChannelsView(event_t event)
     // Channels
     for (uint8_t line=0; line<8; line++) {
       uint8_t y = 9+line*7;
-#ifdef MIXERS_MONITOR
       int32_t val = (mixersView) ? ex_chans[ch] : channelOutputs[ch];
-#else
-      int32_t val = channelOutputs[ch];
-#endif
       uint8_t ofs = (col ? 0 : 1);
 
       // Channel name if present, number if not

radio/src/gui/212x64/view_channels.cpp

@@ -42,11 +42,9 @@ void menuChannelsView(event_t event)
     case EVT_KEY_FIRST(KEY_LEFT):
       secondPage = !secondPage;
       break;
-#ifdef MIXERS_MONITOR
     case EVT_KEY_FIRST(KEY_ENTER):
       mixersView = !mixersView;
       break;
-#endif
   }
 
   if (secondPage)

radio/src/targets/taranis/CMakeLists.txt

@@ -1,7 +1,6 @@
 option(SHUTDOWN_CONFIRMATION "Shutdown confirmation" OFF)
 option(LCD_DUAL_BUFFER "Dual LCD Buffer" OFF)
 option(TARANIS_INTERNAL_PPM "Taranis internal module hack to output PPM" OFF)
-option(MIXERS_MONITOR "Enable Mixers Monitor screen (not available on X7 yet)" OFF)
 
 if(PCB STREQUAL X9E)
   set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
@@ -142,8 +141,4 @@ if(TARANIS_INTERNAL_PPM)
   add_definitions(-DTARANIS_INTERNAL_PPM)
 endif()
 
-if(MIXERS_MONITOR AND NOT PCB STREQUAL X7)
-  add_definitions(-DMIXERS_MONITOR)
-endif()
-
 set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} ${BITMAPS_TARGET})