Fully adjustable splash timer on x7, matching x9 implementation (#5008)
* Fully adjustable splash timer on x7, matching x9 implementation * Make splash adjustable for all ARM, and just check box for AVR
This commit is contained in:
@@ -880,7 +880,7 @@ PACK(struct TrainerData {
|
|||||||
#define SPLASH_MODE uint8_t splashSpares:3
|
#define SPLASH_MODE uint8_t splashSpares:3
|
||||||
#elif defined(FSPLASH)
|
#elif defined(FSPLASH)
|
||||||
#define SPLASH_MODE uint8_t splashMode:3
|
#define SPLASH_MODE uint8_t splashMode:3
|
||||||
#elif defined(PCBTARANIS)
|
#elif defined(CPUARM)
|
||||||
#define SPLASH_MODE int8_t splashMode:3
|
#define SPLASH_MODE int8_t splashMode:3
|
||||||
#else
|
#else
|
||||||
#define SPLASH_MODE uint8_t splashMode:1; uint8_t splashSpare:2
|
#define SPLASH_MODE uint8_t splashMode:1; uint8_t splashSpare:2
|
||||||
|
|||||||
@@ -467,9 +467,22 @@ void menuRadioSetup(event_t event)
|
|||||||
#if defined(SPLASH) && !defined(FSPLASH)
|
#if defined(SPLASH) && !defined(FSPLASH)
|
||||||
case ITEM_SETUP_DISABLE_SPLASH:
|
case ITEM_SETUP_DISABLE_SPLASH:
|
||||||
{
|
{
|
||||||
|
#if defined(CPUARM)
|
||||||
|
lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN);
|
||||||
|
if (SPLASH_NEEDED()) {
|
||||||
|
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, SPLASH_TIMEOUT/100, attr|LEFT);
|
||||||
|
lcdDrawChar(lcdLastRightPos, y, 's');
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
lcdDrawMMM(RADIO_SETUP_2ND_COLUMN, y, attr);
|
||||||
|
}
|
||||||
|
if (attr) g_eeGeneral.splashMode = -checkIncDecGen(event, -g_eeGeneral.splashMode, -3, 4);
|
||||||
|
break;
|
||||||
|
#else
|
||||||
uint8_t b = 1-g_eeGeneral.splashMode;
|
uint8_t b = 1-g_eeGeneral.splashMode;
|
||||||
g_eeGeneral.splashMode = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_SPLASHSCREEN, attr, event);
|
g_eeGeneral.splashMode = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_SPLASHSCREEN, attr, event);
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user