From cd7c075b3b27269aa5962c0e9898e85016f183fa Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Wed, 13 Jun 2018 22:26:49 +0200
Subject: [PATCH] Do not display disabled trim on main views (#5962)

* Proof of concept

* Add Horus

* Better implementation

* AVR compilation fix
---
 radio/src/gui/128x64/view_main.cpp  | 5 +++++
 radio/src/gui/212x64/view_main.cpp  | 4 ++++
 radio/src/gui/480x272/view_main.cpp | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/radio/src/gui/128x64/view_main.cpp b/radio/src/gui/128x64/view_main.cpp
index 645e3f645..c4340dbf4 100644
--- a/radio/src/gui/128x64/view_main.cpp
+++ b/radio/src/gui/128x64/view_main.cpp
@@ -105,6 +105,11 @@ void displayTrims(uint8_t phase)
     uint8_t att = ROUND;
     int16_t val = getTrimValue(phase, i);
 
+#if defined(CPUARM)
+    if(getRawTrimValue(phase, i).mode == TRIM_MODE_NONE)
+      continue;
+#endif
+
 #if !defined(CPUM64) || !defined(TELEMETRY_FRSKY)
     int16_t dir = val;
     bool exttrim = false;
diff --git a/radio/src/gui/212x64/view_main.cpp b/radio/src/gui/212x64/view_main.cpp
index 66f7084fd..c99561bcd 100644
--- a/radio/src/gui/212x64/view_main.cpp
+++ b/radio/src/gui/212x64/view_main.cpp
@@ -96,6 +96,10 @@ void displayTrims(uint8_t phase)
     int32_t trim = getTrimValue(phase, i);
     int32_t val = trim;
     bool exttrim = false;
+    
+    if(getRawTrimValue(phase, i).mode == TRIM_MODE_NONE)
+      continue;
+    
     if (val < TRIM_MIN || val > TRIM_MAX) {
       exttrim = true;
     }
diff --git a/radio/src/gui/480x272/view_main.cpp b/radio/src/gui/480x272/view_main.cpp
index 5aadeaf10..c4dfffd7f 100644
--- a/radio/src/gui/480x272/view_main.cpp
+++ b/radio/src/gui/480x272/view_main.cpp
@@ -53,6 +53,10 @@ void drawTrims(uint8_t flightMode)
     coord_t xm = x[stickIndex];
     int32_t trim = getTrimValue(flightMode, i);
 
+
+    if(getRawTrimValue(flightMode, i).mode == TRIM_MODE_NONE)
+      continue;
+
     if (vert[i]) {
       if (g_model.extendedTrims == 1) {
         drawVerticalSlider(xm, TRIM_V_Y, 160, trim, TRIM_EXTENDED_MIN, TRIM_EXTENDED_MAX, 0, OPTION_SLIDER_EMPTY_BAR|OPTION_SLIDER_TRIM_BUTTON);