From c16ad94e3a1ce6bea6df78b045671b1eb631b6d4 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 22 Aug 2016 19:03:42 +0200 Subject: [PATCH] SD card warning modified (fits now in 9X LCD) Missing #ifdef for TELEMETRY flavours --- radio/src/opentx.cpp | 14 +++++++------- radio/src/targets/common/avr/serial_driver.cpp | 7 ++++--- radio/src/translations.cpp | 1 - radio/src/translations.h | 3 +-- radio/src/translations/cz.h.txt | 3 +-- radio/src/translations/de.h.txt | 3 +-- radio/src/translations/en.h.txt | 5 ++--- radio/src/translations/es.h.txt | 3 +-- radio/src/translations/fi.h.txt | 3 +-- radio/src/translations/fr.h.txt | 3 +-- radio/src/translations/it.h.txt | 3 +-- radio/src/translations/nl.h.txt | 3 +-- radio/src/translations/pl.h.txt | 3 +-- radio/src/translations/pt.h.txt | 3 +-- 14 files changed, 23 insertions(+), 34 deletions(-) diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 4f3b08130..2398193da 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -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 diff --git a/radio/src/targets/common/avr/serial_driver.cpp b/radio/src/targets/common/avr/serial_driver.cpp index 6602fd890..bfc03e5a5 100644 --- a/radio/src/targets/common/avr/serial_driver.cpp +++ b/radio/src/targets/common/avr/serial_driver.cpp @@ -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; } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index ff882b39f..1c9681223 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -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; diff --git a/radio/src/translations.h b/radio/src/translations.h index d008b279b..64870c0ae 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -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[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index db677b22f..1e5838fe4 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -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?" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 2f074108b..982c2467e 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -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 diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index fd4bca0c9..513b65697 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -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?") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 4e4ce99d3..c0e66bcff 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -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.?") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 0934e5ad8..55f8c8d8f 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -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?") diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index ee34ba161..1ddf1a98c 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -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?" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 4cfc77ee4..15cc6f0e8 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -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?" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 8213566f5..4feaaf5a9 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -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?") diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index fb0bd456c..68b7c4e42 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -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?") diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index cca955a99..ef5e93256 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -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?"