From 8794f45816465b04d3869c3bb3cde3e79dfdb685 Mon Sep 17 00:00:00 2001
From: Andre Bernet <kilrah@users.noreply.github.com>
Date: Thu, 6 Apr 2017 22:34:11 +0200
Subject: [PATCH] Check for confirming inversion of throttle channel is no more
 possible since Virtual Inputs got introduced (Fix #4757) (#4758)

---
 radio/src/gui/128x64/model_outputs_arm.cpp | 21 ++------------------
 radio/src/gui/212x64/model_outputs.cpp     | 23 +++-------------------
 radio/src/gui/480x272/model_outputs.cpp    | 21 ++------------------
 3 files changed, 7 insertions(+), 58 deletions(-)

diff --git a/radio/src/gui/128x64/model_outputs_arm.cpp b/radio/src/gui/128x64/model_outputs_arm.cpp
index e2b60bd17..ee5add03d 100644
--- a/radio/src/gui/128x64/model_outputs_arm.cpp
+++ b/radio/src/gui/128x64/model_outputs_arm.cpp
@@ -20,16 +20,6 @@
 
 #include "opentx.h"
 
-bool isThrottleOutput(uint8_t ch)
-{
-  for (uint8_t i=0; i<MAX_MIXERS; i++) {
-    MixData *mix = mixAddress(i);
-    if (mix->destCh==ch && mix->srcRaw==MIXSRC_Thr)
-      return true;
-  }
-  return false;
-}
-
 enum MenuModelOutputsItems {
   ITEM_OUTPUTS_OFFSET,
   ITEM_OUTPUTS_MIN,
@@ -156,17 +146,10 @@ void menuModelLimitsOne(event_t event)
 
       case ITEM_OUTPUTONE_DIR:
       {
-        uint8_t revert = ld->revert;
         lcdDrawTextAlignedLeft(y, TR_LIMITS_HEADERS_DIRECTION);
-        lcdDrawTextAtIndex(LIMITS_ONE_2ND_COLUMN, y, STR_MMMINV, revert, attr);
+        lcdDrawTextAtIndex(LIMITS_ONE_2ND_COLUMN, y, STR_MMMINV, ld->revert, attr);
         if (active) {
-          uint8_t revert_new = checkIncDecModel(event, revert, 0, 1);
-          if (checkIncDec_Ret && isThrottleOutput(k)) {
-            POPUP_CONFIRMATION(STR_INVERT_THR);
-          }
-          else {
-            ld->revert = revert_new;
-          }
+          CHECK_INCDEC_MODELVAR_ZERO(event, ld->revert, 1);
         }
         break;
       }
diff --git a/radio/src/gui/212x64/model_outputs.cpp b/radio/src/gui/212x64/model_outputs.cpp
index b8123aa29..5083f22e8 100644
--- a/radio/src/gui/212x64/model_outputs.cpp
+++ b/radio/src/gui/212x64/model_outputs.cpp
@@ -20,16 +20,6 @@
 
 #include "opentx.h"
 
-bool isThrottleOutput(uint8_t ch)
-{
-  for (int i=0; i<MAX_MIXERS; i++) {
-    MixData *mix = mixAddress(i);
-    if (mix->destCh==ch && mix->srcRaw==MIXSRC_Thr)
-      return true;
-  }
-  return false;
-}
-
 enum LimitsItems {
   ITEM_LIMITS_CH_NAME,
   ITEM_LIMITS_OFFSET,
@@ -205,20 +195,13 @@ void menuModelLimits(event_t event)
 
         case ITEM_LIMITS_DIRECTION:
         {
-          uint8_t revert = ld->revert;
 #if defined(PPM_CENTER_ADJUSTABLE)
-          lcdDrawChar(LIMITS_REVERT_POS, y, revert ? 127 : 126, attr);
+          lcdDrawChar(LIMITS_REVERT_POS, y, ld->revert ? 127 : 126, attr);
 #else
-          lcdDrawTextAtIndex(LIMITS_REVERT_POS, y, STR_MMMINV, revert, attr);
+          lcdDrawTextAtIndex(LIMITS_REVERT_POS, y, STR_MMMINV, ld->revert, attr);
 #endif
           if (active) {
-            uint8_t revert_new = checkIncDecModel(event, revert, 0, 1);
-            if (checkIncDec_Ret && isThrottleOutput(k)) {
-              POPUP_CONFIRMATION(STR_INVERT_THR);
-            }
-            else {
-              ld->revert = revert_new;
-            }
+            CHECK_INCDEC_MODELVAR_ZERO(event, ld->revert, 1);
           }
           break;
         }
diff --git a/radio/src/gui/480x272/model_outputs.cpp b/radio/src/gui/480x272/model_outputs.cpp
index 5c7b3e420..95a90c328 100644
--- a/radio/src/gui/480x272/model_outputs.cpp
+++ b/radio/src/gui/480x272/model_outputs.cpp
@@ -20,16 +20,6 @@
 
 #include "opentx.h"
 
-bool isThrottleOutput(uint8_t ch)
-{
-  for (uint8_t i=0; i<MAX_MIXERS; i++) {
-    MixData * mix = mixAddress(i);
-    if (mix->destCh==ch && mix->srcRaw==MIXSRC_Thr)
-      return true;
-  }
-  return false;
-}
-
 enum LimitsItems {
   ITEM_LIMITS_CH_NAME,
   ITEM_LIMITS_OFFSET,
@@ -198,16 +188,9 @@ bool menuModelLimits(event_t event)
 
         case ITEM_LIMITS_DIRECTION:
         {
-          uint8_t revert = ld->revert;
-          lcdDrawText(LIMITS_REVERT_POS, y, revert ? "\177" : "\176", attr);
+          lcdDrawText(LIMITS_REVERT_POS, y, ld->revert ? "\177" : "\176", attr);
           if (active) {
-            uint8_t revert_new = checkIncDecModel(event, revert, 0, 1);
-            if (checkIncDec_Ret && isThrottleOutput(k)) {
-              POPUP_CONFIRMATION(STR_INVERT_THR);
-            }
-            else {
-              ld->revert = revert_new;
-            }
+            CHECK_INCDEC_MODELVAR_ZERO(event, ld->revert, 1);
           }
           break;
         }