From a32a431436f7caff31329f8ea32d95f68fca7e32 Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 15 May 2020 14:52:33 +0200 Subject: [PATCH] Improve Batt and Batt charging icon (#7584) --- radio/src/bitmaps/480x272/mask_txbat.png | Bin 601 -> 310 bytes .../bitmaps/480x272/mask_txbat_charging.png | Bin 4967 -> 553 bytes radio/src/gui/480x272/topbar.cpp | 16 ++++++++-------- 3 files changed, 8 insertions(+), 8 deletions(-) mode change 100755 => 100644 radio/src/bitmaps/480x272/mask_txbat_charging.png diff --git a/radio/src/bitmaps/480x272/mask_txbat.png b/radio/src/bitmaps/480x272/mask_txbat.png index fd59391909622330e0a5cfd8db19de74edd4a0c3..001d2751c03e3587780330fff21ee326b0d992a0 100644 GIT binary patch delta 237 zcmVST6hzNoh7Jjd5*mbP zn8BiED8^tYXlU4g9s~@)u|ObEV&Wn>$=%7%r~gk@Bnbx+IFd84ilT_V?*jm|*2wc5 zp67jZsWAq1U0;LKG-coSR?}2fg|=-kJz7K%hT->Td$<1o(2jn^AMEh~V-VAl6@Z1l00000NkvXXu0mjf)2(Xz delta 531 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 diff --git a/radio/src/gui/480x272/topbar.cpp b/radio/src/gui/480x272/topbar.cpp index 81b1f643a..f78174aa8 100644 --- a/radio/src/gui/480x272/topbar.cpp +++ b/radio/src/gui/480x272/topbar.cpp @@ -91,18 +91,18 @@ void drawTopBar() /* Tx battery */ uint8_t bars = GET_TXBATT_BARS(5); #if defined(USB_CHARGER) - if (usbChargerLed() && BLINK_ON_PHASE) { - lcdDrawBitmapPattern(LCD_W-130, 24, LBM_TOPMENU_TXBATT_CHARGING, MENU_TITLE_COLOR); + if (usbChargerLed()) { + lcdDrawBitmapPattern(LCD_W - 130, 25, LBM_TOPMENU_TXBATT_CHARGING, MENU_TITLE_COLOR); } else { -#endif - lcdDrawBitmapPattern(LCD_W - 130, 24, LBM_TOPMENU_TXBATT, MENU_TITLE_COLOR); - for (unsigned int i = 0; i < 5; i++) { - lcdDrawSolidFilledRect(LCD_W - 122 + 4 * i, 30, 2, 8, i >= bars ? MENU_TITLE_DISABLE_COLOR : MENU_TITLE_COLOR); - } -#if defined(USB_CHARGER) + lcdDrawBitmapPattern(LCD_W - 130, 25, LBM_TOPMENU_TXBATT, MENU_TITLE_COLOR); } +#else + lcdDrawBitmapPattern(LCD_W - 130, 25, LBM_TOPMENU_TXBATT, MENU_TITLE_COLOR); #endif + for (unsigned int i = 0; i < 5; i++) { + lcdDrawSolidFilledRect(LCD_W - 128 + 4 * i, 30, 2, 8, i >= bars ? MENU_TITLE_DISABLE_COLOR : MENU_TITLE_COLOR); + } topbar->refresh(); #if 0