Add EdgeTX B&W splashes and remove vendor specific branding

New EdgeTX splash screen logos and remove vendor specific branding

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();

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

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);

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

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;