From ef05cdd782c7530d2dc7d03ba03e7d2b2a708dd7 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Wed, 12 Mar 2014 17:30:45 +0100
Subject: [PATCH] Cosmetics

---
 radio/src/myeeprom.h                | 18 ++++++++++++------
 radio/src/telemetry/frsky.cpp       |  2 +-
 radio/src/telemetry/frsky_sport.cpp |  2 +-
 radio/src/translations/en.h.txt     |  4 ++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index ba722512f..c87086de5 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -1112,12 +1112,18 @@ enum FrskyUsrProtocols {
   USR_PROTO_LAST = USR_PROTO_WS_HOW_HIGH,
 };
 
-enum FrskySource {
-  FRSKY_SOURCE_NONE,
-  FRSKY_SOURCE_A1,
-  FRSKY_SOURCE_A2,
-  FRSKY_SOURCE_FAS,
-  FRSKY_SOURCE_CELLS,
+enum FrskyCurrentSource {
+  FRSKY_CURRENT_SOURCE_NONE,
+  FRSKY_CURRENT_SOURCE_A1,
+  FRSKY_CURRENT_SOURCE_A2,
+  FRSKY_CURRENT_SOURCE_FAS,
+};
+
+enum FrskyVoltsSource {
+  FRSKY_VOLTS_SOURCE_A1,
+  FRSKY_VOLTS_SOURCE_A2,
+  FRSKY_VOLTS_SOURCE_FAS,
+  FRSKY_VOLTS_SOURCE_CELLS,
 };
 
 #if defined(CPUARM)
diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp
index 408fa43cd..45394bff0 100644
--- a/radio/src/telemetry/frsky.cpp
+++ b/radio/src/telemetry/frsky.cpp
@@ -723,7 +723,7 @@ void telemetryInterrupt10ms()
       uint16_t current = 0;
 #endif
 
-      channel = g_model.frsky.currentSource - FRSKY_SOURCE_A1;
+      channel = g_model.frsky.currentSource - FRSKY_CURRENT_SOURCE_A1;
       if (channel <= 1) {
         current = applyChannelRatio(channel, frskyData.analog[channel].value) / 10;
       }
diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp
index 8ac5a0801..84f71cc88 100644
--- a/radio/src/telemetry/frsky_sport.cpp
+++ b/radio/src/telemetry/frsky_sport.cpp
@@ -595,7 +595,7 @@ void telemetryInterrupt10ms()
     uint16_t current = 0;
 #endif
 
-    channel = g_model.frsky.currentSource - FRSKY_SOURCE_A1;
+    channel = g_model.frsky.currentSource - FRSKY_CURRENT_SOURCE_A1;
     if (channel <= 1) {
       current = applyChannelRatio(channel, frskyData.analog[channel].value) / 10;
     }
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index 7f26756f8..d2cced3eb 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -319,8 +319,8 @@
 #define LEN_VTELPROTO          "\007"
 #define TR_VTELPROTO           "None\0  ""Hub\0   ""WSHHigh"
 
-#define LEN_VOLTSRC            "\003"
-#define TR_VOLTSRC             "---""A1\0""A2\0""FAS""Cel"
+#define LEN_VOLTSRC            TR("\003", "\007")
+#define TR_VOLTSRC             TR("---""A1\0""A2\0""FAS""Cel", "---\0   ""A1\0    ""A2\0    ""FAS\0   ""Cells\0 ")
 
 #define LEN_VARIOSRC           "\004"
 #if defined(FRSKY_SPORT)