1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00

Cosmetics

This commit is contained in:
Bertrand Songis 2019-08-26 15:27:24 +02:00
parent 1f08f2c315
commit 042e702cda
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
2 changed files with 8 additions and 7 deletions

View file

@ -366,20 +366,21 @@ extern uint8_t channelOrder(uint8_t x);
#define THRCHK_DEADBAND 16 #define THRCHK_DEADBAND 16
inline bool SPLASH_NEEDED()
{
#if defined(COLORLCD) #if defined(COLORLCD)
#define SPLASH_NEEDED() (false) return false;
#elif defined(PCBTARANIS)
#define SPLASH_NEEDED() (g_eeGeneral.splashMode != 3)
#else #else
#define SPLASH_NEEDED() (g_model.moduleData[EXTERNAL_MODULE].type != MODULE_TYPE_DSM2 && !g_eeGeneral.splashMode) return g_eeGeneral.splashMode != 3;
#endif #endif
}
#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(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
#define SPLASH_TIMEOUT (4*100) // 4 seconds #define SPLASH_TIMEOUT (4 * 100) // 4 seconds
#endif #endif
#if defined(ROTARY_ENCODER_NAVIGATION) #if defined(ROTARY_ENCODER_NAVIGATION)

View file

@ -125,7 +125,7 @@ void storageEraseAll(bool warn)
ALERT(STR_STORAGE_WARNING, STR_BAD_RADIO_DATA, AU_BAD_RADIODATA); ALERT(STR_STORAGE_WARNING, STR_BAD_RADIO_DATA, AU_BAD_RADIODATA);
} }
RAISE_ALERT(STR_STORAGE_WARNING, STR_STORAGE_FORMAT, NULL, AU_NONE); RAISE_ALERT(STR_STORAGE_WARNING, STR_STORAGE_FORMAT, nullptr, AU_NONE);
storageFormat(); storageFormat();
storageDirty(EE_GENERAL|EE_MODEL); storageDirty(EE_GENERAL|EE_MODEL);