Merge remote-tracking branch 'origin/next' into

bsongis/Issue524_SPORT_GPS

Conflicts:
	radio/src/telemetry/frsky_sport.cpp
	radio/src/translations/de.h.txt

radio/src/lcd.cpp

@@ -1244,6 +1244,7 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
     case TELEM_TX_VOLTAGE-1:
     case TELEM_VFAS-1:
     case TELEM_CELLS_SUM-1:
+    case TELEM_MIN_CELLS_SUM-1:
     case TELEM_MIN_VFAS-1:
       putsTelemetryValue(x, y, val, UNIT_VOLTS, att|PREC1);
       break;
@@ -1270,6 +1271,9 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
       putsTelemetryValue(x, y, val, UNIT_RAW, att|PREC2);
       break;
 
+#if defined(CPUARM)
+    case TELEM_SWR-1:
+#endif
     case TELEM_RSSI_TX-1:
     case TELEM_RSSI_RX-1:
       putsTelemetryValue(x, y, val, UNIT_RAW, att);