Merge with latest 2.3

2019-12-13 12:30:02 +01:00
parent 5ffeb7317e 20cc9f9c3f
commit 6cab260ee6
52 changed files with 10502 additions and 7011 deletions
@@ -73,7 +73,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
    lcd->clear(DEFAULT_BGCOLOR);
    
    if (st == ST_START) {
-        bootloaderDrawTitle(88, "OpenTX Bootloader");
+        bootloaderDrawTitle(88, BOOTLOADER_TITLE);
        
        lcd->drawBitmapPattern(90, 72, LBM_FLASH, DEFAULT_COLOR);
        lcd->drawText(124,  75, "Write Firmware");