diff --git a/CMakeLists.txt b/CMakeLists.txt index f82485c58..c1d4e5ac7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,8 @@ set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR}) set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX}) message(STATUS "OpenTX ${VERSION}") -set(SDCARD_VERSION "0003") +set(SDCARD_REVISION "0003") +set(SDCARD_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION}) cmake_minimum_required(VERSION 2.8) cmake_policy(SET CMP0020 NEW) diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index a7102587f..28ee59b30 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -934,7 +934,7 @@ #define TR_ALARMSWARN "ALARM" #define TR_SWITCHWARN "SCHALTER" #define TR_FAILSAFEWARN "FAILSAFE" -#define TR_WRONG_SDCARDVERSION "Needed file version: " +#define TR_WRONG_SDCARDVERSION "Expects version: " #define TR_WRONG_PCBREV "Wrong PCB detected" #define TR_EMERGENCY_MODE "EMERGENCY MODE" #define TR_PCBREV_ERROR "PCB error" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 5eccefa20..910af9d5d 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -900,7 +900,7 @@ #define TR_ALARMSWARN "ALARMS" #define TR_SWITCHWARN TR("SWITCH", "CONTROL") #define TR_FAILSAFEWARN "FAILSAFE" -#define TR_WRONG_SDCARDVERSION "Needed file version: " +#define TR_WRONG_SDCARDVERSION "Expects version: " #define TR_WRONG_PCBREV "Wrong PCB detected" #define TR_EMERGENCY_MODE "EMERGENCY MODE" #define TR_PCBREV_ERROR "PCB error" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 663283686..34f4e2d64 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -879,7 +879,7 @@ #define TR_ALARMSWARN "ALARMAS" #define TR_SWITCHWARN "INTERPTOR" #define TR_FAILSAFEWARN "FAILSAFE" -#define TR_WRONG_SDCARDVERSION "Needed file version: " +#define TR_WRONG_SDCARDVERSION "Expects version: " #define TR_WRONG_PCBREV "Wrong PCB detected" #define TR_EMERGENCY_MODE "EMERGENCY MODE" #define TR_PCBREV_ERROR "PCB error" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index e1b38ee46..93574af18 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -879,7 +879,7 @@ #define TR_ALARMSWARN "ALARMS" #define TR_SWITCHWARN TR("SWITCH","CONTROL") #define TR_FAILSAFEWARN "FAILSAFE" -#define TR_WRONG_SDCARDVERSION "Needed file version: " +#define TR_WRONG_SDCARDVERSION "Expects version: " #define TR_WRONG_PCBREV "Wrong PCB detected" #define TR_EMERGENCY_MODE "EMERGENCY MODE" #define TR_PCBREV_ERROR "PCB error" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index f12204392..6c9a9929f 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -911,7 +911,7 @@ #define TR_ALARMSWARN "SON" #define TR_SWITCHWARN TR("INTERS","CONTROLES") #define TR_FAILSAFEWARN "FAILSAFE" -#define TR_WRONG_SDCARDVERSION "Requiers fichiers version : " +#define TR_WRONG_SDCARDVERSION "Version requise : " #define TR_WRONG_PCBREV "Wrong PCB detected" #define TR_EMERGENCY_MODE "EMERGENCY MODE" #define TR_PCBREV_ERROR "PCB error" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index fcf21a663..9260ae17d 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -914,7 +914,7 @@ #define TR_ALARMSWARN "ALLARMI" #define TR_SWITCHWARN "CONTROLLI" #define TR_FAILSAFEWARN "FAILSAFE" -#define TR_WRONG_SDCARDVERSION "Needed file version: " +#define TR_WRONG_SDCARDVERSION "Expects version: " #define TR_WRONG_PCBREV "Wrong PCB detected" #define TR_EMERGENCY_MODE "EMERGENCY MODE" #define TR_PCBREV_ERROR "PCB error" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 7d16edaed..55e169ce6 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -908,7 +908,7 @@ #define TR_ALARMSWARN "ALARM" #define TR_SWITCHWARN "SCHAKELAAR" #define TR_FAILSAFEWARN "FAILSAFE" -#define TR_WRONG_SDCARDVERSION "Needed file version: " +#define TR_WRONG_SDCARDVERSION "Expects version: " #define TR_WRONG_PCBREV "Verkeerde PCB gedetecteerd" #define TR_EMERGENCY_MODE "EMERGENCY MODE" #define TR_PCBREV_ERROR "PCB fout" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index bcd5ea7dd..4cfb6aebc 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -916,7 +916,7 @@ #define TR_ALARMSWARN "ALARM" #define TR_SWITCHWARN TR("Przełą","Kontrola") #define TR_FAILSAFEWARN "FAILSAFE" -#define TR_WRONG_SDCARDVERSION "Needed file version: " +#define TR_WRONG_SDCARDVERSION "Expects version: " #define TR_WRONG_PCBREV "Wrong PCB detected" #define TR_EMERGENCY_MODE "EMERGENCY MODE" #define TR_PCBREV_ERROR "PCB error" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 191334557..98cfd81b7 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -874,7 +874,7 @@ #define TR_ALARMSWARN "ALARMES" #define TR_SWITCHWARN "CHAVES" #define TR_FAILSAFEWARN "FAILSAFE" -#define TR_WRONG_SDCARDVERSION "Needed file version: " +#define TR_WRONG_SDCARDVERSION "Expects version: " #define TR_WRONG_PCBREV "Wrong PCB detected" #define TR_EMERGENCY_MODE "EMERGENCY MODE" #define TR_PCBREV_ERROR "PCB error" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 975d1fd02..b6ddd3e8c 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -928,7 +928,7 @@ #define TR_SWITCHWARN "BRYTARE" #define TR_FAILSAFEWARN "FAILSAFE" #define TR_SDCARDVERSIONWARN "SD Card Check" -#define TR_WRONG_SDCARDVERSION "Needed file version: " +#define TR_WRONG_SDCARDVERSION "Expects version: " #define TR_WRONG_PCBREV "Wrong PCB detected" #define TR_EMERGENCY_MODE "EMERGENCY MODE" #define TR_PCBREV_ERROR "PCB error" diff --git a/tools/nightly22/build-sdcard.sh b/tools/nightly22/build-sdcard.sh index 51536dcad..b8743f8ef 100755 --- a/tools/nightly22/build-sdcard.sh +++ b/tools/nightly22/build-sdcard.sh @@ -7,7 +7,7 @@ workdir=/home/opentx/nightly22 output=/var/www/html/2.2/nightly # Handle opentx.sdcard.version -sdcard_version=$(grep 'set(SDCARD_VERSION' ${workdir}/code/CMakeLists.txt | grep -o '".*"' | sed 's/"//g') +sdcard_version="2.2V"+$(grep 'set(SDCARD_VERSION' ${workdir}/code/CMakeLists.txt | grep -o '".*"' | sed 's/"//g') echo $sdcard_version > ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version echo $sdcard_version > ${workdir}/code/radio/sdcard/taranis/opentx.sdcard.version