From b4dcde3aa870045511137af3c97eaf14da9f8c43 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Tue, 28 Apr 2015 20:40:06 +0200
Subject: [PATCH] Constant renamed

---
 radio/src/eeprom_rlc.cpp                      |  2 +-
 radio/src/gui/9X/menu_model_telemetry.cpp     | 18 +++++++-------
 .../src/gui/Taranis/menu_model_telemetry.cpp  | 24 +++++++++----------
 radio/src/gui/Taranis/navigation.cpp          |  4 ++--
 radio/src/logs.cpp                            |  4 ++--
 radio/src/lua_api.cpp                         |  2 +-
 radio/src/myeeprom.h                          | 16 ++++++-------
 radio/src/opentx.cpp                          |  2 +-
 radio/src/telemetry/frsky.cpp                 |  8 +++----
 radio/src/telemetry/telemetry.cpp             | 10 ++++----
 radio/src/telemetry/telemetry.h               |  2 +-
 11 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/radio/src/eeprom_rlc.cpp b/radio/src/eeprom_rlc.cpp
index 1c85c2dc5..7609c1d93 100644
--- a/radio/src/eeprom_rlc.cpp
+++ b/radio/src/eeprom_rlc.cpp
@@ -986,7 +986,7 @@ void eeLoadModel(uint8_t id)
     restoreTimers();
 
 #if defined(CPUARM)
-    for (int i=0; i<TELEM_VALUES_MAX; i++) {
+    for (int i=0; i<MAX_SENSORS; i++) {
       TelemetrySensor & sensor = g_model.telemetrySensors[i];
       if (sensor.type == TELEM_TYPE_CALCULATED && sensor.persistent) {
         telemetryItems[i].value = sensor.persistentValue;
diff --git a/radio/src/gui/9X/menu_model_telemetry.cpp b/radio/src/gui/9X/menu_model_telemetry.cpp
index 4fb45ae15..6546e7e6a 100644
--- a/radio/src/gui/9X/menu_model_telemetry.cpp
+++ b/radio/src/gui/9X/menu_model_telemetry.cpp
@@ -357,7 +357,7 @@ void menuModelSensor(uint8_t event)
             lcd_putsLeft(y, STR_CELLSENSOR);
             putsMixerSource(SENSOR_2ND_COLUMN, y, sensor->cell.source ? MIXSRC_FIRST_TELEM+3*(sensor->cell.source-1) : 0, attr);
             if (attr) {
-              sensor->cell.source = checkIncDec(event, sensor->cell.source, 0, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isCellsSensor);
+              sensor->cell.source = checkIncDec(event, sensor->cell.source, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isCellsSensor);
             }
             break;
           }
@@ -365,7 +365,7 @@ void menuModelSensor(uint8_t event)
             lcd_putsLeft(y, STR_GPSSENSOR);
             putsMixerSource(SENSOR_2ND_COLUMN, y, sensor->dist.gps ? MIXSRC_FIRST_TELEM+3*(sensor->dist.gps-1) : 0, attr);
             if (attr) {
-              sensor->dist.gps = checkIncDec(event, sensor->dist.gps, 0, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isGPSSensor);
+              sensor->dist.gps = checkIncDec(event, sensor->dist.gps, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isGPSSensor);
             }
             break;
           }
@@ -373,7 +373,7 @@ void menuModelSensor(uint8_t event)
             lcd_putsLeft(y, STR_CURRENTSENSOR);
             putsMixerSource(SENSOR_2ND_COLUMN, y, sensor->consumption.source ? MIXSRC_FIRST_TELEM+3*(sensor->consumption.source-1) : 0, attr);
             if (attr) {
-              sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isCurrentSensor);
+              sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isCurrentSensor);
             }
             break;
           }
@@ -407,7 +407,7 @@ void menuModelSensor(uint8_t event)
             lcd_putsLeft(y, STR_ALTSENSOR);
             putsMixerSource(SENSOR_2ND_COLUMN, y, sensor->dist.alt ? MIXSRC_FIRST_TELEM+3*(sensor->dist.alt-1) : 0, attr);
             if (attr) {
-              sensor->dist.alt = checkIncDec(event, sensor->dist.alt, 0, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isAltSensor);
+              sensor->dist.alt = checkIncDec(event, sensor->dist.alt, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isAltSensor);
             }
             break;
           }
@@ -429,7 +429,7 @@ void menuModelSensor(uint8_t event)
         putsStrIdx(0, y, NO_INDENT(STR_SOURCE), k-SENSOR_FIELD_PARAM1+1);
         int8_t & source = sensor->calc.sources[k-SENSOR_FIELD_PARAM1];
         if (attr) {
-          source = checkIncDec(event, source, -TELEM_VALUES_MAX, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable);
+          source = checkIncDec(event, source, -MAX_SENSORS, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable);
         }
         if (source < 0) {
           lcd_putcAtt(SENSOR_2ND_COLUMN, y, '-', attr);
@@ -465,14 +465,14 @@ void onSensorMenu(const char *result)
 {
   uint8_t index = m_posVert - 1 - ITEM_TELEMETRY_SENSOR1;
 
-  if (index < TELEM_VALUES_MAX) {
+  if (index < MAX_SENSORS) {
     if (result == STR_EDIT) {
       pushMenu(menuModelSensor);
     }
     else if (result == STR_DELETE) {
       delTelemetryIndex(index);
       index += 1;
-      if (index<TELEM_VALUES_MAX && isTelemetryFieldAvailable(index))
+      if (index<MAX_SENSORS && isTelemetryFieldAvailable(index))
         m_posVert += 1;
       else
         m_posVert = 1+ITEM_TELEMETRY_NEWSENSOR;
@@ -517,7 +517,7 @@ void menuModelTelemetry(uint8_t event)
 #endif
 
 #if defined(CPUARM)
-    if (k>=ITEM_TELEMETRY_SENSOR1 && k<ITEM_TELEMETRY_SENSOR1+TELEM_VALUES_MAX) {
+    if (k>=ITEM_TELEMETRY_SENSOR1 && k<ITEM_TELEMETRY_SENSOR1+MAX_SENSORS) {
       int index = k-ITEM_TELEMETRY_SENSOR1;
       lcd_outdezAtt(INDENT_WIDTH, y, index+1, LEFT|attr);
       lcd_putcAtt(lcdLastPos, y, ':', attr);
@@ -733,7 +733,7 @@ void menuModelTelemetry(uint8_t event)
 #if defined(CPUARM)
         putsMixerSource(TELEM_COL2, y, g_model.frsky.varioSource ? MIXSRC_FIRST_TELEM+3*(g_model.frsky.varioSource-1) : 0, attr);
         if (attr) {
-          g_model.frsky.varioSource = checkIncDec(event, g_model.frsky.varioSource, 0, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable);
+          g_model.frsky.varioSource = checkIncDec(event, g_model.frsky.varioSource, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable);
         }
 #else
         lcd_putsiAtt(TELEM_COL2, y, STR_VARIOSRC, g_model.frsky.varioSource, attr);
diff --git a/radio/src/gui/Taranis/menu_model_telemetry.cpp b/radio/src/gui/Taranis/menu_model_telemetry.cpp
index b44b6f51a..e5bf80d4a 100644
--- a/radio/src/gui/Taranis/menu_model_telemetry.cpp
+++ b/radio/src/gui/Taranis/menu_model_telemetry.cpp
@@ -317,7 +317,7 @@ void menuModelSensor(uint8_t event)
             lcd_putsLeft(y, STR_CELLSENSOR);
             putsMixerSource(SENSOR_2ND_COLUMN, y, sensor->cell.source ? MIXSRC_FIRST_TELEM+3*(sensor->cell.source-1) : 0, attr);
             if (attr) {
-              sensor->cell.source = checkIncDec(event, sensor->cell.source, 0, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isCellsSensor);
+              sensor->cell.source = checkIncDec(event, sensor->cell.source, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isCellsSensor);
             }
             break;
           }
@@ -325,7 +325,7 @@ void menuModelSensor(uint8_t event)
             lcd_putsLeft(y, STR_GPSSENSOR);
             putsMixerSource(SENSOR_2ND_COLUMN, y, sensor->dist.gps ? MIXSRC_FIRST_TELEM+3*(sensor->dist.gps-1) : 0, attr);
             if (attr) {
-              sensor->dist.gps = checkIncDec(event, sensor->dist.gps, 0, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isGPSSensor);
+              sensor->dist.gps = checkIncDec(event, sensor->dist.gps, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isGPSSensor);
             }
             break;
           }
@@ -333,7 +333,7 @@ void menuModelSensor(uint8_t event)
             lcd_putsLeft(y, STR_CURRENTSENSOR);
             putsMixerSource(SENSOR_2ND_COLUMN, y, sensor->consumption.source ? MIXSRC_FIRST_TELEM+3*(sensor->consumption.source-1) : 0, attr);
             if (attr) {
-              sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isCurrentSensor);
+              sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isCurrentSensor);
             }
             break;
           }
@@ -341,7 +341,7 @@ void menuModelSensor(uint8_t event)
             lcd_putsLeft(y, NO_INDENT(STR_SOURCE));
             putsMixerSource(SENSOR_2ND_COLUMN, y, sensor->consumption.source ? MIXSRC_FIRST_TELEM+3*(sensor->consumption.source-1) : 0, attr);
             if (attr) {
-              sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isTelemetryFieldComparisonAvailable);
+              sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isTelemetryFieldComparisonAvailable);
             }
             break;
           }
@@ -375,7 +375,7 @@ void menuModelSensor(uint8_t event)
             lcd_putsLeft(y, STR_ALTSENSOR);
             putsMixerSource(SENSOR_2ND_COLUMN, y, sensor->dist.alt ? MIXSRC_FIRST_TELEM+3*(sensor->dist.alt-1) : 0, attr);
             if (attr) {
-              sensor->dist.alt = checkIncDec(event, sensor->dist.alt, 0, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isAltSensor);
+              sensor->dist.alt = checkIncDec(event, sensor->dist.alt, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isAltSensor);
             }
             break;
           }
@@ -403,7 +403,7 @@ void menuModelSensor(uint8_t event)
         putsStrIdx(0, y, NO_INDENT(STR_SOURCE), k-SENSOR_FIELD_PARAM1+1);
         int8_t & source = sensor->calc.sources[k-SENSOR_FIELD_PARAM1];
         if (attr) {
-          source = checkIncDec(event, source, -TELEM_VALUES_MAX, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable);
+          source = checkIncDec(event, source, -MAX_SENSORS, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable);
         }
         if (source < 0) {
           lcd_putcAtt(SENSOR_2ND_COLUMN, y, '-', attr);
@@ -439,14 +439,14 @@ void onSensorMenu(const char *result)
 {
   int index = m_posVert - ITEM_TELEMETRY_SENSOR1;
 
-  if (index < TELEM_VALUES_MAX) {
+  if (index < MAX_SENSORS) {
     if (result == STR_EDIT) {
       pushMenu(menuModelSensor);
     }
     else if (result == STR_DELETE) {
       delTelemetryIndex(index);
       index += 1;
-      if (index<TELEM_VALUES_MAX && isTelemetryFieldAvailable(index))
+      if (index<MAX_SENSORS && isTelemetryFieldAvailable(index))
         m_posVert += 1;
       else
         m_posVert = ITEM_TELEMETRY_NEWSENSOR;
@@ -498,7 +498,7 @@ void menuModelTelemetry(uint8_t event)
     LcdFlags blink = ((s_editMode>0) ? BLINK|INVERS : INVERS);
     LcdFlags attr = (sub == k ? blink : 0);
 
-    if (k>=ITEM_TELEMETRY_SENSOR1 && k<ITEM_TELEMETRY_SENSOR1+TELEM_VALUES_MAX) {
+    if (k>=ITEM_TELEMETRY_SENSOR1 && k<ITEM_TELEMETRY_SENSOR1+MAX_SENSORS) {
       int index = k-ITEM_TELEMETRY_SENSOR1;
       lcd_outdezAtt(INDENT_WIDTH, y, index+1, LEFT|attr);
       lcd_putcAtt(lcdLastPos, y, ':', attr);
@@ -587,7 +587,7 @@ void menuModelTelemetry(uint8_t event)
         lcd_putsLeft(y, STR_SOURCE);
         putsMixerSource(TELEM_COL2, y, g_model.frsky.varioSource ? MIXSRC_FIRST_TELEM+3*(g_model.frsky.varioSource-1) : 0, attr);
         if (attr) {
-          g_model.frsky.varioSource = checkIncDec(event, g_model.frsky.varioSource, 0, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable);
+          g_model.frsky.varioSource = checkIncDec(event, g_model.frsky.varioSource, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable);
         }
         break;
 
@@ -624,7 +624,7 @@ void menuModelTelemetry(uint8_t event)
         lcd_putsLeft(y, STR_VOLTAGE);
         putsMixerSource(TELEM_COL2, y, g_model.frsky.voltsSource ? MIXSRC_FIRST_TELEM+3*(g_model.frsky.voltsSource-1) : 0, attr);
         if (attr) {
-          g_model.frsky.voltsSource = checkIncDec(event, g_model.frsky.voltsSource, 0, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isVoltsSensor);
+          g_model.frsky.voltsSource = checkIncDec(event, g_model.frsky.voltsSource, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isVoltsSensor);
         }
         break;
 
@@ -632,7 +632,7 @@ void menuModelTelemetry(uint8_t event)
         lcd_putsLeft(y, STR_ALTITUDE);
         putsMixerSource(TELEM_COL2, y, g_model.frsky.altitudeSource ? MIXSRC_FIRST_TELEM+3*(g_model.frsky.altitudeSource-1) : 0, attr);
         if (attr) {
-          g_model.frsky.altitudeSource = checkIncDec(event, g_model.frsky.altitudeSource, 0, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isAltSensor);
+          g_model.frsky.altitudeSource = checkIncDec(event, g_model.frsky.altitudeSource, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isAltSensor);
         }
         break;
 
diff --git a/radio/src/gui/Taranis/navigation.cpp b/radio/src/gui/Taranis/navigation.cpp
index 9441fd696..725a92cc8 100755
--- a/radio/src/gui/Taranis/navigation.cpp
+++ b/radio/src/gui/Taranis/navigation.cpp
@@ -99,7 +99,7 @@ void onLongEnterPress(const char *result)
     s_source = MIXSRC_FIRST_GVAR;
   
   else if (result == STR_MENU_TELEMETRY) {
-    for (int i = 0; i < TELEM_VALUES_MAX; i++) {
+    for (int i = 0; i < MAX_SENSORS; i++) {
       TelemetrySensor * sensor = & g_model.telemetrySensors[i];
       if (sensor->isAvailable()) {
         s_source = MIXSRC_FIRST_TELEM + 3*i;
@@ -277,7 +277,7 @@ int checkIncDec(unsigned int event, int val, int i_min, int i_max, unsigned int
       
       if (i_min <= MIXSRC_FIRST_TELEM && i_max >= MIXSRC_FIRST_TELEM) {
         bool available = false;
-        for (int i = 0; i < TELEM_VALUES_MAX; i++) {
+        for (int i = 0; i < MAX_SENSORS; i++) {
           TelemetrySensor * sensor = & g_model.telemetrySensors[i];
           if (sensor->isAvailable()) {
             available = true;
diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp
index d2fe7027b..8ea9e42d1 100644
--- a/radio/src/logs.cpp
+++ b/radio/src/logs.cpp
@@ -172,7 +172,7 @@ void writeHeader()
 
 #if defined(CPUARM)
   char label[TELEM_LABEL_LEN+7];
-  for (int i=0; i<TELEM_VALUES_MAX; i++) {
+  for (int i=0; i<MAX_SENSORS; i++) {
     TelemetrySensor & sensor = g_model.telemetrySensors[i];
     if (sensor.logs) {
       memset(label, 0, sizeof(label));
@@ -289,7 +289,7 @@ void writeLogs()
 #endif
 
 #if defined(CPUARM)
-      for (int i=0; i<TELEM_VALUES_MAX; i++) {
+      for (int i=0; i<MAX_SENSORS; i++) {
         TelemetrySensor & sensor = g_model.telemetrySensors[i];
         TelemetryItem & telemetryItem = telemetryItems[i];
         if (sensor.logs) {
diff --git a/radio/src/lua_api.cpp b/radio/src/lua_api.cpp
index bc7f541f1..9c2ea06ad 100644
--- a/radio/src/lua_api.cpp
+++ b/radio/src/lua_api.cpp
@@ -213,7 +213,7 @@ bool luaFindFieldByName(const char * name, LuaField & field, unsigned int flags=
 
   // search in telemetry
   field.desc[0] = '\0';
-  for (int i=0; i<TELEM_VALUES_MAX; i++) {
+  for (int i=0; i<MAX_SENSORS; i++) {
     if (isTelemetryFieldAvailable(i)) {
       char sensorName[TELEM_LABEL_LEN+1];
       int len = zchar2str(sensorName, g_model.telemetrySensors[i].label, TELEM_LABEL_LEN);
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index 11244f9df..6d922911e 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -130,7 +130,7 @@
     #define NUM_POTS           5
     #define NUM_XPOTS          3
   #endif
-  #define TELEM_VALUES_MAX     32
+  #define MAX_SENSORS          32
 #elif defined(PCBSKY9X)
   #define MAX_MODELS           60
   #define NUM_CHNOUT           32 // number of real output channels CH1-CH32
@@ -142,7 +142,7 @@
   #define NUM_TRAINER          16
   #define NUM_POTS             3
   #define NUM_XPOTS            0
-  #define TELEM_VALUES_MAX     32
+  #define MAX_SENSORS          32
 #elif defined(CPUM2560) || defined(CPUM2561)
   #define MAX_MODELS           30
   #define NUM_CHNOUT           16 // number of real output channels CH1-CH16
@@ -154,7 +154,7 @@
   #define NUM_TRAINER          8
   #define NUM_POTS             3
   #define NUM_XPOTS            0
-  #define TELEM_VALUES_MAX     0
+  #define MAX_SENSORS          0
 #elif defined(CPUM128)
   #define MAX_MODELS           30
   #define NUM_CHNOUT           16 // number of real output channels CH1-CH16
@@ -166,7 +166,7 @@
   #define NUM_TRAINER          8
   #define NUM_POTS             3
   #define NUM_XPOTS            0
-  #define TELEM_VALUES_MAX     0
+  #define MAX_SENSORS          0
 #else
   #define MAX_MODELS           16
   #define NUM_CHNOUT           16 // number of real output channels CH1-CH16
@@ -178,7 +178,7 @@
   #define NUM_TRAINER          8
   #define NUM_POTS             3
   #define NUM_XPOTS            0
-  #define TELEM_VALUES_MAX     0
+  #define MAX_SENSORS          0
 #endif
 
 #if defined(CPUARM)
@@ -592,7 +592,7 @@ enum ResetFunctionParam {
 #endif
 #if defined(CPUARM)
   FUNC_RESET_PARAM_FIRST_TELEM,
-  FUNC_RESET_PARAM_LAST_TELEM = FUNC_RESET_PARAM_FIRST_TELEM + TELEM_VALUES_MAX,
+  FUNC_RESET_PARAM_LAST_TELEM = FUNC_RESET_PARAM_FIRST_TELEM + MAX_SENSORS,
 #endif
   FUNC_RESET_PARAMS_COUNT,
   FUNC_RESET_PARAM_LAST = FUNC_RESET_PARAMS_COUNT-1,
@@ -1913,7 +1913,7 @@ enum MixSources {
 
   MIXSRC_FIRST_TELEM,
 #if defined(CPUARM)
-  MIXSRC_LAST_TELEM = MIXSRC_FIRST_TELEM+3*TELEM_VALUES_MAX-1
+  MIXSRC_LAST_TELEM = MIXSRC_FIRST_TELEM+3*MAX_SENSORS-1
 #else
   MIXSRC_LAST_TELEM = MIXSRC_FIRST_TELEM+NUM_TELEMETRY-1
 #endif
@@ -2129,7 +2129,7 @@ PACK(typedef struct {
 
   MODELDATA_EXTRA
 
-  ARM_FIELD(TelemetrySensor telemetrySensors[TELEM_VALUES_MAX])
+  ARM_FIELD(TelemetrySensor telemetrySensors[MAX_SENSORS])
   
   TARANIS_REV9E_FIELD(uint8_t topLcdTimer)
 }) ModelData;
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 1d5787fc5..025509c9b 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -1742,7 +1742,7 @@ void opentxClose()
   saveTimers();
 
 #if defined(CPUARM)
-  for (int i=0; i<TELEM_VALUES_MAX; i++) {
+  for (int i=0; i<MAX_SENSORS; i++) {
     TelemetrySensor & sensor = g_model.telemetrySensors[i];
     if (sensor.type == TELEM_TYPE_CALCULATED) {
       if (sensor.persistent && sensor.persistentValue != telemetryItems[i].value) {
diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp
index 067fc2408..b0c929a82 100644
--- a/radio/src/telemetry/frsky.cpp
+++ b/radio/src/telemetry/frsky.cpp
@@ -324,7 +324,7 @@ void telemetryWakeup()
 #endif
 
 #if defined(CPUARM)
-  for (int i=0; i<TELEM_VALUES_MAX; i++) {
+  for (int i=0; i<MAX_SENSORS; i++) {
     const TelemetrySensor & sensor = g_model.telemetrySensors[i];
     if (sensor.type == TELEM_TYPE_CALCULATED) {
       telemetryItems[i].eval(sensor);
@@ -352,7 +352,7 @@ void telemetryWakeup()
     SCHEDULE_NEXT_ALARMS_CHECK(1/*second*/);
 
     uint8_t now = TelemetryItem::now();
-    for (int i=0; i<TELEM_VALUES_MAX; i++) {
+    for (int i=0; i<MAX_SENSORS; i++) {
       if (isTelemetryFieldAvailable(i)) {
         uint8_t lastReceived = telemetryItems[i].lastReceived;
         if (lastReceived < TELEMETRY_VALUE_TIMER_CYCLE && uint8_t(now - lastReceived) > TELEMETRY_VALUE_OLD_THRESHOLD) {
@@ -416,7 +416,7 @@ void telemetryInterrupt10ms()
   if (TELEMETRY_STREAMING()) {
     if (!TELEMETRY_OPENXSENSOR()) {
 #if defined(CPUARM)
-      for (int i=0; i<TELEM_VALUES_MAX; i++) {
+      for (int i=0; i<MAX_SENSORS; i++) {
         const TelemetrySensor & sensor = g_model.telemetrySensors[i];
         if (sensor.type == TELEM_TYPE_CALCULATED) {
           telemetryItems[i].per10ms(sensor);
@@ -489,7 +489,7 @@ void telemetryReset()
   memclear(&frskyData, sizeof(frskyData));
 
 #if defined(CPUARM)
-  for (int index=0; index<TELEM_VALUES_MAX; index++) {
+  for (int index=0; index<MAX_SENSORS; index++) {
     telemetryItems[index].clear();
   }
 #endif
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index fb309fb2a..066951b31 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -1,6 +1,6 @@
 #include "../opentx.h"
 
-TelemetryItem telemetryItems[TELEM_VALUES_MAX];
+TelemetryItem telemetryItems[MAX_SENSORS];
 
 void TelemetryItem::gpsReceived()
 {
@@ -218,7 +218,7 @@ void TelemetryItem::setValue(const TelemetrySensor & sensor, int32_t val, uint32
     }
   }
 
-  for (int i=0; i<TELEM_VALUES_MAX; i++) {
+  for (int i=0; i<MAX_SENSORS; i++) {
     TelemetrySensor & it = g_model.telemetrySensors[i];
     if (it.type == TELEM_TYPE_CALCULATED && it.formula == TELEM_FORMULA_TOTALIZE && &g_model.telemetrySensors[it.consumption.source-1] == &sensor) {
       TelemetryItem & item = telemetryItems[i];
@@ -453,7 +453,7 @@ void delTelemetryIndex(uint8_t index)
 
 int availableTelemetryIndex()
 {
-  for (int index=0; index<TELEM_VALUES_MAX; index++) {
+  for (int index=0; index<MAX_SENSORS; index++) {
     TelemetrySensor & telemetrySensor = g_model.telemetrySensors[index];
     if (!telemetrySensor.isAvailable()) {
       return index;
@@ -464,7 +464,7 @@ int availableTelemetryIndex()
 
 int lastUsedTelemetryIndex()
 {
-  for (int index=TELEM_VALUES_MAX-1; index>=0; index--) {
+  for (int index=MAX_SENSORS-1; index>=0; index--) {
     TelemetrySensor & telemetrySensor = g_model.telemetrySensors[index];
     if (telemetrySensor.isAvailable()) {
       return index;
@@ -483,7 +483,7 @@ void setTelemetryValue(TelemetryProtocol protocol, uint16_t id, uint8_t instance
 {
   bool available = false;
   
-  for (int index=0; index<TELEM_VALUES_MAX; index++) {
+  for (int index=0; index<MAX_SENSORS; index++) {
     TelemetrySensor & telemetrySensor = g_model.telemetrySensors[index];
     if (telemetrySensor.id == id && telemetrySensor.instance == instance) {
       telemetryItems[index].setValue(g_model.telemetrySensors[index], value, unit, prec);
diff --git a/radio/src/telemetry/telemetry.h b/radio/src/telemetry/telemetry.h
index 9ad0d23a1..4aabff69c 100644
--- a/radio/src/telemetry/telemetry.h
+++ b/radio/src/telemetry/telemetry.h
@@ -164,7 +164,7 @@ class TelemetryItem
     void gpsReceived();
 };
 
-extern TelemetryItem telemetryItems[TELEM_VALUES_MAX];
+extern TelemetryItem telemetryItems[MAX_SENSORS];
 
 inline bool isTelemetryFieldAvailable(int index)
 {