Merge branch 'next' into kilrah/FAS_Offset_compensation

Conflicts:
	radio/src/translations/es.h
	radio/src/translations/es.h.txt
	radio/src/translations/fr.h
	radio/src/translations/fr.h.txt
This commit is contained in:
Andre Bernet
2013-12-14 13:03:25 +01:00
542 changed files with 230702 additions and 19 deletions
+1 -1
View File
@@ -568,7 +568,7 @@ void telemetryWakeup()
if (alarmsCheckStep == 0) {
if (frskyData.rssi[1].value > 0x33) {
AUDIO_SWR_RED();
s_global_warning = PSTR(CENTER "Antenna problem!");
s_global_warning = STR_ANTENNAPROBLEM;
alarmsCheckTime = get_tmr10ms() + 300; /* next check in 3seconds */
}
}