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

Unused FSPLASH option removed

Browse source
This commit is contained in:
Bertrand Songis 2018-08-05 14:22:23 +02:00
parent de8f9ebac9
commit 94f9eb7a35
5 changed files with 5 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/datastructs.h
View file

@ -612,8 +612,6 @@ PACK(struct TrainerData {
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define SPLASH_MODE uint8_t splashSpares:3 #define SPLASH_MODE uint8_t splashSpares:3
#elif defined(FSPLASH)
#define SPLASH_MODE uint8_t splashMode:3
#else #else
#define SPLASH_MODE int8_t splashMode:3 #define SPLASH_MODE int8_t splashMode:3
#endif #endif

4
radio/src/gui/128x64/radio_setup.cpp
View file

@ -36,7 +36,7 @@ const unsigned char sticks[] = {
value = editChoice(RADIO_SETUP_2ND_COLUMN, y, label, NULL, tmp, -2, +2, attr, event); \ value = editChoice(RADIO_SETUP_2ND_COLUMN, y, label, NULL, tmp, -2, +2, attr, event); \
} }
#if defined(SPLASH) && !defined(FSPLASH) #if defined(SPLASH)
#define CASE_SPLASH_PARAM(x) x, #define CASE_SPLASH_PARAM(x) x,
#else #else
#define CASE_SPLASH_PARAM(x) #define CASE_SPLASH_PARAM(x)
@ -451,7 +451,7 @@ void menuRadioSetup(event_t event)
break; break;
#endif #endif
#if defined(SPLASH) && !defined(FSPLASH) #if defined(SPLASH)
case ITEM_SETUP_DISABLE_SPLASH: case ITEM_SETUP_DISABLE_SPLASH:
{ {
lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN); lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN);

4
radio/src/gui/212x64/radio_setup.cpp
View file

@ -36,7 +36,7 @@ const unsigned char sticks[] = {
value = editChoice(RADIO_SETUP_2ND_COLUMN, y, label, NULL, tmp, -2, +2, attr, event); \ value = editChoice(RADIO_SETUP_2ND_COLUMN, y, label, NULL, tmp, -2, +2, attr, event); \
} }
#if defined(SPLASH) && !defined(FSPLASH) #if defined(SPLASH)
#define CASE_SPLASH_PARAM(x) x, #define CASE_SPLASH_PARAM(x) x,
#else #else
#define CASE_SPLASH_PARAM(x) #define CASE_SPLASH_PARAM(x)
@ -395,7 +395,7 @@ void menuRadioSetup(event_t event)
break; break;
#endif #endif
#if defined(SPLASH) && !defined(FSPLASH) #if defined(SPLASH)
case ITEM_SETUP_DISABLE_SPLASH: case ITEM_SETUP_DISABLE_SPLASH:
{ {
lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN); lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN);

11
radio/src/opentx.cpp
View file

@ -759,7 +759,7 @@ void doSplash()
drawSplash(); drawSplash();
#if defined(PCBSKY9X) #if defined(PCBSKY9X)
tmr10ms_t curTime = get_tmr10ms() + 10; tmr10ms_t curTime = get_tmr10ms() + 10;
uint8_t contrast = 10; uint8_t contrast = 10;
lcdSetRefVolt(contrast); lcdSetRefVolt(contrast);
@ -776,17 +776,8 @@ void doSplash()
getADC(); getADC();
#if defined(FSPLASH)
// Splash is forced, we can't skip it
if (!(g_eeGeneral.splashMode & 0x04)) {
#endif
if (keyDown() || inputsMoved()) return; if (keyDown() || inputsMoved()) return;
#if defined(FSPLASH)
}
#endif
#if defined(PWR_BUTTON_PRESS) #if defined(PWR_BUTTON_PRESS)
uint32_t pwr_check = pwrCheck(); uint32_t pwr_check = pwrCheck();
if (pwr_check == e_power_off) { if (pwr_check == e_power_off) {

2
radio/src/opentx.h
View file

@ -365,8 +365,6 @@ extern uint8_t channel_order(uint8_t x);
#if defined(PCBHORUS) #if defined(PCBHORUS)
#define SPLASH_TIMEOUT 0 /* we use the splash duration to load stuff from the SD */ #define SPLASH_TIMEOUT 0 /* we use the splash duration to load stuff from the SD */
#elif defined(FSPLASH)
#define SPLASH_TIMEOUT (g_eeGeneral.splashMode == 0 ? 60000/*infinite=10mn*/ : ((4*100) * (g_eeGeneral.splashMode & 0x03)))
#elif defined(PCBTARANIS) #elif defined(PCBTARANIS)
#define SPLASH_TIMEOUT (g_eeGeneral.splashMode==-4 ? 1500 : (g_eeGeneral.splashMode<=0 ? (400-g_eeGeneral.splashMode*200) : (400-g_eeGeneral.splashMode*100))) #define SPLASH_TIMEOUT (g_eeGeneral.splashMode==-4 ? 1500 : (g_eeGeneral.splashMode<=0 ? (400-g_eeGeneral.splashMode*200) : (400-g_eeGeneral.splashMode*100)))
#else #else