From d0c40777e2dcdcef58a5270f1994a92925326cea Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sun, 9 May 2021 08:47:58 +0200 Subject: [PATCH] Use transparent bitmaps in bootloader --- radio/src/bitmaps/480x272/CMakeLists.txt | 2 +- .../480x272/bootloader/bmp_plug_usb.png | Bin 9330 -> 14183 bytes .../480x272/bootloader/bmp_usb_plugged.png | Bin 3722 -> 4187 bytes .../targets/horus/bootloader/boot_menu.cpp | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/bitmaps/480x272/CMakeLists.txt b/radio/src/bitmaps/480x272/CMakeLists.txt index 61491ed6f..e5cc2e7eb 100644 --- a/radio/src/bitmaps/480x272/CMakeLists.txt +++ b/radio/src/bitmaps/480x272/CMakeLists.txt @@ -26,7 +26,7 @@ add_bitmaps_target(${BITMAP_TARGET_PREFIX}_layouts_masks "${RADIO_SRC_DIR}/gui/c add_bitmaps_target(${BITMAP_TARGET_PREFIX}_themes_bitmaps "${RADIO_SRC_DIR}/gui/colorlcd/themes/*.png" "5/6/5" "${BITMAPS_ARGS}") add_bitmaps_target(${BITMAP_TARGET_PREFIX}_fonts ${RADIO_SRC_DIR}/fonts/truetype/*.png 8bits "${MASK_RLE_ARGS}") add_bitmaps_target(${BITMAP_TARGET_PREFIX}_volume_masks ${RADIO_SRC_DIR}/bitmaps/480x272/volume/*.png 8bits "${MASK_ARGS}") -add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_bitmaps ${RADIO_SRC_DIR}/bitmaps/480x272/bootloader/bmp_*.png "5/6/5" "${BITMAP_RLE_ARGS}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_bitmaps ${RADIO_SRC_DIR}/bitmaps/480x272/bootloader/bmp_*.png "4/4/4/4" "${BITMAP_RLE_ARGS}") add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_icons ${RADIO_SRC_DIR}/bitmaps/480x272/bootloader/icon_*.png 8bits "${MASK_ARGS}") add_dependencies(${BITMAP_TARGET_PREFIX}_bitmaps ${BITMAP_TARGET_PREFIX}_calibration_bitmaps ${BITMAP_TARGET_PREFIX}_button_bitmaps ${BITMAP_TARGET_PREFIX}_alpha_bitmaps diff --git a/radio/src/bitmaps/480x272/bootloader/bmp_plug_usb.png b/radio/src/bitmaps/480x272/bootloader/bmp_plug_usb.png index 0f6015747a24a0f6ea8a7feb1f5e6d7be5b3e376..17a5d209b963a5540f99772c1c8762028c63f6ea 100644 GIT binary patch literal 14183 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 Cz!N?I literal 9330 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 diff --git a/radio/src/bitmaps/480x272/bootloader/bmp_usb_plugged.png b/radio/src/bitmaps/480x272/bootloader/bmp_usb_plugged.png index f374f5b77e48920a351f088e4f38a3ea8aede2aa..12e2aa024e5df832a731a23f6c35942f31177acb 100644 GIT binary patch literal 4187 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 delta 3702 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 U9v<#ZG5`Po07*qoM6N<$f}p)DZ2$lO diff --git a/radio/src/targets/horus/bootloader/boot_menu.cpp b/radio/src/targets/horus/bootloader/boot_menu.cpp index 42ada3317..75aca7a44 100644 --- a/radio/src/targets/horus/bootloader/boot_menu.cpp +++ b/radio/src/targets/horus/bootloader/boot_menu.cpp @@ -7,12 +7,12 @@ const uint8_t __bmp_plug_usb_rle[] { #include "bmp_plug_usb.lbm" }; -RLEBitmap BMP_PLUG_USB(BMP_RGB565, __bmp_plug_usb_rle); +RLEBitmap BMP_PLUG_USB(BMP_ARGB4444, __bmp_plug_usb_rle); const uint8_t __bmp_usb_plugged_rle[] { #include "bmp_usb_plugged.lbm" }; -RLEBitmap BMP_USB_PLUGGED(BMP_RGB565, __bmp_usb_plugged_rle); +RLEBitmap BMP_USB_PLUGGED(BMP_ARGB4444, __bmp_usb_plugged_rle); const uint8_t LBM_FLASH[] = { #include "icon_flash.lbm"