From d32484406e01d3c442b6885b5b070769b00b270a Mon Sep 17 00:00:00 2001
From: mhotar <mhotar@gmail.com>
Date: Fri, 18 Jul 2014 01:30:10 +0200
Subject: [PATCH 1/2] trim marks showing direction #1419

---
 radio/src/gui/view_main.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/radio/src/gui/view_main.cpp b/radio/src/gui/view_main.cpp
index 5a12fe30f..54f4d096c 100644
--- a/radio/src/gui/view_main.cpp
+++ b/radio/src/gui/view_main.cpp
@@ -163,6 +163,9 @@ void displayTrims(uint8_t phase)
 
     uint8_t att = ROUND;
     int16_t val = getTrimValue(phase, i);
+#if !defined(CPUM64) || !defined(FRSKY)
+    int16_t dir = val;
+#endif
 
     if (val < -125 || val > 125)
       att = BLINK|INVERS|ROUND;
@@ -182,6 +185,15 @@ void displayTrims(uint8_t phase)
         lcd_vline(xm+1, ym-1,  3);
       }
       ym -= val;
+#if !defined(CPUM64) || !defined(FRSKY)
+      lcd_filled_rect(xm-3, ym-3, 7, 7, SOLID, att|ERASE);
+      if (dir >= 0) {
+        lcd_hline(xm-1, ym-1,  3);
+      }
+      if (dir <= 0) {
+        lcd_hline(xm-1, ym+1,  3);
+      }
+#endif
     }
     else {
       ym = 60;
@@ -189,6 +201,15 @@ void displayTrims(uint8_t phase)
       lcd_hline(xm-1, ym-1,  3);
       lcd_hline(xm-1, ym+1,  3);
       xm += val;
+#if !defined(CPUM64) || !defined(FRSKY)
+      lcd_filled_rect(xm-3, ym-3, 7, 7, SOLID, att|ERASE);
+      if (dir >= 0) {
+        lcd_vline(xm+1, ym-1,  3);
+      }
+      if (dir <= 0) {
+        lcd_vline(xm-1, ym-1,  3);
+      }
+#endif
     }
     lcd_square(xm-3, ym-3, 7, att);
   }

From afad17be7ec2deea9fb804f8547ade7463aeba1a Mon Sep 17 00:00:00 2001
From: mhotar <mhotar@gmail.com>
Date: Fri, 18 Jul 2014 14:05:45 +0200
Subject: [PATCH 2/2] exttrim sign added #1419

---
 radio/src/gui/view_main.cpp | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/radio/src/gui/view_main.cpp b/radio/src/gui/view_main.cpp
index 54f4d096c..3f11305e4 100644
--- a/radio/src/gui/view_main.cpp
+++ b/radio/src/gui/view_main.cpp
@@ -163,19 +163,23 @@ void displayTrims(uint8_t phase)
 
     uint8_t att = ROUND;
     int16_t val = getTrimValue(phase, i);
+
 #if !defined(CPUM64) || !defined(FRSKY)
     int16_t dir = val;
+    bool exttrim = false;
+    if (val < -125 || val > 125) {
+      exttrim = true;
+    }
 #endif
-
-    if (val < -125 || val > 125)
-      att = BLINK|INVERS|ROUND;
-
-    if (val < -(TRIM_LEN+1)*4)
+    if (val < -(TRIM_LEN+1)*4) {
       val = -(TRIM_LEN+1);
-    else if (val > (TRIM_LEN+1)*4)
+    }
+    else if (val > (TRIM_LEN+1)*4) {
       val = TRIM_LEN+1;
-    else
+    }
+    else {
       val /= 4;
+    }
 
     if (vert[i]) {
       ym = 31;
@@ -193,6 +197,9 @@ void displayTrims(uint8_t phase)
       if (dir <= 0) {
         lcd_hline(xm-1, ym+1,  3);
       }
+      if (exttrim) {
+        lcd_hline(xm-1, ym,  3);
+      }
 #endif
     }
     else {
@@ -209,6 +216,9 @@ void displayTrims(uint8_t phase)
       if (dir <= 0) {
         lcd_vline(xm-1, ym-1,  3);
       }
+      if (exttrim) {
+        lcd_vline(xm, ym-1,  3);
+      }
 #endif
     }
     lcd_square(xm-3, ym-3, 7, att);