Fixes #1182 - RxBatt removed

radio/src/telemetry/frsky.cpp

@@ -134,10 +134,6 @@ lcdint_t applyChannelRatio(uint8_t channel, lcdint_t val)
 }
 
 #if defined(CPUARM)
-inline bool rxBattAlarmRaised(uint8_t alarm)
-{
-  return g_model.rxBattAlarms[alarm] > 0 && frskyData.analog[TELEM_ANA_RXBATT].value < g_model.rxBattAlarms[alarm];
-}
 inline bool alarmRaised(uint8_t channel, uint8_t idx)
 {
   return g_model.frsky.channels[channel].ratio > 0 && g_model.frsky.channels[channel].alarms_value[idx] > 0 && frskyData.analog[channel].value < g_model.frsky.channels[channel].alarms_value[idx];
@@ -269,7 +265,6 @@ NOINLINE void processSerialData(uint8_t data)
 enum AlarmsCheckSteps {
   ALARM_SWR_STEP,
   ALARM_RSSI_STEP,
-  ALARM_RXBATT_STEP,
   ALARM_A1_STEP,
   ALARM_A2_STEP,
   ALARM_A3_STEP,
@@ -359,16 +354,6 @@ void telemetryWakeup()
           alarmsCheckTime = get_tmr10ms() + 300; /* next check in 3 seconds */
         }
       }
-      else if (alarmsCheckStep == ALARM_RXBATT_STEP) {
-        if (rxBattAlarmRaised(1)) {
-          AUDIO_RXBATT_RED();
-          alarmsCheckTime = get_tmr10ms() + 300; /* next check in 3 seconds */
-        }
-        else if (rxBattAlarmRaised(0)) {
-          AUDIO_RXBATT_ORANGE();
-          alarmsCheckTime = get_tmr10ms() + 300; /* next check in 3 seconds */
-        }
-      }
       else if (alarmsCheckStep == ALARM_A1_STEP) {
         if (alarmRaised(TELEM_ANA_A1, 1)) {
           AUDIO_A1_RED();
@@ -448,10 +433,7 @@ void telemetryInterrupt10ms()
       // power calculation
       uint8_t channel = g_model.frsky.voltsSource;
 #if defined(CPUARM)
-      if (channel == FRSKY_VOLTS_SOURCE_RXBATT) {
-        voltage = ((frskyData.analog[TELEM_ANA_RXBATT].value * 132) + 127) / 255;
-      }
-      else if (channel <= FRSKY_VOLTS_SOURCE_A4) {
+      if (channel <= FRSKY_VOLTS_SOURCE_A4) {
         voltage = applyChannelRatio(channel, frskyData.analog[channel].value) / 10;
       }
 #else