Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-21 15:25:17 +03:00
Code Issues Wiki Activity

3djc/sdcard version check (#3709)

Browse source 
* Checking code

* Strings

* Fix

* Improvement

* Cosmetics
This commit is contained in:
3djc 2016-08-21 16:45:04 +02:00 • committed by Bertrand Songis
parent b657ca1862
commit 1164f30fd1
17 changed files with 59 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
radio/sdcard/horus/opentx.sdcard.version Executable file
View file

@ -0,0 +1 @@
2.2V0001

1
radio/sdcard/taranis/opentx.sdcard.version Executable file
View file

@ -0,0 +1 @@
2.2V0001

3
radio/src/dataconstants.h
View file

@ -127,6 +127,9 @@
#define NUM_CYC 3
#define NUM_CAL_PPM 4
#if defined(SDCARD)
#define REQUIRED_SDCARD_VERSION "2.2V0001"
#endif
enum CurveType {
CURVE_TYPE_STANDARD,
CURVE_TYPE_CUSTOM,

25
radio/src/opentx.cpp
View file

@ -1084,6 +1084,27 @@ void doSplash()
#define doSplash()
#endif
#if defined(SDCARD)
void checkSDVersion()
{
if (sdMounted()) {
FIL versionFile = {0};
UINT read = 0;
char version[sizeof(REQUIRED_SDCARD_VERSION)];
FRESULT result = f_open(&versionFile, "/opentx.sdcard.version", FA_OPEN_EXISTING | FA_READ);
if ((result == FR_OK) && (f_size(&versionFile) == sizeof(REQUIRED_SDCARD_VERSION))) {
f_read(&versionFile, &version, sizeof(REQUIRED_SDCARD_VERSION), &read);
}
f_close(&versionFile);
if (strncmp(version, REQUIRED_SDCARD_VERSION, sizeof(REQUIRED_SDCARD_VERSION)-1) != 0) {
TRACE("sdCheckVersion FAILED");
ALERT(STR_SDCARDVERSIONWARN, STR_WRONG_SDCARDVERSION, AU_ERROR);
}
}
}
#endif
#if defined(PCBTARANIS)
void checkFailsafe()
{
@ -1118,6 +1139,10 @@ void checkAll()
checkFailsafe();
#endif
#if defined(SDCARD)
checkSDVersion();
#endif
#if defined(CPUARM)
if (g_model.displayChecklist && modelHasNotes()) {
pushModelNotes();

2
radio/src/translations.cpp
View file

@ -491,6 +491,8 @@ 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;

2
radio/src/translations.h
View file

@ -706,6 +706,8 @@ 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_NO_FAILSAFE[];
extern const pm_char STR_KEYSTUCK[];

4
radio/src/translations/cz.h.txt
View file

@ -851,9 +851,9 @@
#define TR_MENUTEMPLATES "ŠABLONY"
#define TR_MENUSTAT "STATISTIKA"
#define TR_MENUDEBUG "DIAG"
#define TR_MONITOR_SWITCHES "LOGICAL SWITCHES MONITOR"
#define TR_MONITOR_CHANNELS1 "CHANNELS MONITOR 1/8"
#define TR_MONITOR_CHANNELS2 "CHANNELS MONITOR 9/16"
#define TR_MONITOR_SWITCHES "LOGICAL SWITCHES MONITOR"
#define TR_MONITOR_CHANNELS3 "CHANNELS MONITOR 17/24"
#define TR_MONITOR_CHANNELS4 "CHANNELS MONITOR 25/32"
#define TR_MONITOR_OUTPUT_DESC "Outputs"
@ -910,6 +910,8 @@
#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_NO_FAILSAFE "Failsafe není nastaveno"
#define TR_KEYSTUCK "Zaseklá klávesa"
#define TR_INVERT_THR "Invertovat plyn?"

2
radio/src/translations/de.h.txt
View file

@ -929,6 +929,8 @@
#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_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

2
radio/src/translations/en.h.txt
View file

@ -898,6 +898,8 @@
#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_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Key stuck"
#define TR_INVERT_THR TR("Invert thr?", "Invert throttle?")

2
radio/src/translations/es.h.txt
View file

@ -874,6 +874,8 @@
#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_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Key stuck"
#define TR_INVERT_THR TR("Invertir Acel?", "Invertir Acel.?")

2
radio/src/translations/fi.h.txt
View file

@ -874,6 +874,8 @@
#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_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Key stuck"
#define TR_INVERT_THR TR("Invert Thr?","Invert Throttle?")

2
radio/src/translations/fr.h.txt
View file

@ -906,6 +906,8 @@
#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_NO_FAILSAFE "Failsafe pas déf."
#define TR_KEYSTUCK "Touche bloquée"
#define TR_INVERT_THR "Inverser Gaz?"

2
radio/src/translations/it.h.txt
View file

@ -909,6 +909,8 @@
#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_NO_FAILSAFE "Failsafe non settato"
#define TR_KEYSTUCK "Tasto bloccato"
#define TR_INVERT_THR "Inverti Mot?"

2
radio/src/translations/nl.h.txt
View file

@ -923,6 +923,8 @@
#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_NO_FAILSAFE TR("Failsafe niet ing.", "Failsafe niet ingesteld")
#define TR_KEYSTUCK "Toets klemt"
#define TR_INVERT_THR TR("Gas omdraaien?", "Volgas achter?")

2
radio/src/translations/pl.h.txt
View file

@ -911,6 +911,8 @@
#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_NO_FAILSAFE "Brak Failsafe"
#define TR_KEYSTUCK "Blokada klucza"
#define TR_INVERT_THR TR("Odw.Gaz?","Odwróć gaz?")

2
radio/src/translations/pt.h.txt
View file

@ -869,6 +869,8 @@
#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_NO_FAILSAFE "Failsafe not set"
#define TR_KEYSTUCK "Key stuck"
#define TR_INVERT_THR "Inverte Acel?"

2
radio/src/translations/se.h.txt
View file

@ -922,6 +922,8 @@
#define TR_ALARMSWARN "ALARM"
#define TR_SWITCHWARN "BRYTARE"
#define TR_FAILSAFEWARN "FAILSAFE"
#define TR_SDCARDVERSIONWARN "SD Card Check"
#define TR_WRONG_SDCARDVERSION "Wrong SDCARD file version"
#define TR_NO_FAILSAFE "Failsafe ej given"
#define TR_KEYSTUCK "Knapp-fel"
#define TR_INVERT_THR TR("Invert.Gas?", "Invertera Gasen?")