piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Cosmetics

Browse Source
This commit is contained in:
Bertrand Songis
2019-08-26 15:27:24 +02:00
parent 1f08f2c315
commit 042e702cda
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.h
+7 -6
View File
@@ -366,20 +366,21 @@ extern uint8_t channelOrder(uint8_t x);
#define THRCHK_DEADBAND 16
inline bool SPLASH_NEEDED()
{
#if defined(COLORLCD)
#define SPLASH_NEEDED() (false)
#elif defined(PCBTARANIS)
#define SPLASH_NEEDED() (g_eeGeneral.splashMode != 3)
return false;
#else
#define SPLASH_NEEDED() (g_model.moduleData[EXTERNAL_MODULE].type != MODULE_TYPE_DSM2 && !g_eeGeneral.splashMode)
return g_eeGeneral.splashMode != 3;
#endif
}
#if defined(PCBHORUS)
#define SPLASH_TIMEOUT 0 /* we use the splash duration to load stuff from the SD */
#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
#define SPLASH_TIMEOUT (4*100) // 4 seconds
#define SPLASH_TIMEOUT (4 * 100) // 4 seconds
#endif
#if defined(ROTARY_ENCODER_NAVIGATION)
radio/src/storage/eeprom_common.cpp
+1 -1
View File
@@ -125,7 +125,7 @@ void storageEraseAll(bool warn)
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();
storageDirty(EE_GENERAL|EE_MODEL);