mirror of
https://github.com/opentx/opentx.git
synced 2025-07-15 20:35:17 +03:00
Rework warning
This commit is contained in:
parent
9db067ae2c
commit
bc2e3a272a
17 changed files with 35 additions and 35 deletions
|
@ -47,7 +47,7 @@ option(TRACE_SIMPGMSPACE "Turn on traces in simpgmspace.cpp" ON)
|
||||||
option(TRACE_LUA_INTERNALS "Turn on traces for Lua internals" OFF)
|
option(TRACE_LUA_INTERNALS "Turn on traces for Lua internals" OFF)
|
||||||
option(FRSKY_STICKS "Reverse sticks for FrSky sticks" OFF)
|
option(FRSKY_STICKS "Reverse sticks for FrSky sticks" OFF)
|
||||||
option(NANO "Use nano newlib and binalloc")
|
option(NANO "Use nano newlib and binalloc")
|
||||||
option(NIGHTLY_BUILD_WARNING "Warn this is a nightly build" OFF)
|
option(TEST_BUILD_WARNING "Warn this is a test build" OFF)
|
||||||
option(MODULE_PROTOCOL_FCC "Add support for FCC modules" ON)
|
option(MODULE_PROTOCOL_FCC "Add support for FCC modules" ON)
|
||||||
option(MODULE_PROTOCOL_LBT "Add support for EU/LBT modules" ON)
|
option(MODULE_PROTOCOL_LBT "Add support for EU/LBT modules" ON)
|
||||||
option(MODULE_PROTOCOL_FLEX "Add support for non certified FLEX modules" OFF)
|
option(MODULE_PROTOCOL_FLEX "Add support for non certified FLEX modules" OFF)
|
||||||
|
@ -315,8 +315,8 @@ if(EEPROM_VARIANT_NEEDED)
|
||||||
add_definitions(-DEEPROM_VARIANT=${EEPROM_VARIANT})
|
add_definitions(-DEEPROM_VARIANT=${EEPROM_VARIANT})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NIGHTLY_BUILD_WARNING)
|
if(TEST_BUILD_WARNING)
|
||||||
add_definitions(-DNIGHTLY_BUILD_WARNING)
|
add_definitions(-DTEST_BUILD_WARNING)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(MODULE_PROTOCOL_FCC)
|
if(MODULE_PROTOCOL_FCC)
|
||||||
|
|
|
@ -1554,8 +1554,8 @@ void opentxStart(const uint8_t startOptions = OPENTX_START_DEFAULT_ARGS)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(NIGHTLY_BUILD_WARNING)
|
#if defined(TEST_BUILD_WARNING)
|
||||||
ALERT(STR_NIGHTLY_WARNING, TR_NIGHTLY_NOTSAFE, AU_ERROR);
|
ALERT(STR_TEST_WARNING, TR_TEST_NOTSAFE, AU_ERROR);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(GUI)
|
#if defined(GUI)
|
||||||
|
|
|
@ -705,9 +705,9 @@ const char STR_MODELS_PATH[] = MODELS_PATH;
|
||||||
const char STR_MODELS_EXT[] = MODELS_EXT;
|
const char STR_MODELS_EXT[] = MODELS_EXT;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(NIGHTLY_BUILD_WARNING)
|
#if defined(TEST_BUILD_WARNING)
|
||||||
const char STR_NIGHTLY_WARNING[] = TR_NIGHTLY_WARNING;
|
const char STR_TEST_WARNING[] = TR_TEST_WARNING;
|
||||||
const char STR_NIGHTLY_NOTSAFE[] = TR_NIGHTLY_NOTSAFE;
|
const char STR_TEST_NOTSAFE[] = TR_TEST_NOTSAFE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if LCD_W >= 212
|
#if LCD_W >= 212
|
||||||
|
|
|
@ -552,8 +552,8 @@ extern const char STR_THROTTLEWARN[];
|
||||||
extern const char STR_ALARMSWARN[];
|
extern const char STR_ALARMSWARN[];
|
||||||
extern const char STR_SWITCHWARN[];
|
extern const char STR_SWITCHWARN[];
|
||||||
extern const char STR_FAILSAFEWARN[];
|
extern const char STR_FAILSAFEWARN[];
|
||||||
extern const char STR_NIGHTLY_WARNING[];
|
extern const char STR_TEST_WARNING[];
|
||||||
extern const char STR_NIGHTLY_NOTSAFE[];
|
extern const char STR_TEST_NOTSAFE[];
|
||||||
extern const char STR_WRONG_SDCARDVERSION[];
|
extern const char STR_WRONG_SDCARDVERSION[];
|
||||||
extern const char STR_WARN_RTC_BATTERY_LOW[];
|
extern const char STR_WARN_RTC_BATTERY_LOW[];
|
||||||
extern const char STR_WARN_MULTI_LOWPOWER[];
|
extern const char STR_WARN_MULTI_LOWPOWER[];
|
||||||
|
|
|
@ -733,8 +733,8 @@
|
||||||
#define TR_ALARMSWARN "ALARMU"
|
#define TR_ALARMSWARN "ALARMU"
|
||||||
#define TR_SWITCHWARN "POZICE"
|
#define TR_SWITCHWARN "POZICE"
|
||||||
#define TR_FAILSAFEWARN "FAILSAFE"
|
#define TR_FAILSAFEWARN "FAILSAFE"
|
||||||
#define TR_NIGHTLY_WARNING TR("NOČNÍ", "NOČNÍ SESTAVENÍ")
|
#define TR_TEST_WARNING TR("NOČNÍ", "NOČNÍ SESTAVENÍ")
|
||||||
#define TR_NIGHTLY_NOTSAFE "Verze není bezpečná k létání"
|
#define TR_TEST_NOTSAFE "Use for tests only"
|
||||||
#define TR_WRONG_SDCARDVERSION "Očekávaná ver.: "
|
#define TR_WRONG_SDCARDVERSION "Očekávaná ver.: "
|
||||||
#define TR_WARN_RTC_BATTERY_LOW "Slabá RTC baterie"
|
#define TR_WARN_RTC_BATTERY_LOW "Slabá RTC baterie"
|
||||||
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
||||||
|
|
|
@ -735,8 +735,8 @@
|
||||||
#define TR_ALARMSWARN "ALARM"
|
#define TR_ALARMSWARN "ALARM"
|
||||||
#define TR_SWITCHWARN "SCHALTER"
|
#define TR_SWITCHWARN "SCHALTER"
|
||||||
#define TR_FAILSAFEWARN "FAILSAFE"
|
#define TR_FAILSAFEWARN "FAILSAFE"
|
||||||
#define TR_NIGHTLY_WARNING TR("NIGHTLY", "NIGHTLY BUILD")
|
#define TR_TEST_WARNING TR("TESTING", "TEST BUILD")
|
||||||
#define TR_NIGHTLY_NOTSAFE "Nicht für Flug geeignet"
|
#define TR_TEST_NOTSAFE "Use for tests only"
|
||||||
#define TR_WRONG_SDCARDVERSION TR("Erw. Version: ","Erwartete Version: ")
|
#define TR_WRONG_SDCARDVERSION TR("Erw. Version: ","Erwartete Version: ")
|
||||||
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
||||||
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
||||||
|
|
|
@ -734,8 +734,8 @@
|
||||||
#define TR_ALARMSWARN "ALARMS"
|
#define TR_ALARMSWARN "ALARMS"
|
||||||
#define TR_SWITCHWARN TR("SWITCH", "CONTROL")
|
#define TR_SWITCHWARN TR("SWITCH", "CONTROL")
|
||||||
#define TR_FAILSAFEWARN "FAILSAFE"
|
#define TR_FAILSAFEWARN "FAILSAFE"
|
||||||
#define TR_NIGHTLY_WARNING TR("NIGHTLY", "NIGHTLY BUILD")
|
#define TR_TEST_WARNING TR("TESTING", "TEST BUILD")
|
||||||
#define TR_NIGHTLY_NOTSAFE "Version not safe to fly"
|
#define TR_TEST_NOTSAFE "Use for tests only"
|
||||||
#define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
|
#define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
|
||||||
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
||||||
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
||||||
|
|
|
@ -758,8 +758,8 @@
|
||||||
#define TR_ALARMSWARN "ALARMAS"
|
#define TR_ALARMSWARN "ALARMAS"
|
||||||
#define TR_SWITCHWARN "INTERPTOR"
|
#define TR_SWITCHWARN "INTERPTOR"
|
||||||
#define TR_FAILSAFEWARN "FAILSAFE"
|
#define TR_FAILSAFEWARN "FAILSAFE"
|
||||||
#define TR_NIGHTLY_WARNING TR("NIGHTLY", "NIGHTLY BUILD")
|
#define TR_TEST_WARNING TR("TESTING", "TEST BUILD")
|
||||||
#define TR_NIGHTLY_NOTSAFE "Version not safe to fly"
|
#define TR_TEST_NOTSAFE "Use for tests only"
|
||||||
#define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
|
#define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
|
||||||
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
||||||
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
||||||
|
|
|
@ -752,8 +752,8 @@
|
||||||
#define TR_ALARMSWARN "ALARMS"
|
#define TR_ALARMSWARN "ALARMS"
|
||||||
#define TR_SWITCHWARN TR("SWITCH","CONTROL")
|
#define TR_SWITCHWARN TR("SWITCH","CONTROL")
|
||||||
#define TR_FAILSAFEWARN "FAILSAFE"
|
#define TR_FAILSAFEWARN "FAILSAFE"
|
||||||
#define TR_NIGHTLY_WARNING TR("NIGHTLY", "NIGHTLY BUILD")
|
#define TR_TEST_WARNING TR("TESTING", "TEST BUILD")
|
||||||
#define TR_NIGHTLY_NOTSAFE "Version not safe to fly"
|
#define TR_TEST_NOTSAFE "Use for tests only"
|
||||||
#define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
|
#define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
|
||||||
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
||||||
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
||||||
|
|
|
@ -755,8 +755,8 @@
|
||||||
#define TR_ALARMSWARN "SON"
|
#define TR_ALARMSWARN "SON"
|
||||||
#define TR_SWITCHWARN TR("INTERS","CONTROLES")
|
#define TR_SWITCHWARN TR("INTERS","CONTROLES")
|
||||||
#define TR_FAILSAFEWARN "FAILSAFE"
|
#define TR_FAILSAFEWARN "FAILSAFE"
|
||||||
#define TR_NIGHTLY_WARNING TR("NIGHTLY", "NIGHTLY BUILD")
|
#define TR_TEST_WARNING TR("TESTING", "TEST BUILD")
|
||||||
#define TR_NIGHTLY_NOTSAFE "Version de test uniq."
|
#define TR_TEST_NOTSAFE "Version de test uniq."
|
||||||
#define TR_WRONG_SDCARDVERSION "Version requise: "
|
#define TR_WRONG_SDCARDVERSION "Version requise: "
|
||||||
#define TR_WARN_RTC_BATTERY_LOW "Batterie RTC faible"
|
#define TR_WARN_RTC_BATTERY_LOW "Batterie RTC faible"
|
||||||
#define TR_WARN_MULTI_LOWPOWER "Mode basse puis."
|
#define TR_WARN_MULTI_LOWPOWER "Mode basse puis."
|
||||||
|
|
|
@ -754,8 +754,8 @@
|
||||||
#define TR_ALARMSWARN "ALLARMI"
|
#define TR_ALARMSWARN "ALLARMI"
|
||||||
#define TR_SWITCHWARN "CONTROLLI"
|
#define TR_SWITCHWARN "CONTROLLI"
|
||||||
#define TR_FAILSAFEWARN "FAILSAFE"
|
#define TR_FAILSAFEWARN "FAILSAFE"
|
||||||
#define TR_NIGHTLY_WARNING TR("NIGHTLY", "NIGHTLY BUILD")
|
#define TR_TEST_WARNING TR("TESTING", "TEST BUILD")
|
||||||
#define TR_NIGHTLY_NOTSAFE "Versione non sicura"
|
#define TR_TEST_NOTSAFE "Use for test only"
|
||||||
#define TR_WRONG_SDCARDVERSION TR("Richiede ver: ", "Richiede versione: ")
|
#define TR_WRONG_SDCARDVERSION TR("Richiede ver: ", "Richiede versione: ")
|
||||||
#define TR_WARN_RTC_BATTERY_LOW "Batteria RTC scarica"
|
#define TR_WARN_RTC_BATTERY_LOW "Batteria RTC scarica"
|
||||||
#define TR_WARN_MULTI_LOWPOWER "Modalità bassa pot."
|
#define TR_WARN_MULTI_LOWPOWER "Modalità bassa pot."
|
||||||
|
|
|
@ -740,8 +740,8 @@
|
||||||
#define TR_ALARMSWARN "ALARM"
|
#define TR_ALARMSWARN "ALARM"
|
||||||
#define TR_SWITCHWARN "SCHAKELAAR"
|
#define TR_SWITCHWARN "SCHAKELAAR"
|
||||||
#define TR_FAILSAFEWARN "FAILSAFE"
|
#define TR_FAILSAFEWARN "FAILSAFE"
|
||||||
#define TR_NIGHTLY_WARNING TR("NIGHTLY", "NIGHTLY BUILD")
|
#define TR_TEST_WARNING TR("TESTING", "TEST BUILD")
|
||||||
#define TR_NIGHTLY_NOTSAFE "Version not safe to fly"
|
#define TR_TEST_NOTSAFE "Use for tests only"
|
||||||
#define TR_WRONG_SDCARDVERSION TR("Verwachte ver: ","Verwachte versie: ")
|
#define TR_WRONG_SDCARDVERSION TR("Verwachte ver: ","Verwachte versie: ")
|
||||||
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
||||||
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
||||||
|
|
|
@ -753,8 +753,8 @@
|
||||||
#define TR_ALARMSWARN "ALARM"
|
#define TR_ALARMSWARN "ALARM"
|
||||||
#define TR_SWITCHWARN TR("Przełą","Kontrola")
|
#define TR_SWITCHWARN TR("Przełą","Kontrola")
|
||||||
#define TR_FAILSAFEWARN "FAILSAFE"
|
#define TR_FAILSAFEWARN "FAILSAFE"
|
||||||
#define TR_NIGHTLY_WARNING TR("NIGHTLY", "NIGHTLY BUILD")
|
#define TR_TEST_WARNING TR("TESTING", "TEST BUILD")
|
||||||
#define TR_NIGHTLY_NOTSAFE "Version not safe to fly"
|
#define TR_TEST_NOTSAFE "Use for tests only"
|
||||||
#define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
|
#define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
|
||||||
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
||||||
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
||||||
|
|
|
@ -743,8 +743,8 @@
|
||||||
#define TR_ALARMSWARN "ALARMES"
|
#define TR_ALARMSWARN "ALARMES"
|
||||||
#define TR_SWITCHWARN "CHAVES"
|
#define TR_SWITCHWARN "CHAVES"
|
||||||
#define TR_FAILSAFEWARN "FAILSAFE"
|
#define TR_FAILSAFEWARN "FAILSAFE"
|
||||||
#define TR_NIGHTLY_WARNING TR("NIGHTLY", "NIGHTLY BUILD")
|
#define TR_TEST_WARNING TR("TESTING", "TEST BUILD")
|
||||||
#define TR_NIGHTLY_NOTSAFE "Version not safe to fly"
|
#define TR_TEST_NOTSAFE "Use for tests only"
|
||||||
#define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
|
#define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
|
||||||
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
||||||
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
#define TR_WARN_MULTI_LOWPOWER "Low power mode"
|
||||||
|
|
|
@ -752,8 +752,8 @@
|
||||||
#define TR_ALARMSWARN "ALARM"
|
#define TR_ALARMSWARN "ALARM"
|
||||||
#define TR_SWITCHWARN "BRYTARE"
|
#define TR_SWITCHWARN "BRYTARE"
|
||||||
#define TR_FAILSAFEWARN "FAILSAFE"
|
#define TR_FAILSAFEWARN "FAILSAFE"
|
||||||
#define TR_NIGHTLY_WARNING TR("NIGHTLY", "NIGHTLY BUILD")
|
#define TR_TEST_WARNING TR("TESTING", "TEST BUILD")
|
||||||
#define TR_NIGHTLY_NOTSAFE "Version not safe to fly"
|
#define TR_TEST_NOTSAFE "Use for tests only"
|
||||||
#define TR_SDCARDVERSIONWARN "SD Card Check"
|
#define TR_SDCARDVERSIONWARN "SD Card Check"
|
||||||
#define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
|
#define TR_WRONG_SDCARDVERSION TR("Expected ver: ","Expected version: ")
|
||||||
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
#define TR_WARN_RTC_BATTERY_LOW "RTC Battery low"
|
||||||
|
|
|
@ -30,7 +30,7 @@ def build_target(target, path, cmake_options):
|
||||||
suffix = os.environ["OPENTX_VERSION_SUFFIX"]
|
suffix = os.environ["OPENTX_VERSION_SUFFIX"]
|
||||||
cmd.append('-DVERSION_SUFFIX="%s"' % suffix)
|
cmd.append('-DVERSION_SUFFIX="%s"' % suffix)
|
||||||
if suffix.startswith("N"):
|
if suffix.startswith("N"):
|
||||||
cmd.append('-DNIGHTLY_BUILD_WARNING=YES')
|
cmd.append('-DTEST_BUILD_WARNING=YES')
|
||||||
cmd.append(srcdir)
|
cmd.append(srcdir)
|
||||||
|
|
||||||
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
|
|
|
@ -25,7 +25,7 @@ done
|
||||||
SRCDIR=$1
|
SRCDIR=$1
|
||||||
OUTDIR=$2
|
OUTDIR=$2
|
||||||
|
|
||||||
COMMON_OPTIONS="-DALLOW_NIGHTLY_BUILDS=YES -DNIGHTLY_BUILD_WARNING=YES -DGVARS=YES -DHELI=YES -DLUA=YES -DMULTIMODULE=YES -DTELEMETRY=FRSKY -DPPM_LIMITS_SYMETRICAL=YES -DVARIO=YES -DAUTOSWITCH=YES -DAUTOSOURCE=YES -DAUDIO=YES -DGPS=YES -DPPM_CENTER_ADJUSTABLE=YES -DFLIGHT_MODES=YES -DOVERRIDE_CHANNEL_FUNCTION=YES -DFRSKY_STICKS=YES"
|
COMMON_OPTIONS="-DALLOW_NIGHTLY_BUILDS=YES -DTEST_BUILD_WARNING=YES -DGVARS=YES -DHELI=YES -DLUA=YES -DMULTIMODULE=YES -DTELEMETRY=FRSKY -DPPM_LIMITS_SYMETRICAL=YES -DVARIO=YES -DAUTOSWITCH=YES -DAUTOSOURCE=YES -DAUDIO=YES -DGPS=YES -DPPM_CENTER_ADJUSTABLE=YES -DFLIGHT_MODES=YES -DOVERRIDE_CHANNEL_FUNCTION=YES -DFRSKY_STICKS=YES"
|
||||||
if [ "$(uname)" = "Darwin" ]; then
|
if [ "$(uname)" = "Darwin" ]; then
|
||||||
COMMON_OPTIONS="${COMMON_OPTIONS} -DCMAKE_PREFIX_PATH=~/Qt/5.7/clang_64/ -DCMAKE_OSX_DEPLOYMENT_TARGET='10.9'"
|
COMMON_OPTIONS="${COMMON_OPTIONS} -DCMAKE_PREFIX_PATH=~/Qt/5.7/clang_64/ -DCMAKE_OSX_DEPLOYMENT_TARGET='10.9'"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue