From 60ad2473156c5432accab1ec4ee5512382216f66 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 19 Jun 2019 18:22:15 +0200 Subject: [PATCH] Cosmetics --- radio/src/opentx.cpp | 24 +++--------------------- radio/src/sdcard.cpp | 2 +- radio/src/targets/horus/board.h | 1 - radio/src/targets/sky9x/board.cpp | 2 ++ radio/src/targets/sky9x/board.h | 2 -- radio/src/targets/taranis/board.cpp | 2 +- radio/src/targets/taranis/board.h | 1 - 7 files changed, 7 insertions(+), 27 deletions(-) diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 62af6d9e6..d43959145 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -1819,9 +1819,9 @@ void opentxInit() #endif currentSpeakerVolume = requiredSpeakerVolume = g_eeGeneral.speakerVolume + VOLUME_LEVEL_DEF; - #if !defined(SOFTWARE_VOLUME) - setScaledVolume(currentSpeakerVolume); - #endif +#if !defined(SOFTWARE_VOLUME) + setScaledVolume(currentSpeakerVolume); +#endif referenceSystemAudioFiles(); audioQueue.start(); @@ -1890,7 +1890,6 @@ int main() #if defined(PCBTARANIS) g_eeGeneral.contrast = LCD_CONTRAST_DEFAULT; #endif - wdt_disable(); boardInit(); @@ -1898,31 +1897,14 @@ int main() loadFonts(); #endif -#if defined(GUI) && !defined(PCBTARANIS) && !defined(PCBHORUS) - // TODO remove this - lcdInit(); -#endif - #if !defined(SIMU) stackPaint(); #endif -#if defined(GUI) && !defined(PCBTARANIS) - // lcdSetRefVolt(25); -#endif - #if defined(SPLASH) && (defined(PCBTARANIS) || defined(PCBHORUS)) drawSplash(); #endif -#if defined(DSM2_SERIAL) && !defined(TELEMETRY_FRSKY) - DSM2_Init(); -#endif - -#if defined(MENU_ROTARY_SW) - init_rotary_sw(); -#endif - #if defined(PCBHORUS) if (!IS_FIRMWARE_COMPATIBLE_WITH_BOARD()) { runFatalErrorScreen(STR_WRONG_PCBREV); diff --git a/radio/src/sdcard.cpp b/radio/src/sdcard.cpp index 59a2f239b..60948c913 100644 --- a/radio/src/sdcard.cpp +++ b/radio/src/sdcard.cpp @@ -77,7 +77,7 @@ bool isFileAvailable(const char * path, bool exclDir) FILINFO fno; return (f_stat(path, &fno) == FR_OK && !(fno.fattrib & AM_DIR)); } - return f_stat(path, 0) == FR_OK; + return f_stat(path, nullptr) == FR_OK; } /** diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h index 60c98b9fd..48ef15a92 100644 --- a/radio/src/targets/horus/board.h +++ b/radio/src/targets/horus/board.h @@ -343,7 +343,6 @@ extern uint32_t powerupReason; #define DIRTY_SHUTDOWN 0xCAFEDEAD #define NORMAL_POWER_OFF ~DIRTY_SHUTDOWN -#define wdt_disable() void watchdogInit(unsigned int duration); #if defined(SIMU) #define WAS_RESET_BY_WATCHDOG() (false) diff --git a/radio/src/targets/sky9x/board.cpp b/radio/src/targets/sky9x/board.cpp index d25f83fda..776d050a4 100644 --- a/radio/src/targets/sky9x/board.cpp +++ b/radio/src/targets/sky9x/board.cpp @@ -401,6 +401,8 @@ void boardInit() rotaryEncoderInit(); #endif + lcdInit(); + init_SDcard(); } #else diff --git a/radio/src/targets/sky9x/board.h b/radio/src/targets/sky9x/board.h index 8846d63ff..58815c2a8 100644 --- a/radio/src/targets/sky9x/board.h +++ b/radio/src/targets/sky9x/board.h @@ -254,11 +254,9 @@ extern "C" { // WDT driver #if defined(WATCHDOG_DISABLED) || defined(SIMU) - #define wdt_disable() #define wdt_enable(x) #define wdt_reset() #else - #define wdt_disable() #define wdt_enable(x) WDT->WDT_MR = 0x3FFF207F #define wdt_reset() WDT->WDT_CR = 0xA5000001 #endif diff --git a/radio/src/targets/taranis/board.cpp b/radio/src/targets/taranis/board.cpp index 585241221..cd7cfec62 100644 --- a/radio/src/targets/taranis/board.cpp +++ b/radio/src/targets/taranis/board.cpp @@ -206,7 +206,7 @@ void boardInit() #if LCD_DEPTH > 1 lcdDrawBitmap(76, 2, bmp_startup, index*60, 60); #else - for(uint8_t i= 0; i < 4; i++) { + for(uint8_t i = 0; i < 4; i++) { if (index >= i) { lcdDrawFilledRect(LCD_W / 2 - 18 + 10 * i, LCD_H / 2 - 3, 6, 6, SOLID, 0); } diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h index 9bb5b94a8..c84d460aa 100644 --- a/radio/src/targets/taranis/board.h +++ b/radio/src/targets/taranis/board.h @@ -502,7 +502,6 @@ uint32_t readTrims(void); #define wdt_enable(x) watchdogInit(x) #define wdt_reset() IWDG->KR = 0xAAAA #endif -#define wdt_disable() void watchdogInit(unsigned int duration); #define WAS_RESET_BY_SOFTWARE() (RCC->CSR & RCC_CSR_SFTRSTF) #define WAS_RESET_BY_WATCHDOG() (RCC->CSR & (RCC_CSR_WDGRSTF | RCC_CSR_WWDGRSTF))