From 8e77430cb1152f26afafc12c0f7dcb4725425f8f Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Mon, 14 Nov 2016 22:53:59 +0100
Subject: [PATCH] [9XR-PRO] Warnings removed

---
 radio/src/gui/128x64/gui.h               |  2 +-
 radio/src/gui/128x64/model_telemetry.cpp |  2 +-
 radio/src/tests/gtests.h                 |  2 --
 radio/src/tests/lcd.cpp                  | 10 ++++++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h
index 7bd048f30..c20b25d62 100644
--- a/radio/src/gui/128x64/gui.h
+++ b/radio/src/gui/128x64/gui.h
@@ -213,7 +213,7 @@ int8_t checkIncDecGen(event_t event, int8_t i_val, int8_t i_min, int8_t i_max);
 #define CHECK_INCDEC_GENVAR(event, var, min, max) \
   var = checkIncDecGen(event, var, min, max)
 
-#if defined(CPUARM)
+#if defined(PCBTARANIS)
 #define CURSOR_ON_LINE()               (menuHorizontalPosition < 0)
 #else
 #define CURSOR_ON_LINE()               (0)
diff --git a/radio/src/gui/128x64/model_telemetry.cpp b/radio/src/gui/128x64/model_telemetry.cpp
index 9131641b2..e88878e7f 100644
--- a/radio/src/gui/128x64/model_telemetry.cpp
+++ b/radio/src/gui/128x64/model_telemetry.cpp
@@ -775,7 +775,7 @@ void menuModelTelemetryFrsky(event_t event)
           }
         }
 #else
-        if (attr && menuHorizontalPosition<0) {
+        if (attr && CURSOR_ON_LINE()) {
           lcdDrawSolidFilledRect(TELEM_COL2-1, y-1, LCD_W-TELEM_COL2+1, FH+1);
         }
         lcdDrawNumber(TELEM_COL2, y, -10+g_model.frsky.varioMin, ((CURSOR_ON_LINE() || menuHorizontalPosition==0) ? attr : 0)|LEFT);
diff --git a/radio/src/tests/gtests.h b/radio/src/tests/gtests.h
index 4592b0140..442067862 100644
--- a/radio/src/tests/gtests.h
+++ b/radio/src/tests/gtests.h
@@ -92,8 +92,6 @@ inline void TELEMETRY_RESET()
 #endif
 }
 
-bool checkScreenshot(QString test);
-
 class OpenTxTest : public testing::Test 
 {
   protected:  // You should make the members protected s.t. they can be
diff --git a/radio/src/tests/lcd.cpp b/radio/src/tests/lcd.cpp
index 07b5c7f7e..96072561c 100644
--- a/radio/src/tests/lcd.cpp
+++ b/radio/src/tests/lcd.cpp
@@ -83,11 +83,17 @@ bool checkScreenshot(const QString & test)
   QImage buffer(LCD_W, LCD_H, QImage::Format_RGB32);
   QPainter p(&buffer);
   doPaint(p);
-
   QString filename(QString("%1_%2x%3.png").arg(test).arg(LCD_W).arg(LCD_H));
   QImage reference(TESTS_PATH "/tests/" + filename);
 
-  return buffer == reference;
+  if (buffer == reference) {
+    return true;
+  }
+  else {
+    QString filename(QString("%1_%2x%3.png").arg(test).arg(LCD_W).arg(LCD_H));
+    buffer.save("/tmp/" + filename);
+    return false;
+  }
 }
 
 #if defined(COLORLCD)