piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

SD card warning modified (fits now in 9X LCD)

Browse Source 
Missing #ifdef for TELEMETRY flavours
This commit is contained in:
Bertrand Songis
2016-08-22 19:03:42 +02:00
parent 81c16212e0
commit c16ad94e3a
14 changed files with 23 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
+7 -7
View File
@@ -1097,12 +1097,12 @@ void checkSDVersion()
f_read(&versionFile, &version, sizeof(REQUIRED_SDCARD_VERSION), &read);
if (strncmp(version, REQUIRED_SDCARD_VERSION, sizeof(REQUIRED_SDCARD_VERSION)-1) != 0) {
TRACE("sdCheckVersion FAILED: version are not the same");
ALERT(STR_SDCARDVERSIONWARN, STR_WRONG_SDCARDVERSION, AU_ERROR);
ALERT(STR_SDCARD_ERROR, STR_WRONG_SDCARDVERSION, AU_ERROR);
}
}
else {
TRACE("sdCheckVersion FAILED: opentx.sdcard.version cannot be opened");
ALERT(STR_SDCARDVERSIONWARN, STR_WRONG_SDCARDVERSION, AU_ERROR);
ALERT(STR_SDCARD_ERROR, STR_WRONG_SDCARDVERSION, AU_ERROR);
}
f_close(&versionFile);
}
@@ -2677,23 +2677,23 @@ int main()
DSM2_Init();
#endif
#ifdef JETI
#if defined(TELEMETRY_JETI)
JETI_Init();
#endif
#ifdef ARDUPILOT
#if defined(TELEMETRY_ARDUPILOT)
ARDUPILOT_Init();
#endif
#ifdef NMEA
#if defined(TELEMETRY_NMEA)
NMEA_Init();
#endif
#ifdef MAVLINK
#if defined(TELEMETRY_MAVLINK)
MAVLINK_Init();
#endif
#ifdef MENU_ROTARY_SW
#if defined(MENU_ROTARY_SW)
init_rotary_sw();
#endif
radio/src/targets/common/avr/serial_driver.cpp
+4 -3
View File
@@ -35,7 +35,7 @@
a second buffer to receive data while one buffer is being processed (slowly).
*/
#ifndef SIMU
#if !defined(SIMU)
ISR (USART0_RX_vect)
{
uint8_t iostat; //USART control and Status Register 0 A
@@ -62,7 +62,7 @@ ISR (USART0_RX_vect)
byte = 0;
}
//rh = UCSR0B; //USART control and Status Register 0 B
#ifdef MAVLINK
#if defined(TELEMETRY_MAVLINK)
(RXHandler)(byte);
#endif
@@ -99,7 +99,8 @@ ISR(USART0_UDRE_vect)
if (serialTxBufferCount > 0) {
UDR0 = *ptrTxISR++;
serialTxBufferCount--;
} else {
}
else {
UCSR0B &= ~(1 << UDRIE0); // disable UDRE0 interrupt
serialTxState = TX_STATE_EMPTY;
}
radio/src/translations.cpp
-1
View File
@@ -491,7 +491,6 @@ const pm_char STR_THROTTLEWARN[] PROGMEM = TR_THROTTLEWARN;
const pm_char STR_ALARMSWARN[] PROGMEM = TR_ALARMSWARN;
const pm_char STR_SWITCHWARN[] PROGMEM = TR_SWITCHWARN;
const pm_char STR_FAILSAFEWARN[] PROGMEM = TR_FAILSAFEWARN;
const pm_char STR_SDCARDVERSIONWARN[] PROGMEM = TR_SDCARDVERSIONWARN;
const pm_char STR_WRONG_SDCARDVERSION[] PROGMEM = TR_WRONG_SDCARDVERSION;
const pm_char STR_NO_FAILSAFE[] PROGMEM = TR_NO_FAILSAFE;
const pm_char STR_KEYSTUCK[] PROGMEM = TR_KEYSTUCK;
radio/src/translations.h
+1 -2
View File
@@ -706,8 +706,7 @@ extern const pm_char STR_THROTTLEWARN[];
extern const pm_char STR_ALARMSWARN[];
extern const pm_char STR_SWITCHWARN[];
extern const pm_char STR_FAILSAFEWARN[];
extern const pm_char STR_SDCARDVERSIONWARN[];
extern const pm_char STR_WRONG_SDCARDVERSION[];
extern const pm_char STR_WRONG_SDCARDVERSION[];
extern const pm_char STR_NO_FAILSAFE[];
extern const pm_char STR_KEYSTUCK[];
radio/src/translations/cz.h.txt
+1 -2
View File
@@ -910,8 +910,7 @@
#define TR_ALARMSWARN "ALARMU"
#define TR_SWITCHWARN "POZICE"
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_SDCARDVERSIONWARN "SD Card Check"
#define TR_WRONG_SDCARDVERSION "Wrong SDCARD file version"
#define TR_WRONG_SDCARDVERSION "Wrong files version"
#define TR_NO_FAILSAFE "Failsafe není nastaveno"
#define TR_KEYSTUCK "Zaseklá klávesa"
#define TR_INVERT_THR "Invertovat plyn?"
radio/src/translations/de.h.txt
+1 -2
View File
@@ -929,8 +929,7 @@
#define TR_ALARMSWARN "ALARM"
#define TR_SWITCHWARN "SCHALTER"
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_SDCARDVERSIONWARN "SD Card Check"
#define TR_WRONG_SDCARDVERSION "Wrong SDCARD file version"
#define TR_WRONG_SDCARDVERSION "Wrong files version"
#define TR_NO_FAILSAFE TR("Failsafe not set", "Failsafe nicht programmiert")
#define TR_KEYSTUCK "Taste klemmt" //Key stuck=Taste klemmt
#define TR_INVERT_THR TR("Gas umkehren?", "Vollgas hinten?") // Th9x 9XR
radio/src/translations/en.h.txt
+2 -3
View File
@@ -886,7 +886,7 @@
#define TR_BACKUP_MODEL "Backup model"
#define TR_DELETE_MODEL "Delete model"
#define TR_RESTORE_MODEL "Restore model"
#define TR_SDCARD_ERROR "SD card error"
#define TR_SDCARD_ERROR TR("SD error", "SD card error")
#define TR_NO_SDCARD "No SD card"
#define TR_SDCARD_FULL "SD card full"
#define TR_INCOMPATIBLE "Incompatible"
@@ -898,8 +898,7 @@
#define TR_ALARMSWARN "ALARMS"
#define TR_SWITCHWARN TR("SWITCH", "CONTROL")
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_SDCARDVERSIONWARN "SD Card Check"
#define TR_WRONG_SDCARDVERSION "Wrong SDCARD file version"
#define TR_WRONG_SDCARDVERSION "Wrong files version"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Key stuck"
#define TR_INVERT_THR TR("Invert thr?", "Invert throttle?")
radio/src/translations/es.h.txt
+1 -2
View File
@@ -874,8 +874,7 @@
#define TR_ALARMSWARN "ALARMAS"
#define TR_SWITCHWARN "INTERPTOR"
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_SDCARDVERSIONWARN "SD Card Check"
#define TR_WRONG_SDCARDVERSION "Wrong SDCARD file version"
#define TR_WRONG_SDCARDVERSION "Wrong files version"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Key stuck"
#define TR_INVERT_THR TR("Invertir Acel?", "Invertir Acel.?")
radio/src/translations/fi.h.txt
+1 -2
View File
@@ -874,8 +874,7 @@
#define TR_ALARMSWARN "ALARMS"
#define TR_SWITCHWARN TR("SWITCH","CONTROL")
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_SDCARDVERSIONWARN "SD Card Check"
#define TR_WRONG_SDCARDVERSION "Wrong SDCARD file version"
#define TR_WRONG_SDCARDVERSION "Wrong files version"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Key stuck"
#define TR_INVERT_THR TR("Invert Thr?","Invert Throttle?")
radio/src/translations/fr.h.txt
+1 -2
View File
@@ -906,8 +906,7 @@
#define TR_ALARMSWARN "SON"
#define TR_SWITCHWARN TR("INTERS","CONTROLES")
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_SDCARDVERSIONWARN "SD Card Check"
#define TR_WRONG_SDCARDVERSION "Wrong SDCARD file version"
#define TR_WRONG_SDCARDVERSION "Version des fichiers incompatible"
#define TR_NO_FAILSAFE "Failsafe pas déf."
#define TR_KEYSTUCK "Touche bloquée"
#define TR_INVERT_THR "Inverser Gaz?"
radio/src/translations/it.h.txt
+1 -2
View File
@@ -909,8 +909,7 @@
#define TR_ALARMSWARN "ALLARMI"
#define TR_SWITCHWARN "CONTROLLI"
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_SDCARDVERSIONWARN "SD Card Check"
#define TR_WRONG_SDCARDVERSION "Wrong SDCARD file version"
#define TR_WRONG_SDCARDVERSION "Wrong files version"
#define TR_NO_FAILSAFE "Failsafe non settato"
#define TR_KEYSTUCK "Tasto bloccato"
#define TR_INVERT_THR "Inverti Mot?"
radio/src/translations/nl.h.txt
+1 -2
View File
@@ -923,8 +923,7 @@
#define TR_ALARMSWARN "ALARM"
#define TR_SWITCHWARN "SCHAKELAAR"
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_SDCARDVERSIONWARN "SD Card Check"
#define TR_WRONG_SDCARDVERSION "Wrong SDCARD file version"
#define TR_WRONG_SDCARDVERSION "Wrong files version"
#define TR_NO_FAILSAFE TR("Failsafe niet ing.", "Failsafe niet ingesteld")
#define TR_KEYSTUCK "Toets klemt"
#define TR_INVERT_THR TR("Gas omdraaien?", "Volgas achter?")
radio/src/translations/pl.h.txt
+1 -2
View File
@@ -911,8 +911,7 @@
#define TR_ALARMSWARN "ALARM"
#define TR_SWITCHWARN TR("Przełą","Kontrola")
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_SDCARDVERSIONWARN "SD Card Check"
#define TR_WRONG_SDCARDVERSION "Wrong SDCARD file version"
#define TR_WRONG_SDCARDVERSION "Wrong files version"
#define TR_NO_FAILSAFE "Brak Failsafe"
#define TR_KEYSTUCK "Blokada klucza"
#define TR_INVERT_THR TR("Odw.Gaz?","Odwróć gaz?")
radio/src/translations/pt.h.txt
+1 -2
View File
@@ -869,8 +869,7 @@
#define TR_ALARMSWARN "ALARMES"
#define TR_SWITCHWARN "CHAVES"
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_SDCARDVERSIONWARN "SD Card Check"
#define TR_WRONG_SDCARDVERSION "Wrong SDCARD file version"
#define TR_WRONG_SDCARDVERSION "Wrong files version"
#define TR_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Key stuck"
#define TR_INVERT_THR "Inverte Acel?"