fix(color): load bootloader bitmaps in bootloaderInitScreen() (#6177)

This commit is contained in:
Raphael Coeffic
2025-05-12 15:00:37 +10:00
committed by GitHub
parent ae2fd600a7
commit bca86d8819
6 changed files with 25 additions and 15 deletions
@@ -34,12 +34,12 @@
const uint8_t __bmp_plug_usb[] {
#include "bmp_plug_usb.lbm"
};
LZ4BitmapBuffer BMP_PLUG_USB(BMP_ARGB4444, (LZ4Bitmap*)__bmp_plug_usb);
LZ4BitmapBuffer BMP_PLUG_USB(BMP_ARGB4444);
const uint8_t __bmp_usb_plugged[] {
#include "bmp_usb_plugged.lbm"
};
LZ4BitmapBuffer BMP_USB_PLUGGED(BMP_ARGB4444, (LZ4Bitmap*)__bmp_usb_plugged);
LZ4BitmapBuffer BMP_USB_PLUGGED(BMP_ARGB4444);
#define BL_GREEN COLOR2FLAGS(RGB(73, 219, 62))
#define BL_RED COLOR2FLAGS(RGB(229, 32, 30))
@@ -102,6 +102,9 @@ extern BitmapBuffer * lcd;
void bootloaderInitScreen()
{
BMP_PLUG_USB.load((LZ4Bitmap*)__bmp_plug_usb);
BMP_USB_PLUGGED.load((LZ4Bitmap*)__bmp_usb_plugged);
lcdInitDisplayDriver();
}
@@ -45,12 +45,12 @@
const uint8_t __bmp_plug_usb[] {
#include "bmp_plug_usb.lbm"
};
LZ4BitmapBuffer BMP_PLUG_USB(BMP_ARGB4444, (LZ4Bitmap*)__bmp_plug_usb);
LZ4BitmapBuffer BMP_PLUG_USB(BMP_ARGB4444);
const uint8_t __bmp_usb_plugged[] {
#include "bmp_usb_plugged.lbm"
};
LZ4BitmapBuffer BMP_USB_PLUGGED(BMP_ARGB4444, (LZ4Bitmap*)__bmp_usb_plugged);
LZ4BitmapBuffer BMP_USB_PLUGGED(BMP_ARGB4444);
#define BL_GREEN COLOR2FLAGS(RGB(73, 219, 62))
#define BL_RED COLOR2FLAGS(RGB(229, 32, 30))
@@ -64,6 +64,9 @@ static bool rfUsbAccess = false;
void bootloaderInitScreen()
{
BMP_PLUG_USB.load((LZ4Bitmap*)__bmp_plug_usb);
BMP_USB_PLUGGED.load((LZ4Bitmap*)__bmp_usb_plugged);
lcdInitDisplayDriver();
setHatsAsKeys(true);
}
@@ -44,12 +44,12 @@
const uint8_t __bmp_plug_usb[] {
#include "bmp_plug_usb.lbm"
};
LZ4BitmapBuffer BMP_PLUG_USB(BMP_ARGB4444, (LZ4Bitmap*)__bmp_plug_usb);
LZ4BitmapBuffer BMP_PLUG_USB(BMP_ARGB4444);
const uint8_t __bmp_usb_plugged[] {
#include "bmp_usb_plugged.lbm"
};
LZ4BitmapBuffer BMP_USB_PLUGGED(BMP_ARGB4444, (LZ4Bitmap*)__bmp_usb_plugged);
LZ4BitmapBuffer BMP_USB_PLUGGED(BMP_ARGB4444);
#define BL_GREEN COLOR2FLAGS(RGB(73, 219, 62))
#define BL_RED COLOR2FLAGS(RGB(229, 32, 30))
@@ -67,6 +67,9 @@ extern BitmapBuffer * lcd;
void bootloaderInitScreen()
{
BMP_PLUG_USB.load((LZ4Bitmap*)__bmp_plug_usb);
BMP_USB_PLUGGED.load((LZ4Bitmap*)__bmp_usb_plugged);
lcdInitDisplayDriver();
#if defined(USE_HATS_AS_KEYS)
setHatsAsKeys(true);
@@ -31,9 +31,6 @@
#include <lvgl/lvgl.h>
// #define USB_SW_TO_INTERNAL_MODULE() bsp_output_set(BSP_USB_SW);
// #define USB_SW_TO_MCU() bsp_output_clear(BSP_USB_SW);
#define SELECTED_COLOR (INVERS | COLOR_THEME_SECONDARY1)
#define DEFAULT_PADDING 28
#define DOUBLE_PADDING 56
@@ -47,8 +44,6 @@
extern BitmapBuffer* lcd;
// static bool rfUsbAccess = false;
void bootloaderInitScreen()
{
lcdInitDisplayDriver();