diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 7b6b0272d..84089d078 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1175,7 +1175,7 @@ void menuModelFailsafe(event_t event) #if defined(PPM_UNIT_PERCENT_PREC1) uint8_t wbar = SLIDER_W-6; #else - uint8_t wbar = SLIDER_W); + uint8_t wbar = SLIDER_W; #endif uint8_t xValue = x+LCD_W-4-wbar; diff --git a/radio/src/gui/480x272/lcd.cpp b/radio/src/gui/480x272/lcd.cpp index 361bb7e2c..b87e1904b 100644 --- a/radio/src/gui/480x272/lcd.cpp +++ b/radio/src/gui/480x272/lcd.cpp @@ -238,7 +238,7 @@ void putsStickName(coord_t x, coord_t y, uint8_t idx, LcdFlags att) lcdDrawSizedText(x, y, STR_VSRCRAW+2+length*(idx+1), length-1, att); } -void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags flags) +void drawSource(coord_t x, coord_t y, mixsrc_t idx, LcdFlags flags) { char s[16]; getSourceString(s, idx); diff --git a/radio/src/gui/480x272/lcd.h b/radio/src/gui/480x272/lcd.h index 2abcfbcd4..5c54734bb 100644 --- a/radio/src/gui/480x272/lcd.h +++ b/radio/src/gui/480x272/lcd.h @@ -134,7 +134,7 @@ void lcdDrawNumber(coord_t x, coord_t y, int32_t val, LcdFlags flags=0, uint8_t void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att); void putsStickName(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0); void drawSwitch(coord_t x, coord_t y, swsrc_t swtch, LcdFlags flags=0); -void drawSource(coord_t x, coord_t y, uint32_t idx, LcdFlags att=0); +void drawSource(coord_t x, coord_t y, mixsrc_t idx, LcdFlags att=0); void drawCurveName(coord_t x, coord_t y, int8_t idx, LcdFlags att=0); void drawTimerMode(coord_t x, coord_t y, int32_t mode, LcdFlags att=0); void drawTrimMode(coord_t x, coord_t y, uint8_t phase, uint8_t idx, LcdFlags att); diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index fadb35834..8d6afd466 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -2572,7 +2572,7 @@ int main() // lcdSetRefVolt(25); #endif -#if defined(PCBTARANIS) || defined(PCBHORUS) +#if defined(SPLASH) && (defined(PCBTARANIS) || defined(PCBHORUS)) drawSplash(); #endif diff --git a/radio/src/targets/horus/diskio.cpp b/radio/src/targets/horus/diskio.cpp index 3230b7801..d8a4cbdb4 100644 --- a/radio/src/targets/horus/diskio.cpp +++ b/radio/src/targets/horus/diskio.cpp @@ -310,7 +310,7 @@ DRESULT disk_ioctl ( FATFS g_FATFS_Obj __DMA; #if defined(LOG_TELEMETRY) -FIL g_telemetryFile = {0}; +FIL g_telemetryFile = {}; #endif void sdInit() diff --git a/radio/src/targets/taranis/diskio.cpp b/radio/src/targets/taranis/diskio.cpp index 4ebe33623..a67c47eaa 100644 --- a/radio/src/targets/taranis/diskio.cpp +++ b/radio/src/targets/taranis/diskio.cpp @@ -978,7 +978,7 @@ void sdPoll10ms() FATFS g_FATFS_Obj; #if defined(LOG_TELEMETRY) -FIL g_telemetryFile = {0}; +FIL g_telemetryFile = {}; #endif #if defined(BOOT)