From 46cffb066092c75828f5caca841501f82a9eb945 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 16 Mar 2012 20:10:22 +0000
Subject: [PATCH] Cell introduced in Custom Switches

---
 src/model_menus.cpp | 4 ++--
 src/myeeprom.h      | 7 ++++---
 src/open9x.h        | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index aa59ddb18..cbb39b2b9 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -2005,7 +2005,7 @@ void menuProcTelemetry(uint8_t event)
         uint8_t value = getTelemCustomField(j, k);
         lcd_putsiAtt(k==0?4:TELEM_COL2, y, STR_VTELEMCHNS, value, (sub==subN && m_posHorz==k) ? blink : 0);
         if (sub==subN && m_posHorz==k && (s_editMode>0 || p1valdiff)) {
-          CHECK_INCDEC_MODELVAR(event, value, 0, (j==3 && k==0) ? STATUS_MAX : DISPLAY_MAX);
+          CHECK_INCDEC_MODELVAR(event, value, 0, (j==3 && k==0) ? TELEM_STATUS_MAX : TELEM_DISPLAY_MAX);
           if (checkIncDec_Ret) {
             uint8_t mask = 1 << (2*j+k);
             if (value & 1)
@@ -2042,7 +2042,7 @@ void menuProcTelemetry(uint8_t event)
       if (sub==subN && (s_editMode>0 || p1valdiff)) {
         switch (m_posHorz) {
           case 0:
-            CHECK_INCDEC_MODELVAR(event, g_model.frsky.bars[j].source, 0, BAR_MAX);
+            CHECK_INCDEC_MODELVAR(event, g_model.frsky.bars[j].source, 0, TELEM_BAR_MAX);
             break;
           case 1:
             CHECK_INCDEC_MODELVAR(event, g_model.frsky.bars[j].barMin, 0, 50-g_model.frsky.bars[j].barMax);
diff --git a/src/myeeprom.h b/src/myeeprom.h
index f7e823439..cc0f52371 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -301,9 +301,10 @@ enum TelemetrySource {
   TELEM_ACC,
   TELEM_GPS_TIME,
 
-  BAR_MAX = TELEM_CELL,
-  DISPLAY_MAX = TELEM_TM2,
-  STATUS_MAX = TELEM_GPS_TIME
+  TELEM_BAR_MAX = TELEM_CELL,
+  TELEM_CSW_MAX = TELEM_CELL,
+  TELEM_DISPLAY_MAX = TELEM_TM2,
+  TELEM_STATUS_MAX = TELEM_GPS_TIME
 };
 
 PACK(typedef struct t_FrSkyBarData {
diff --git a/src/open9x.h b/src/open9x.h
index cc38fcaec..3f7c08fc0 100644
--- a/src/open9x.h
+++ b/src/open9x.h
@@ -342,7 +342,7 @@ enum EnumKeys {
 #define CSW_CHOUT_BASE  (CSW_PPM_BASE+NUM_PPM)
 
 #if defined(FRSKY_HUB)
-#define NUM_TELEMETRY      9
+#define NUM_TELEMETRY      TELEM_CSW_MAX
 #elif defined(WS_HOW_HIGH)
 #define NUM_TELEMETRY      3
 #elif defined(FRSKY)