diff --git a/core/embed/models/T2B1/boards/t2b1-unix.h b/core/embed/models/T2B1/boards/t2b1-unix.h index 86a485f7ff..3e42dc0deb 100644 --- a/core/embed/models/T2B1/boards/t2b1-unix.h +++ b/core/embed/models/T2B1/boards/t2b1-unix.h @@ -3,7 +3,6 @@ #define DISPLAY_RESX 128 #define DISPLAY_RESY 64 -#define TREZOR_FONT_BPP 1 #define WINDOW_WIDTH 193 #define WINDOW_HEIGHT 339 diff --git a/core/embed/models/T2T1/boards/t2t1-unix.h b/core/embed/models/T2T1/boards/t2t1-unix.h index 3903fd3d8a..77519fed7b 100644 --- a/core/embed/models/T2T1/boards/t2t1-unix.h +++ b/core/embed/models/T2T1/boards/t2t1-unix.h @@ -1,10 +1,8 @@ #ifndef BOARDS_T2T1_UNIX_H #define BOARDS_T2T1_UNIX_H -// ILI9341V, GC9307 and ST7789V drivers support 240px x 320px display resolution #define DISPLAY_RESX 240 #define DISPLAY_RESY 240 -#define TREZOR_FONT_BPP 4 #define ORIENTATION_NSEW 1 diff --git a/core/embed/models/T3B1/boards/t3b1-unix.h b/core/embed/models/T3B1/boards/t3b1-unix.h index 65665f32cc..cd99ddecb8 100644 --- a/core/embed/models/T3B1/boards/t3b1-unix.h +++ b/core/embed/models/T3B1/boards/t3b1-unix.h @@ -3,7 +3,6 @@ #define DISPLAY_RESX 128 #define DISPLAY_RESY 64 -#define TREZOR_FONT_BPP 1 #define WINDOW_WIDTH 193 #define WINDOW_HEIGHT 339 diff --git a/core/embed/models/T3T1/boards/t3t1-unix.h b/core/embed/models/T3T1/boards/t3t1-unix.h index 8e05b0542b..958ccb9c5c 100644 --- a/core/embed/models/T3T1/boards/t3t1-unix.h +++ b/core/embed/models/T3T1/boards/t3t1-unix.h @@ -3,7 +3,6 @@ #define DISPLAY_RESX 240 #define DISPLAY_RESY 240 -#define TREZOR_FONT_BPP 4 #define WINDOW_WIDTH 400 #define WINDOW_HEIGHT 600 diff --git a/core/embed/models/T3W1/boards/t3w1-unix.h b/core/embed/models/T3W1/boards/t3w1-unix.h index fd7509e5c0..a202a2161a 100644 --- a/core/embed/models/T3W1/boards/t3w1-unix.h +++ b/core/embed/models/T3W1/boards/t3w1-unix.h @@ -3,7 +3,6 @@ #define DISPLAY_RESX 380 #define DISPLAY_RESY 520 -#define TREZOR_FONT_BPP 4 #define WINDOW_WIDTH 400 #define WINDOW_HEIGHT 600 diff --git a/core/embed/trezorhal/stm32f4/displays/ltdc.h b/core/embed/trezorhal/stm32f4/displays/ltdc.h index 94d83a026f..b07020a757 100644 --- a/core/embed/trezorhal/stm32f4/displays/ltdc.h +++ b/core/embed/trezorhal/stm32f4/displays/ltdc.h @@ -4,7 +4,6 @@ #include STM32_HAL_H -#define TREZOR_FONT_BPP 4 #define DISPLAY_FRAMEBUFFER_WIDTH DISPLAY_RESX #define DISPLAY_FRAMEBUFFER_HEIGHT DISPLAY_RESY #define DISPLAY_FRAMEBUFFER_OFFSET_X 0 diff --git a/core/embed/trezorhal/stm32f4/displays/st7789v.h b/core/embed/trezorhal/stm32f4/displays/st7789v.h index 3a9740092b..17b9ece346 100644 --- a/core/embed/trezorhal/stm32f4/displays/st7789v.h +++ b/core/embed/trezorhal/stm32f4/displays/st7789v.h @@ -14,7 +14,6 @@ typedef struct { #define MAX_DISPLAY_RESX 240 #define MAX_DISPLAY_RESY 320 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565 -#define TREZOR_FONT_BPP 4 #ifdef DISPLAY_I8080_16BIT_DW #define DISP_MEM_TYPE uint16_t diff --git a/core/embed/trezorhal/stm32f4/displays/ug-2828tswig01.h b/core/embed/trezorhal/stm32f4/displays/ug-2828tswig01.h index bdc5b432d4..07978207fb 100644 --- a/core/embed/trezorhal/stm32f4/displays/ug-2828tswig01.h +++ b/core/embed/trezorhal/stm32f4/displays/ug-2828tswig01.h @@ -5,6 +5,5 @@ #define MAX_DISPLAY_RESY 128 #define DISPLAY_RESX 128 #define DISPLAY_RESY 128 -#define TREZOR_FONT_BPP 1 #endif //_UG_2828TSWIG01_H diff --git a/core/embed/trezorhal/stm32f4/displays/vg-2864ksweg01.h b/core/embed/trezorhal/stm32f4/displays/vg-2864ksweg01.h index ad8994e3bd..34a592c593 100644 --- a/core/embed/trezorhal/stm32f4/displays/vg-2864ksweg01.h +++ b/core/embed/trezorhal/stm32f4/displays/vg-2864ksweg01.h @@ -5,6 +5,5 @@ #define MAX_DISPLAY_RESY 64 #define DISPLAY_RESX 128 #define DISPLAY_RESY 64 -#define TREZOR_FONT_BPP 1 #endif //_VG_2864KSWEG01_H diff --git a/core/embed/trezorhal/stm32u5/displays/dsi.h b/core/embed/trezorhal/stm32u5/displays/dsi.h index 913adb369b..acded2e860 100644 --- a/core/embed/trezorhal/stm32u5/displays/dsi.h +++ b/core/embed/trezorhal/stm32u5/displays/dsi.h @@ -8,7 +8,6 @@ #define DISPLAY_FRAMEBUFFER_HEIGHT 480 #define DISPLAY_FRAMEBUFFER_OFFSET_X 120 #define DISPLAY_FRAMEBUFFER_OFFSET_Y 120 -#define TREZOR_FONT_BPP 4 #define DISPLAY_EFFICIENT_CLEAR 1 diff --git a/core/embed/trezorhal/unix/display-unix.c b/core/embed/trezorhal/unix/display-unix.c index 72350aeb59..937ef7565c 100644 --- a/core/embed/trezorhal/unix/display-unix.c +++ b/core/embed/trezorhal/unix/display-unix.c @@ -153,8 +153,8 @@ void display_init_all(void) { } SDL_SetRenderDrawColor(RENDERER, 0, 0, 0, 255); SDL_RenderClear(RENDERER); - BUFFER = SDL_CreateRGBSurface(0, DISPLAY_RESX, DISPLAY_RESY, 16, - 0xF800, 0x07E0, 0x001F, 0x0000); + BUFFER = SDL_CreateRGBSurface(0, DISPLAY_RESX, DISPLAY_RESY, 16, 0xF800, + 0x07E0, 0x001F, 0x0000); TEXTURE = SDL_CreateTexture(RENDERER, SDL_PIXELFORMAT_RGB565, SDL_TEXTUREACCESS_STREAMING, DISPLAY_RESX, DISPLAY_RESY);