From 461d994deac33859e19f1a40e97e01187af827b1 Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Sun, 6 Sep 2015 17:10:58 +0200
Subject: [PATCH] Cosmetics

---
 companion/src/firmwares/opentx/opentxinterface.cpp |  2 +-
 radio/src/gui/9X/menu_general_diaganas.cpp         | 12 ++++++------
 radio/src/gui/9X/menu_general_setup.cpp            |  2 +-
 radio/src/gui/9X/view_statistics.cpp               |  2 +-
 radio/src/opentx.h                                 |  3 ++-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 4f82984b5..257aa6367 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -93,7 +93,7 @@ const int OpenTxEepromInterface::getEEpromSize()
     case BOARD_SKY9X:
       return EESIZE_SKY9X;
     case BOARD_9XRPRO:
-	  case BOARD_AR9X:
+    case BOARD_AR9X:
       return EESIZE_9XRPRO;
     case BOARD_TARANIS:
     case BOARD_TARANIS_PLUS:
diff --git a/radio/src/gui/9X/menu_general_diaganas.cpp b/radio/src/gui/9X/menu_general_diaganas.cpp
index 847527d75..5e745fc00 100755
--- a/radio/src/gui/9X/menu_general_diaganas.cpp
+++ b/radio/src/gui/9X/menu_general_diaganas.cpp
@@ -38,7 +38,7 @@
 
 void menuGeneralDiagAna(uint8_t event)
 {
-#if defined(PCBSKY9X) && !defined(REVA) && !defined(AR9X)
+#if defined(TX_CAPACITY_MEASUREMENT)
   #define ANAS_ITEMS_COUNT 4
 #elif defined(PCBSKY9X)
   #define ANAS_ITEMS_COUNT 3
@@ -93,19 +93,19 @@ void menuGeneralDiagAna(uint8_t event)
 #endif
   if (m_posVert==1) CHECK_INCDEC_GENVAR(event, g_eeGeneral.txVoltageCalibration, -127, 127);
 
-#if defined(PCBSKY9X) && !defined(REVA) && !defined(AR9X)
+#if defined(TX_CAPACITY_MEASUREMENT)
   lcd_putsLeft(6*FH+1, STR_CURRENT_CALIB);
   putsValueWithUnit(LEN_CALIB_FIELDS*FW+4*FW, 6*FH+1, getCurrent(), UNIT_MILLIAMPS, (m_posVert==2 ? INVERS : 0)) ;
   if (m_posVert==2) CHECK_INCDEC_GENVAR(event, g_eeGeneral.txCurrentCalibration, -49, 49);
 #endif
 
 #if defined(PCBSKY9X)
-  #if defined(AR9X)
-    #define TEMP_CALIB_POS 6*FH+1
-    #define TEMP_CALIB_MENU_POS 2
-  #else
+  #if defined(TX_CAPACITY_MEASUREMENT)
     #define TEMP_CALIB_POS 7*FH+1
     #define TEMP_CALIB_MENU_POS 3
+  #else
+    #define TEMP_CALIB_POS 6*FH+1
+    #define TEMP_CALIB_MENU_POS 2
   #endif
 
   lcd_putsLeft(TEMP_CALIB_POS, STR_TEMP_CALIB);
diff --git a/radio/src/gui/9X/menu_general_setup.cpp b/radio/src/gui/9X/menu_general_setup.cpp
index a7ae0c689..ac0edda35 100755
--- a/radio/src/gui/9X/menu_general_setup.cpp
+++ b/radio/src/gui/9X/menu_general_setup.cpp
@@ -394,7 +394,7 @@ void menuGeneralSetup(uint8_t event)
         break;
       }
 
-#if defined(PCBSKY9X) && !defined(AR9X)
+#if defined(TX_CAPACITY_MEASUREMENT)
       case ITEM_SETUP_CAPACITY_WARNING:
         lcd_putsLeft(y, STR_CAPAWARNING);
         putsValueWithUnit(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.mAhWarn*50, UNIT_MAH, attr|LEFT) ;
diff --git a/radio/src/gui/9X/view_statistics.cpp b/radio/src/gui/9X/view_statistics.cpp
index f70176609..209c3b033 100755
--- a/radio/src/gui/9X/view_statistics.cpp
+++ b/radio/src/gui/9X/view_statistics.cpp
@@ -151,7 +151,7 @@ void menuStatisticsDebug(uint8_t event)
   }
 #endif
 
-#if defined(PCBSKY9X) && !defined(REVA)
+#if defined(TX_CAPACITY_MEASUREMENT)
   // current
   lcd_putsLeft(MENU_DEBUG_Y_CURRENT, STR_CPU_CURRENT);
   putsValueWithUnit(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_CURRENT, getCurrent(), UNIT_MILLIAMPS, LEFT);
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index a94b9f541..67fd19078 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -208,7 +208,8 @@
   #define CASE_REV9E(x)
 #endif
 
-#if defined(PCBSKY9X) && !defined(AR9X)
+#if defined(PCBSKY9X) && !defined(AR9X) && !defined(REVA)
+  #define TX_CAPACITY_MEASUREMENT
   #define CASE_CAPACITY(x) x,
 #else
   #define CASE_CAPACITY(x)