diff --git a/radio/src/bitmaps/128x64/splash.png b/radio/src/bitmaps/128x64/splash.png index 64ebfb9d5..ebb8ecad7 100644 Binary files a/radio/src/bitmaps/128x64/splash.png and b/radio/src/bitmaps/128x64/splash.png differ diff --git a/radio/src/bitmaps/128x64/splash_frsky.png b/radio/src/bitmaps/128x64/splash_frsky.png deleted file mode 100644 index 84b3cf5e4..000000000 Binary files a/radio/src/bitmaps/128x64/splash_frsky.png and /dev/null differ diff --git a/radio/src/bitmaps/212x64/logo.png b/radio/src/bitmaps/212x64/logo.png index ae8b9e8e5..50ed47ed7 100644 Binary files a/radio/src/bitmaps/212x64/logo.png and b/radio/src/bitmaps/212x64/logo.png differ diff --git a/radio/src/bitmaps/212x64/splash.png b/radio/src/bitmaps/212x64/splash.png index 43cd387dc..9eac084cd 100644 Binary files a/radio/src/bitmaps/212x64/splash.png and b/radio/src/bitmaps/212x64/splash.png differ diff --git a/radio/src/bitmaps/212x64/splash_frsky.png b/radio/src/bitmaps/212x64/splash_frsky.png deleted file mode 100644 index 37c410f47..000000000 Binary files a/radio/src/bitmaps/212x64/splash_frsky.png and /dev/null differ diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h index 59648a0f9..6675f252d 100644 --- a/radio/src/gui/128x64/gui.h +++ b/radio/src/gui/128x64/gui.h @@ -288,7 +288,6 @@ void drawCheckBox(coord_t x, coord_t y, uint8_t value, LcdFlags attr); extern const unsigned char sticks[] ; void drawSplash(); -void drawSecondSplash(); void drawScreenIndex(uint8_t index, uint8_t count, uint8_t attr); void drawStick(coord_t centrex, int16_t xval, int16_t yval); void drawPotsBars(); diff --git a/radio/src/gui/128x64/splash.cpp b/radio/src/gui/128x64/splash.cpp index d30fa7def..3f507ffbc 100644 --- a/radio/src/gui/128x64/splash.cpp +++ b/radio/src/gui/128x64/splash.cpp @@ -35,27 +35,13 @@ void drawSplash() #if MENUS_LOCK == 1 if (readonly == false) { - lcdDrawFilledRect((LCD_W-(sizeof(TR_UNLOCKED)-1)*FW)/2 - 9, 50, (sizeof(TR_UNLOCKED)-1)*FW+16, 11, SOLID, ERASE|ROUND); - lcdDrawText((LCD_W-(sizeof(TR_UNLOCKED)-1)*FW)/2 , 53, STR_UNLOCKED); + lcdDrawFilledRect((LCD_W - (sizeof(TR_UNLOCKED) - 1) * FW) / 2 - 9, 50, + (sizeof(TR_UNLOCKED) - 1) * FW + 16, 11, SOLID, + ERASE | ROUND); + lcdDrawText((LCD_W - (sizeof(TR_UNLOCKED) - 1) * FW) / 2, 53, STR_UNLOCKED); } #endif lcdRefresh(); } #endif - -#if defined(FRSKY_RELEASE) -const unsigned char splashdata2[] = { - 'S','F','S',0, - #include "bitmaps/128x64/splash_frsky.lbm" - 'S','F','E',0 }; - -const unsigned char * const splash2_lbm = splashdata2+4; - -void drawSecondSplash() -{ - lcdClear(); - lcdDraw1bitBitmap(0, 0, splash2_lbm, 0, 0); - lcdRefresh(); -} -#endif diff --git a/radio/src/gui/212x64/gui.h b/radio/src/gui/212x64/gui.h index c9006446b..f1e607646 100644 --- a/radio/src/gui/212x64/gui.h +++ b/radio/src/gui/212x64/gui.h @@ -64,7 +64,6 @@ extern uint8_t noHighlightCounter; void drawCheckBox(coord_t x, coord_t y, uint8_t value, LcdFlags attr); void drawSlider(coord_t x, coord_t y, uint8_t value, uint8_t max, uint8_t attr); void drawSplash(); -void drawSecondSplash(); void drawScreenIndex(uint8_t index, uint8_t count, uint8_t attr); void drawVerticalScrollbar(coord_t x, coord_t y, coord_t h, uint16_t offset, uint16_t count, uint8_t visible); void drawGauge(coord_t x, coord_t y, coord_t w, coord_t h, int32_t val, int32_t max); diff --git a/radio/src/gui/212x64/splash.cpp b/radio/src/gui/212x64/splash.cpp index f9938c0c1..0de33f1d2 100644 --- a/radio/src/gui/212x64/splash.cpp +++ b/radio/src/gui/212x64/splash.cpp @@ -34,26 +34,13 @@ void drawSplash() #if MENUS_LOCK == 1 if (readonly == false) { - lcdDrawFilledRect((LCD_W-(sizeof(TR_UNLOCKED)-1)*FW)/2 - 9, 50, (sizeof(TR_UNLOCKED)-1)*FW+16, 11, SOLID, ERASE|ROUND); - lcdDrawText((LCD_W-(sizeof(TR_UNLOCKED)-1)*FW)/2 , 53, STR_UNLOCKED); + lcdDrawFilledRect((LCD_W - (sizeof(TR_UNLOCKED) - 1) * FW) / 2 - 9, 50, + (sizeof(TR_UNLOCKED) - 1) * FW + 16, 11, SOLID, + ERASE | ROUND); + lcdDrawText((LCD_W - (sizeof(TR_UNLOCKED) - 1) * FW) / 2, 53, STR_UNLOCKED); } #endif lcdRefresh(); } #endif - -#if defined(FRSKY_RELEASE) -const unsigned char splashdata2[] = { - 'S','F','S',0, - #include "bitmaps/212x64/splash_frsky.lbm" - 'S','F','E',0 }; -const unsigned char * const splash2_lbm = splashdata2+4; - -void drawSecondSplash() -{ - lcdClear(); - lcdDrawBitmap(0, 0, splash2_lbm); - lcdRefresh(); -} -#endif diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 4c421e52e..0453b2517 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -630,14 +630,6 @@ void doSplash() } #endif -#if defined(FRSKY_RELEASE) && !defined(COLORLCD) - static uint8_t secondSplash = false; - if (!secondSplash && get_tmr10ms() >= tgtime-200) { - secondSplash = true; - drawSecondSplash(); - } -#endif - #if defined(PCBSKY9X) if (curTime < get_tmr10ms()) { curTime += 10;