chore(color): support alternative LCD sizes (320x240, 800x480) (#6012)

This commit is contained in:
philmoz
2025-03-31 15:04:54 +10:00
committed by GitHub
parent 65028ddcdf
commit a830a55087
476 changed files with 371650 additions and 817 deletions
+8 -2
View File
@@ -48,7 +48,6 @@ if (PCB STREQUAL X10)
set(PCBREV "STD" CACHE STRING "PCB Revision")
add_definitions(-DSOFTWARE_VOLUME)
set(BITMAPS_TARGET x10_bitmaps)
set(FONTS_TARGET x10_fonts)
if (PCBREV STREQUAL EXPRESS)
@@ -174,11 +173,18 @@ elseif (PCB STREQUAL X12S)
set(AUX2_SERIAL ON) # wire to GPS
set(USE_VS1053B ON)
set(USE_ADS79xx ON)
set(BITMAPS_TARGET x12s_bitmaps)
set(FONTS_TARGET x12s_fonts)
add_definitions(-DMANUFACTURER_FRSKY)
endif()
if (BITMAPS_DIR STREQUAL 320x240)
set(BITMAPS_TARGET bm320_bitmaps)
elseif (BITMAPS_DIR STREQUAL 800x480)
set(BITMAPS_TARGET bm800_bitmaps)
else()
set(BITMAPS_TARGET bm480_bitmaps)
endif()
add_definitions(-DPCB${PCB})
add_definitions(-DPCBREV=${PCBREV})
add_definitions(-DPCBREV_${PCBREV})
+111 -58
View File
@@ -22,6 +22,7 @@
#include "board.h"
#include "fw_version.h"
#include "lcd.h"
#include "etx_lv_theme.h"
#include "translations.h"
@@ -46,6 +47,58 @@ LZ4BitmapBuffer BMP_USB_PLUGGED(BMP_ARGB4444, (LZ4Bitmap*)__bmp_usb_plugged);
#define BL_FOREGROUND COLOR_WHITE
#define BL_SELECTED COLOR2FLAGS(RGB(11, 65, 244)) // deep blue
LAYOUT_VAL(LINE_X1, 28, 28, LS(28))
LAYOUT_VAL(LINE_W, 422, 422, LS(422))
LAYOUT_VAL(LINE_H, 2, 2, 2)
LAYOUT_VAL(TITLE_X1, 88, 88, LS(88))
LAYOUT_VAL(TITLE_Y1, 28, 28, LS(28))
LAYOUT_VAL(TITLE_Y2, 56, 56, LS(56))
LAYOUT_VAL(FOOTER_Y1, 30, 30, LS(30))
LAYOUT_VAL(FOOTER_Y2, 38, 38, LS(38))
LAYOUT_VAL(SYM_X, 102, 102, LS(102))
LAYOUT_VAL(SYM_X2, 100, 100, LS(100))
LAYOUT_VAL(LBL_X, 124, 124, LS(124))
LAYOUT_VAL(SYM_Y, 75, 75, LS(75))
LAYOUT_VAL(SYM_H, 35, 35, LS(35))
LAYOUT_VAL(BOX_GAP, 8, 8, LS(8))
LAYOUT_VAL(BOX_Y, 72, 72, LS(72))
LAYOUT_VAL(BOX_H, 26, 26, LS(26))
LAYOUT_VAL(OPTBOX_X, 92, 92, LS(92))
LAYOUT_VAL(USB_ICN_X, 60, 60, LS(60))
LAYOUT_VAL(USB_PLG_X, 136, 136, LS(136))
LAYOUT_VAL(USB_ICN_Y, 106, 106, LS(106))
LAYOUT_VAL(USB_TXT_X, 195, 195, LS(195))
LAYOUT_VAL(USB_TXT_Y1, 97, 97, LS(97))
LAYOUT_VAL(USB_TXT_Y2, 72, 72, LS(72))
LAYOUT_VAL(FILENAM_X1, 94, 94, LS(94))
LAYOUT_VAL(FILENAM_X2, 124, 124, LS(124))
LAYOUT_VAL(FILENAM_Y1, 75, 75, LS(75))
LAYOUT_VAL(FILENAM_H, 25, 25, LS(25))
LAYOUT_VAL(FILESEL_X, 119, 119, LS(119))
LAYOUT_VAL(FILESEL_W, 278, 278, LS(278))
LAYOUT_VAL(NLSYM_X, 305, 305, LS(305))
LAYOUT_VAL(RTNTXT_X, 335, 335, LS(335))
LAYOUT_VAL(DIRMSG_X, 90, 90, LS(90))
LAYOUT_VAL(DIRMSG_Y, 168, 168, LS(168))
LAYOUT_VAL(PROGRESS_X, 70, 70, LS(70))
LAYOUT_VAL(PROGRESS_W, 340, 340, LS(340))
LAYOUT_VAL(PROGRESS_H, 31, 31, LS(31))
LAYOUT_VAL(VERCHK_X, 168, 168, LS(168))
LAYOUT_VAL(VERCHK_Y, 138, 138, LS(138))
LAYOUT_VAL(VERCHK_H, 20, 20, LS(20))
LAYOUT_VAL(VERCHK_ICN_X, 78, 78, LS(78))
extern BitmapBuffer * lcd;
void bootloaderInitScreen()
@@ -55,13 +108,13 @@ void bootloaderInitScreen()
static void bootloaderDrawTitle(unsigned int x, const char* text)
{
lcd->drawText(x, 28, text, BL_FOREGROUND);
lcd->drawSolidFilledRect(28, 56, 422, 2, BL_FOREGROUND);
lcd->drawText(x, TITLE_Y1, text, BL_FOREGROUND);
lcd->drawSolidFilledRect(LINE_X1, TITLE_Y2, LINE_W, LINE_H, BL_FOREGROUND);
}
static void bootloaderDrawFooter()
{
lcd->drawSolidFilledRect(28, LCD_H - 38, 422, 2, BL_FOREGROUND);
lcd->drawSolidFilledRect(LINE_X1, LCD_H - FOOTER_Y2, LINE_W, LINE_H, BL_FOREGROUND);
}
static void bootloaderDrawBackground()
@@ -82,71 +135,71 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
}
if (st == ST_START) {
bootloaderDrawTitle(88, BOOTLOADER_TITLE);
bootloaderDrawTitle(TITLE_X1, BOOTLOADER_TITLE);
lcd->drawText(102, 75, LV_SYMBOL_CHARGE, BL_FOREGROUND);
coord_t pos = lcd->drawText(124, 75, TR_BL_WRITE_FW, BL_FOREGROUND);
pos += 8;
lcd->drawText(SYM_X, SYM_Y, LV_SYMBOL_CHARGE, BL_FOREGROUND);
coord_t pos = lcd->drawText(LBL_X, SYM_Y, TR_BL_WRITE_FW, BL_FOREGROUND);
pos += BOX_GAP;
#if defined(SPI_FLASH)
lcd->drawText(102, 110, LV_SYMBOL_SD_CARD, BL_FOREGROUND);
pos = lcd->drawText(124, 110, TR_BL_ERASE_FLASH, BL_FOREGROUND);
pos += 8;
lcd->drawText(SYM_X, SYM_Y + SYM_H, LV_SYMBOL_SD_CARD, BL_FOREGROUND);
pos = lcd->drawText(LBL_X, SYM_Y + SYM_H, TR_BL_ERASE_FLASH, BL_FOREGROUND);
pos += BOX_GAP;
lcd->drawText(100, 145, LV_SYMBOL_NEW_LINE, BL_FOREGROUND);
lcd->drawText(124, 145, TR_BL_EXIT, BL_FOREGROUND);
lcd->drawText(SYM_X2, SYMY + SYM_H * 2, LV_SYMBOL_NEW_LINE, BL_FOREGROUND);
lcd->drawText(LBL_X, SYMY + SYM_H * 2, TR_BL_EXIT, BL_FOREGROUND);
#else
lcd->drawText(100, 110, LV_SYMBOL_NEW_LINE, BL_FOREGROUND);
lcd->drawText(124, 110, TR_BL_EXIT, BL_FOREGROUND);
lcd->drawText(SYM_X2, SYM_Y + SYM_H, LV_SYMBOL_NEW_LINE, BL_FOREGROUND);
lcd->drawText(LBL_X, SYM_Y + SYM_H, TR_BL_EXIT, BL_FOREGROUND);
#endif
pos -= 92;
lcd->drawSolidRect(92, 72 + (opt * 35), pos, 26, 2, BL_SELECTED);
pos -= OPTBOX_X;
lcd->drawSolidRect(OPTBOX_X, BOX_Y + (opt * SYM_H), pos, BOX_H, PAD_TINY, BL_SELECTED);
lcd->drawBitmap(60, LCD_H - 106, (const BitmapBuffer*)&BMP_PLUG_USB);
lcd->drawText(195, LCD_H - 97, TR_BL_USB_PLUGIN, BL_FOREGROUND);
lcd->drawText(195, LCD_H - 72, TR_BL_USB_MASS_STORE, BL_FOREGROUND);
lcd->drawBitmap(USB_ICN_X, LCD_H - USB_ICN_Y, (const BitmapBuffer*)&BMP_PLUG_USB);
lcd->drawText(USB_TXT_X, LCD_H - USB_TXT_Y1, TR_BL_USB_PLUGIN, BL_FOREGROUND);
lcd->drawText(USB_TXT_X, LCD_H - USB_TXT_Y2, TR_BL_USB_MASS_STORE, BL_FOREGROUND);
bootloaderDrawFooter();
lcd->drawText(LCD_W / 2, LCD_H - 30, getFirmwareVersion(), CENTERED | BL_FOREGROUND);
lcd->drawText(LCD_W / 2, LCD_H - FOOTER_Y1, getFirmwareVersion(), CENTERED | BL_FOREGROUND);
}
#if defined(SPI_FLASH)
else if (st == ST_CLEAR_FLASH_CHECK) {
bootloaderDrawTitle(88, TR_BL_ERASE_INT_FLASH);
bootloaderDrawTitle(TITLE_X1, TR_BL_ERASE_INT_FLASH);
lcd->drawText(102, 75, LV_SYMBOL_SD_CARD, BL_FOREGROUND);
coord_t pos = lcd->drawText(124, 75, TR_BL_ERASE_FLASH, BL_FOREGROUND);
pos += 8;
lcd->drawText(SYM_X, SYM_Y, LV_SYMBOL_SD_CARD, BL_FOREGROUND);
coord_t pos = lcd->drawText(LBL_X, SYM_Y, TR_BL_ERASE_FLASH, BL_FOREGROUND);
pos += BOX_GAP;
lcd->drawText(100, 110, LV_SYMBOL_NEW_LINE, BL_FOREGROUND);
lcd->drawText(124, 110, TR_BL_EXIT, BL_FOREGROUND);
lcd->drawText(SYM_X2, SYM_Y + SYM_H, LV_SYMBOL_NEW_LINE, BL_FOREGROUND);
lcd->drawText(LBL_X, SYM_Y + SYM_H, TR_BL_EXIT, BL_FOREGROUND);
pos -= 92;
lcd->drawSolidRect(92, 72 + (opt * 35), pos, 26, 2, BL_SELECTED);
pos -= OPTBOX_X;
lcd->drawSolidRect(OPTBOX_X, BOX_Y + (opt * SYM_H), pos, BOX_H, PAD_TINY, BL_SELECTED);
bootloaderDrawFooter();
lcd->drawText(56, 244,
lcd->drawText(LINE_X1 * 2, 244,
LV_SYMBOL_SD_CARD TR_BL_ERASE_KEY, BL_FOREGROUND);
lcd->drawText(305, 244,
lcd->drawText(NLSYM_X, 244,
LV_SYMBOL_NEW_LINE TR_BL_EXIT_KEY, BL_FOREGROUND);
}
else if (st == ST_CLEAR_FLASH) {
bootloaderDrawTitle(88, TR_BL_ERASE_INT_FLASH);
bootloaderDrawTitle(TITLE_X1, TR_BL_ERASE_INT_FLASH);
lcd->drawText(LCD_W / 2, 75, TR_BL_ERASE_FLASH_MSG, CENTERED | BL_FOREGROUND);
lcd->drawText(LCD_W / 2, SYM_Y, TR_BL_ERASE_FLASH_MSG, CENTERED | BL_FOREGROUND);
bootloaderDrawFooter();
}
#endif
else if (st == ST_USB) {
coord_t y = (LCD_H - BMP_USB_PLUGGED.height()) / 2;
lcd->drawBitmap(136, y, (const BitmapBuffer*)&BMP_USB_PLUGGED);
lcd->drawText(195, y + 30, TR_BL_USB_CONNECTED, BL_FOREGROUND);
lcd->drawBitmap(USB_PLG_X, y, (const BitmapBuffer*)&BMP_USB_PLUGGED);
lcd->drawText(USB_TXT_X, y + FOOTER_Y1, TR_BL_USB_CONNECTED, BL_FOREGROUND);
}
else if (st == ST_FILE_LIST || st == ST_DIR_CHECK || st == ST_FLASH_CHECK ||
st == ST_FLASHING || st == ST_FLASH_DONE) {
bootloaderDrawTitle(88, LV_SYMBOL_SD_CARD " /FIRMWARE");
bootloaderDrawTitle(TITLE_X1, LV_SYMBOL_SD_CARD " /FIRMWARE");
if (st == ST_FLASHING || st == ST_FLASH_DONE) {
LcdFlags color = BL_RED;
@@ -156,21 +209,21 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
opt = 100; // Completed > 100%
}
lcd->drawRect(70, (LCD_H - 31) / 2, 340, 31, 2, SOLID, BL_SELECTED);
lcd->drawSolidFilledRect(74, (LCD_H - 31) / 2 + 4, (332 * opt) / 100, 23, color);
lcd->drawRect(PROGRESS_X, (LCD_H - PROGRESS_H) / 2, PROGRESS_W, PROGRESS_H, LINE_H, SOLID, BL_SELECTED);
lcd->drawSolidFilledRect(PROGRESS_X + PAD_SMALL, (LCD_H - PROGRESS_H) / 2 + PAD_SMALL, ((PROGRESS_W - PAD_SMALL * 2) * opt) / 100, PROGRESS_H - PAD_SMALL * 2, color);
} else if (st == ST_DIR_CHECK) {
if (opt == FR_NO_PATH) {
lcd->drawText(90, 168, LV_SYMBOL_CLOSE TR_BL_DIR_MISSING,
lcd->drawText(DIRMSG_X, DIRMSG_Y, LV_SYMBOL_CLOSE TR_BL_DIR_MISSING,
BL_FOREGROUND);
} else {
lcd->drawText(90, 168, LV_SYMBOL_CLOSE TR_BL_DIR_EMPTY,
lcd->drawText(DIRMSG_X, DIRMSG_Y, LV_SYMBOL_CLOSE TR_BL_DIR_EMPTY,
BL_FOREGROUND);
}
} else if (st == ST_FLASH_CHECK) {
bootloaderDrawFilename(str, 0, true);
if (opt == FC_ERROR) {
lcd->drawText(94, 168, LV_SYMBOL_CLOSE " " TR_BL_INVALID_FIRMWARE,
lcd->drawText(DIRMSG_X, DIRMSG_Y, LV_SYMBOL_CLOSE " " TR_BL_INVALID_FIRMWARE,
BL_FOREGROUND);
} else if (opt == FC_OK) {
VersionTag tag;
@@ -178,19 +231,19 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
getFileFirmwareVersion(&tag);
if (strcmp(tag.flavour, FLAVOUR)) {
lcd->drawText(94, 168, LV_SYMBOL_CLOSE " " TR_BL_INVALID_FIRMWARE,
lcd->drawText(DIRMSG_X, DIRMSG_Y, LV_SYMBOL_CLOSE " " TR_BL_INVALID_FIRMWARE,
BL_FOREGROUND);
} else {
lcd->drawText(168, 138, TR_BL_FORK, RIGHT | BL_FOREGROUND);
lcd->drawSizedText(174, 138, tag.fork, 6, BL_FOREGROUND);
lcd->drawText(VERCHK_X, VERCHK_Y, TR_BL_FORK, RIGHT | BL_FOREGROUND);
lcd->drawSizedText(VERCHK_X + PAD_MEDIUM, VERCHK_Y, tag.fork, 6, BL_FOREGROUND);
lcd->drawText(168, 158, TR_BL_VERSION, RIGHT | BL_FOREGROUND);
lcd->drawText(174, 158, tag.version, BL_FOREGROUND);
lcd->drawText(VERCHK_X, VERCHK_Y + VERCHK_H, TR_BL_VERSION, RIGHT | BL_FOREGROUND);
lcd->drawText(VERCHK_X + PAD_MEDIUM, VERCHK_Y + VERCHK_H, tag.version, BL_FOREGROUND);
lcd->drawText(168, 178, TR_BL_RADIO, RIGHT | BL_FOREGROUND);
lcd->drawText(174, 178, tag.flavour, BL_FOREGROUND);
lcd->drawText(VERCHK_X, VERCHK_Y + VERCHK_H * 2, TR_BL_RADIO, RIGHT | BL_FOREGROUND);
lcd->drawText(VERCHK_X + PAD_MEDIUM, VERCHK_Y + VERCHK_H * 2, tag.flavour, BL_FOREGROUND);
lcd->drawText(78, 158, LV_SYMBOL_OK, BL_GREEN);
lcd->drawText(VERCHK_ICN_X, VERCHK_Y + VERCHK_H, LV_SYMBOL_OK, BL_GREEN);
}
}
}
@@ -199,25 +252,25 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
if ( st != ST_DIR_CHECK && (st != ST_FLASH_CHECK || opt == FC_OK)) {
lcd->drawText(28, LCD_H - 30, LV_SYMBOL_CHARGE, BL_FOREGROUND);
lcd->drawText(LINE_X1, LCD_H - FOOTER_Y1, LV_SYMBOL_CHARGE, BL_FOREGROUND);
if (st == ST_FILE_LIST) {
lcd->drawText(56, LCD_H - 28, TR_BL_SELECT_KEY, BL_FOREGROUND);
lcd->drawText(LINE_X1 * 2, LCD_H - TITLE_Y1, TR_BL_SELECT_KEY, BL_FOREGROUND);
}
else if (st == ST_FLASH_CHECK && opt == FC_OK) {
lcd->drawText(56, LCD_H - 28, TR_BL_FLASH_KEY, BL_FOREGROUND);
lcd->drawText(LINE_X1 * 2, LCD_H - TITLE_Y1, TR_BL_FLASH_KEY, BL_FOREGROUND);
}
else if (st == ST_FLASHING) {
lcd->drawText(56, LCD_H - 28, TR_BL_WRITING_FW, BL_FOREGROUND);
lcd->drawText(LINE_X1 * 2, LCD_H - TITLE_Y1, TR_BL_WRITING_FW, BL_FOREGROUND);
}
else if (st == ST_FLASH_DONE) {
lcd->drawText(56, LCD_H - 28, TR_BL_WRITING_COMPL, BL_FOREGROUND);
lcd->drawText(LINE_X1 * 2, LCD_H - TITLE_Y1, TR_BL_WRITING_COMPL, BL_FOREGROUND);
}
}
if (st != ST_FLASHING) {
lcd->drawText(305, LCD_H - 28, LV_SYMBOL_NEW_LINE, BL_FOREGROUND);
lcd->drawText(335, LCD_H - 28, TR_BL_EXIT_KEY, BL_FOREGROUND);
lcd->drawText(NLSYM_X, LCD_H - TITLE_Y1, LV_SYMBOL_NEW_LINE, BL_FOREGROUND);
lcd->drawText(RTNTXT_X, LCD_H - TITLE_Y1, TR_BL_EXIT_KEY, BL_FOREGROUND);
}
}
@@ -226,11 +279,11 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
void bootloaderDrawFilename(const char* str, uint8_t line, bool selected)
{
lcd->drawText(94, 75 + (line * 25), LV_SYMBOL_FILE, BL_FOREGROUND);
lcd->drawText(124, 75 + (line * 25), str, BL_FOREGROUND);
lcd->drawText(FILENAM_X1, FILENAM_Y1 + (line * FILENAM_H), LV_SYMBOL_FILE, BL_FOREGROUND);
lcd->drawText(FILENAM_X2, FILENAM_Y1 + (line * FILENAM_H), str, BL_FOREGROUND);
if (selected) {
lcd->drawSolidRect(119, 72 + (line * 25), 278, 26, 2, BL_SELECTED);
lcd->drawSolidRect(FILESEL_X, BOX_Y + (line * FILENAM_H), FILESEL_W, BOX_H, PAD_TINY, BL_SELECTED);
}
}
+6 -5
View File
@@ -1224,17 +1224,18 @@
#define SDRAM_BANK2
#define PORTRAIT_LCD false
#define LANDSCAPE_LCD true
#define LANDSCAPE_LCD_SML false
#define LANDSCAPE_LCD_STD true
#define LANDSCAPE_LCD_LRG false
#if defined(RADIO_T15)
#define LCD_W 480
#define LCD_H 320
#define LCD_PHYS_H LCD_H
#define LCD_PHYS_W LCD_W
#define LCD_DEPTH 16
#else
#define LCD_W 480
#define LCD_H 272
#endif
#define LCD_PHYS_H LCD_H
#define LCD_PHYS_W LCD_W
#define LCD_DEPTH 16
#endif
+1 -1
View File
@@ -51,7 +51,7 @@ else()
set(AFHDS2 ON)
endif()
set(BITMAPS_TARGET nv14_bitmaps)
set(BITMAPS_TARGET bm480_bitmaps)
set(FONTS_TARGET x12_fonts)
set(LCD_DRIVER lcd_driver.cpp)
set(TOUCH_DRIVER touch_driver.cpp)
+3 -1
View File
@@ -441,7 +441,9 @@
#define SDRAM_BANK1
#define PORTRAIT_LCD true
#define LANDSCAPE_LCD false
#define LANDSCAPE_LCD_SML false
#define LANDSCAPE_LCD_STD false
#define LANDSCAPE_LCD_LRG false
#define LCD_W 320
#define LCD_H 480
+1 -1
View File
@@ -94,7 +94,7 @@ else()
set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
endif()
set(BITMAPS_TARGET pl18_bitmaps)
set(BITMAPS_TARGET bm480_bitmaps)
set(FONTS_TARGET x12_fonts)
set(LCD_DRIVER lcd_driver.cpp)
set(TOUCH_DRIVER touch_driver.cpp)
+5 -2
View File
@@ -944,16 +944,19 @@
#if defined(RADIO_NB4P) || defined(RADIO_NV14_FAMILY)
#define PORTRAIT_LCD true
#define LANDSCAPE_LCD false
#define LANDSCAPE_LCD_STD false
#define LCD_W 320
#define LCD_H 480
#else
#define PORTRAIT_LCD false
#define LANDSCAPE_LCD true
#define LANDSCAPE_LCD_STD true
#define LCD_W 480
#define LCD_H 320
#endif
#define LANDSCAPE_LCD_LRG false
#define LANDSCAPE_LCD_SML false
#define LCD_PHYS_W 320
#define LCD_PHYS_H 480
@@ -32,7 +32,7 @@ set(TARGET_LINKER_PARAMS "-Wl,--defsym=__PSRAM_START__=0x90000000")
set(SIZE_TARGET_MEM_DEFINE "MEM_SIZE_SDRAM1=32768")
set(FIRMWARE_FORMAT_UF2 YES)
set(BITMAPS_TARGET ${FLAVOUR}_bitmaps)
set(BITMAPS_TARGET bm480_bitmaps)
set(FONTS_TARGET x12_fonts)
set(RADIO_DEPENDENCIES ${RADIO_DEPENDENCIES} ${BITMAPS_TARGET})
+5 -3
View File
@@ -371,14 +371,16 @@
#define MIXER_SCHEDULER_TIMER_IRQn TIM12_IRQn
#define MIXER_SCHEDULER_TIMER_IRQHandler TIM12_IRQHandler
#define LANDSCAPE_LCD true
#define PORTRAIT_LCD false
#define LANDSCAPE_LCD_SML false
#define LANDSCAPE_LCD_STD false
#define LANDSCAPE_LCD_LRG true
#define LCD_W 800
#define LCD_H 480
#define LCD_PHYS_W 800
#define LCD_PHYS_H 480
#define LCD_PHYS_W LCD_W
#define LCD_PHYS_H LCD_H
#define LCD_DEPTH 16
// #define LCD_CONTRAST_DEFAULT 20