feat: Splash screen delay opt for colorlcd, startup sound disable opt (#3451)
* Enable startup splash screen duration for color LCD radios. Add option to disable startup sound. Add Companion support for changes. * Add translation string for Hebrew language file. * Fix rebase. * chore: Add T20 * Update translations. * Update translations. * Update translations. * Update translations. * Right justify radio setup controls. * Use longer translations for all radios. * Enable splash screen timeout for NV14/EL18. * Suspend watchdog timer to prevent EM if long splash display time selected. * Simplify SPLASH_TIMEOUT code. * Use WDG_RESET instead of watchdogSuspend. --------- Co-authored-by: Phil Mitchell <phil.a.mitchell@gmail.com> Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
co-authored by
Phil Mitchell
Peter Feerick
parent
ca025e849f
commit
9e7a331fa6
@@ -810,12 +810,6 @@ PACK(struct TrainerData {
|
||||
NOBACKUP(TrainerMix mix[4]);
|
||||
});
|
||||
|
||||
#if defined(COLORLCD)
|
||||
#define SPLASH_MODE uint8_t splashSpares:3 SKIP
|
||||
#else
|
||||
#define SPLASH_MODE int8_t splashMode:3
|
||||
#endif
|
||||
|
||||
#if defined(COLORLCD)
|
||||
#define EXTRA_GENERAL_FIELDS \
|
||||
NOBACKUP(char currModelFilename[LEN_MODEL_FILENAME+1]); \
|
||||
@@ -869,7 +863,7 @@ PACK(struct RadioData {
|
||||
int8_t antennaMode:2 ENUM(AntennaModes);
|
||||
uint8_t disableRtcWarning:1;
|
||||
uint8_t keysBacklight:1;
|
||||
uint8_t spare1:1 SKIP;
|
||||
NOBACKUP(uint8_t dontPlayHello:1);
|
||||
uint8_t internalModule ENUM(ModuleType);
|
||||
NOBACKUP(TrainerData trainer);
|
||||
NOBACKUP(uint8_t view); // index of view in main screen
|
||||
@@ -885,7 +879,7 @@ PACK(struct RadioData {
|
||||
NOBACKUP(uint8_t inactivityTimer);
|
||||
CUST_ATTR(telemetryBaudrate, r_telemetryBaudrate, nullptr);
|
||||
uint8_t internalModuleBaudrate:3;
|
||||
SPLASH_MODE; /* 3bits */
|
||||
int8_t splashMode:3; /* 3bits */
|
||||
int8_t hapticMode:2 CUST(r_beeperMode,w_beeperMode);
|
||||
int8_t switchesDelay;
|
||||
NOBACKUP(uint8_t lightAutoOff);
|
||||
@@ -987,7 +981,6 @@ PACK(struct RadioData {
|
||||
#undef TELEMETRY_DATA
|
||||
#undef SCRIPTS_DATA
|
||||
#undef CUSTOM_SCREENS_DATA
|
||||
#undef SPLASH_MODE
|
||||
#undef EXTRA_GENERAL_FIELDS
|
||||
#undef THEME_DATA
|
||||
#undef NOBACKUP
|
||||
|
||||
Reference in New Issue
Block a user