From 9add1b4326eaafde113b90e15daf35b91f0714d5 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 16 Mar 2012 19:40:00 +0000
Subject: [PATCH] Min Cell and Max Cell removed

---
 src/frsky.cpp         | 1 -
 src/frsky.h           | 1 -
 src/myeeprom.h        | 2 --
 src/open9x.cpp        | 2 --
 src/translations/en.h | 2 +-
 src/translations/fr.h | 2 +-
 src/translations/se.h | 2 +-
 7 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/frsky.cpp b/src/frsky.cpp
index 926fb7a44..fb753d897 100644
--- a/src/frsky.cpp
+++ b/src/frsky.cpp
@@ -896,7 +896,6 @@ void menuProcFrsky(uint8_t event)
             }
           }
           if (field) {
-            // TODO change name STR_VTELEMCHNS
             lcd_putsiAtt(j*65, 1+FH+2*FH*i, STR_VTELEMCHNS, field, 0);
             int16_t value = getValue(CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS+field-1);
             putsTelemetryChannel(j ? 128 : 63, i==3 ? 1+7*FH : 1+2*FH+2*FH*i, field-1, value, i==3 ? NO_UNIT : DBLSIZE|NO_UNIT);
diff --git a/src/frsky.h b/src/frsky.h
index 1978e842d..24a9cd613 100644
--- a/src/frsky.h
+++ b/src/frsky.h
@@ -116,7 +116,6 @@ PACK(struct FrskyHubData {
   uint16_t gpsDistance;
   int16_t  gpsAltitudeOffset;
   uint8_t  minCellMinVolts;
-  uint8_t  minCellMaxVolts;
   /* order is important starting from here */
   int16_t  maxAltitude;
   uint16_t maxRpm;
diff --git a/src/myeeprom.h b/src/myeeprom.h
index b907bd47b..f7e823439 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -290,8 +290,6 @@ enum TelemetrySource {
   TELEM_HDG,
   TELEM_MIN_A1,
   TELEM_MIN_A2,
-  TELEM_MIN_CELL,
-  TELEM_MAX_CELL,
   TELEM_MAX_ALT,
   TELEM_MAX_RPM,
   TELEM_MAX_T1,
diff --git a/src/open9x.cpp b/src/open9x.cpp
index b0c3728bb..fe7244e2c 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -329,8 +329,6 @@ int16_t getValue(uint8_t i)
   else if(i<CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS+TELEM_HDG) return frskyHubData.gpsCourse_bp;
   else if(i<CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS+TELEM_MIN_A1) return frskyTelemetry[0].min;
   else if(i<CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS+TELEM_MIN_A2) return frskyTelemetry[1].min;
-  else if(i<CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS+TELEM_MIN_CELL) return frskyHubData.minCellMinVolts;
-  else if(i<CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS+TELEM_MAX_CELL) return frskyHubData.minCellMaxVolts;
   else if(i<CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS+TELEM_MAX_DIST) return *(((int16_t*)(&frskyHubData.maxGpsDistance))-i-(CSW_CHOUT_BASE+NUM_CHNOUT+MAX_TIMERS+TELEM_MAX_DIST-1));
 #endif
 #endif
diff --git a/src/translations/en.h b/src/translations/en.h
index 407d04729..6b501396d 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -97,7 +97,7 @@
 #define TR_FUNCSOUNDS    "Warn1 ""Warn2 ""Cheep ""Ring  ""SciFi ""Robot ""Chirp ""Tada  ""Crickt""Siren ""AlmClk""Ratata""Tick  ""Haptc1""Haptc2""Haptc3"
 
 #define LEN_VTELEMCHNS   "\004"
-#define TR_VTELEMCHNS    "---\0""A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""t1\0 ""t2\0 ""Spd\0""Dist""Cell""Tx\0 ""Rx\0 ""AccX""AccY""AccZ""Hdg\0""a1\0 ""a2\0 ""cell""CELL""ALT\0""RPM\0""T1\0 ""T2\0 ""SPD\0""DIST""Tmr1""Tmr2""ACC\0""Time"
+#define TR_VTELEMCHNS    "---\0""A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""t1\0 ""t2\0 ""Spd\0""Dist""Cell""Tx\0 ""Rx\0 ""AccX""AccY""AccZ""Hdg\0""a1\0 ""a2\0 ""ALT\0""RPM\0""T1\0 ""T2\0 ""SPD\0""DIST""Tmr1""Tmr2""ACC\0""Time"
 
 #define LEN_VTELEMUNIT   "\003"
 #define TR_VTELEMUNIT    "v\0 ""A\0 ""-\0 ""kts""kmh""M/h""m\0 ""@\0 ""%\0"
diff --git a/src/translations/fr.h b/src/translations/fr.h
index 5fa4c89e6..f8a14b97a 100644
--- a/src/translations/fr.h
+++ b/src/translations/fr.h
@@ -97,7 +97,7 @@
 #define TR_FUNCSOUNDS    "Warn1 ""Warn2 ""Cheep ""Ring  ""SciFi ""Robot ""Chirp ""Tada  ""Crickt""Siren ""AlmClk""Ratata""Tick  ""Haptc1""Haptc2""Haptc3"
 
 #define LEN_VTELEMCHNS   "\004"
-#define TR_VTELEMCHNS    "---\0""A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""t1\0 ""t2\0 ""Spd\0""Dist""Cell""Tx\0 ""Rx\0 ""AccX""AccY""AccZ""Hdg\0""a1\0 ""a2\0 ""cell""CELL""ALT\0""RPM\0""T1\0 ""T2\0 ""SPD\0""DIST""Tmr1""Tmr2""ACC\0""Time"
+#define TR_VTELEMCHNS    "---\0""A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""t1\0 ""t2\0 ""Spd\0""Dist""Cell""Tx\0 ""Rx\0 ""AccX""AccY""AccZ""Hdg\0""a1\0 ""a2\0 ""ALT\0""RPM\0""T1\0 ""T2\0 ""SPD\0""DIST""Tmr1""Tmr2""ACC\0""Time"
 
 #define LEN_VTELEMUNIT   "\003"
 #define TR_VTELEMUNIT    "v\0 ""A\0 ""-\0 ""kts""kmh""M/h""m\0 ""@\0 ""%\0"
diff --git a/src/translations/se.h b/src/translations/se.h
index 46e5f3bcc..751ff590c 100644
--- a/src/translations/se.h
+++ b/src/translations/se.h
@@ -97,7 +97,7 @@
 #define TR_FUNCSOUNDS    "Varn1 ""Varn2 ""F\200r   ""Ring  ""SciFi ""Robot ""Pip   ""Tada  ""Syrsa ""Siren ""Alarm ""Ratata""Tick  ""Vibr1 ""Vibr2 ""Vibr3 "
 
 #define LEN_VTELEMCHNS   "\004"
-#define TR_VTELEMCHNS    "---\0""A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""t1\0 ""t2\0 ""Spd\0""Dist""Cell""Tx\0 ""Rx\0 ""AccX""AccY""AccZ""Hdg\0""a1\0 ""a2\0 ""cell""CELL""ALT\0""RPM\0""T1\0 ""T2\0 ""SPD\0""DIST""Tmr1""Tmr2""ACC\0""Time"
+#define TR_VTELEMCHNS    "---\0""A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""t1\0 ""t2\0 ""Spd\0""Dist""Cell""Tx\0 ""Rx\0 ""AccX""AccY""AccZ""Hdg\0""a1\0 ""a2\0 ""ALT\0""RPM\0""T1\0 ""T2\0 ""SPD\0""DIST""Tmr1""Tmr2""ACC\0""Time"
 
 #define LEN_VTELEMUNIT   "\003"
 #define TR_VTELEMUNIT    "v\0 ""A\0 ""-\0 ""kts""kmh""M/h""m\0 ""@\0 ""%\0"