refactor(core): relocate display resolution to model.h

[no changelog]
2024-11-15 20:19:23 +00:00 · 2024-10-31 21:15:18 +01:00 · 2024-10-31 21:15:18 +01:00 · 80a67c647f
commit 80a67c647f
parent bba94ab1f6
25 changed files with 34 additions and 28 deletions
--- a/core/embed/lib/buffers.h
+++ b/core/embed/lib/buffers.h
@ -23,6 +23,7 @@
 #include <stdbool.h>

 #include "common.h"
+#include "model.h"
 #include TREZOR_BOARD

 #define BUFFER_PIXELS DISPLAY_RESX
--- a/core/embed/models/D001/boards/stm32f429i-disc1.h
+++ b/core/embed/models/D001/boards/stm32f429i-disc1.h
@ -3,8 +3,6 @@

 #define HSE_8MHZ

-#define DISPLAY_RESX 240
-#define DISPLAY_RESY 320
 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565
 #define DISPLAY_LEGACY_HEADER "displays/ltdc.h"

--- a/core/embed/models/D001/model_D001.h
+++ b/core/embed/models/D001/model_D001.h
@ -24,7 +24,10 @@

 #define IMAGE_CHUNK_SIZE (128 * 1024)
 #define IMAGE_HASH_BLAKE2S
+
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RESET_CONTENT
+#define DISPLAY_RESX 240
+#define DISPLAY_RESY 320

 // SHARED WITH MAKEFILE
 // common
--- a/core/embed/models/D002/boards/stm32u5a9j-dk.h
+++ b/core/embed/models/D002/boards/stm32u5a9j-dk.h
@ -4,9 +4,6 @@
 #define HSE_16MHZ
 #define VDD_1V8 1

-#define DISPLAY_RESX 240
-#define DISPLAY_RESY 240
-
 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_ARGB8888
 #define DISPLAY_LEGACY_HEADER "displays/dsi.h"

--- a/core/embed/models/D002/model_D002.h
+++ b/core/embed/models/D002/model_D002.h
@ -26,7 +26,10 @@

 #define IMAGE_CHUNK_SIZE SIZE_256K
 #define IMAGE_HASH_SHA256
+
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RESET_CONTENT
+#define DISPLAY_RESX 240
+#define DISPLAY_RESY 240

 // SHARED WITH MAKEFILE, LINKER SCRIPT etc.
 // misc
--- a/core/embed/models/T2B1/boards/t2b1-unix.h
+++ b/core/embed/models/T2B1/boards/t2b1-unix.h
@ -1,9 +1,6 @@
 #ifndef BOARDS_T2B1_UNIX_H
 #define BOARDS_T2B1_UNIX_H

-#define DISPLAY_RESX 128
-#define DISPLAY_RESY 64
-
 #define WINDOW_WIDTH 193
 #define WINDOW_HEIGHT 339
 #define TOUCH_OFFSET_X 32
--- a/core/embed/models/T2B1/boards/trezor_r_v10.h
+++ b/core/embed/models/T2B1/boards/trezor_r_v10.h
@ -3,8 +3,6 @@

 #define HSE_8MHZ

-#define DISPLAY_RESX 128
-#define DISPLAY_RESY 64
 #define DISPLAY_LEGACY_HEADER "displays/vg-2864ksweg01.h"

 #define BTN_LEFT_PIN GPIO_PIN_10
--- a/core/embed/models/T2B1/model_T2B1.h
+++ b/core/embed/models/T2B1/model_T2B1.h
@ -24,7 +24,10 @@

 #define IMAGE_CHUNK_SIZE (128 * 1024)
 #define IMAGE_HASH_BLAKE2S
+
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
+#define DISPLAY_RESX 128
+#define DISPLAY_RESY 64

 // SHARED WITH MAKEFILE
 // common
--- a/core/embed/models/T2T1/boards/t2t1-unix.h
+++ b/core/embed/models/T2T1/boards/t2t1-unix.h
@ -1,9 +1,6 @@
 #ifndef BOARDS_T2T1_UNIX_H
 #define BOARDS_T2T1_UNIX_H

-#define DISPLAY_RESX 240
-#define DISPLAY_RESY 240
-
 #define ORIENTATION_NSEW 1

 #ifdef TREZOR_EMULATOR_RASPI
--- a/core/embed/models/T2T1/boards/trezor_t.h
+++ b/core/embed/models/T2T1/boards/trezor_t.h
@ -3,8 +3,6 @@

 #define HSE_8MHZ

-#define DISPLAY_RESX 240
-#define DISPLAY_RESY 240
 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565
 #define DISPLAY_LEGACY_HEADER "displays/st7789v.h"

--- a/core/embed/models/T2T1/model_T2T1.h
+++ b/core/embed/models/T2T1/model_T2T1.h
@ -24,7 +24,10 @@

 #define IMAGE_CHUNK_SIZE (128 * 1024)
 #define IMAGE_HASH_BLAKE2S
+
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
+#define DISPLAY_RESX 240
+#define DISPLAY_RESY 240

 // SHARED WITH MAKEFILE
 // common
--- a/core/embed/models/T3B1/boards/t3b1-unix.h
+++ b/core/embed/models/T3B1/boards/t3b1-unix.h
@ -1,9 +1,6 @@
 #ifndef BOARDS_T3B1_UNIX_H
 #define BOARDS_T3B1_UNIX_H

-#define DISPLAY_RESX 128
-#define DISPLAY_RESY 64
-
 #define WINDOW_WIDTH 193
 #define WINDOW_HEIGHT 339
 #define TOUCH_OFFSET_X 32
--- a/core/embed/models/T3B1/boards/trezor_t3b1_revB.h
+++ b/core/embed/models/T3B1/boards/trezor_t3b1_revB.h
@ -1,9 +1,6 @@
 #ifndef _TREZOR_T3B1_H
 #define _TREZOR_T3B1_H

-#define DISPLAY_RESX 128
-#define DISPLAY_RESY 64
-
 #define VDD_3V3 1

 #define DISPLAY_LEGACY_HEADER "displays/vg-2864ksweg01.h"
--- a/core/embed/models/T3B1/model_T3B1.h
+++ b/core/embed/models/T3B1/model_T3B1.h
@ -25,7 +25,10 @@

 #define IMAGE_CHUNK_SIZE (128 * 1024)
 #define IMAGE_HASH_SHA256
+
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
+#define DISPLAY_RESX 128
+#define DISPLAY_RESY 64

 // SHARED WITH MAKEFILE, LINKER SCRIPT etc.
 // misc
--- a/core/embed/models/T3T1/boards/t3t1-unix.h
+++ b/core/embed/models/T3T1/boards/t3t1-unix.h
@ -1,9 +1,6 @@
 #ifndef BOARDS_T3T1_UNIX_H
 #define BOARDS_T3T1_UNIX_H

-#define DISPLAY_RESX 240
-#define DISPLAY_RESY 240
-
 #define WINDOW_WIDTH 400
 #define WINDOW_HEIGHT 600
 #define TOUCH_OFFSET_X 80
--- a/core/embed/models/T3T1/boards/trezor_t3t1_revE.h
+++ b/core/embed/models/T3T1/boards/trezor_t3t1_revE.h
@ -3,8 +3,6 @@

 #define VDD_3V3 1

-#define DISPLAY_RESX 240
-#define DISPLAY_RESY 240
 #define DISPLAY_LEGACY_HEADER "displays/st7789v.h"
 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565
 #define DISPLAY_PANEL_LX154A2482 1
--- a/core/embed/models/T3T1/model_T3T1.h
+++ b/core/embed/models/T3T1/model_T3T1.h
@ -25,7 +25,10 @@

 #define IMAGE_CHUNK_SIZE (128 * 1024)
 #define IMAGE_HASH_SHA256
+
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
+#define DISPLAY_RESX 240
+#define DISPLAY_RESY 240

 // SHARED WITH MAKEFILE, LINKER SCRIPT etc.
 // misc
--- a/core/embed/models/T3W1/boards/trezor_t3w1_d1.h
+++ b/core/embed/models/T3W1/boards/trezor_t3w1_d1.h
@ -3,8 +3,6 @@

 #define HSE_8MHZ

-#define DISPLAY_RESX 240
-#define DISPLAY_RESY 320
 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565
 #define DISPLAY_LEGACY_HEADER "displays/st7789v.h"
 #define DISPLAY_PANEL_LHS200KB_IF21 1
--- a/core/embed/models/T3W1/model_T3W1.h
+++ b/core/embed/models/T3W1/model_T3W1.h
@ -26,8 +26,17 @@

 #define IMAGE_CHUNK_SIZE (128 * 1024)
 #define IMAGE_HASH_BLAKE2S
+
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RESET_CONTENT

+#ifdef TREZOR_EMULATOR
+#define DISPLAY_RESX 380
+#define DISPLAY_RESY 520
+#else
+#define DISPLAY_RESX 240
+#define DISPLAY_RESY 320
+#endif
+
 // SHARED WITH MAKEFILE
 // common

--- a/core/embed/trezorhal/stm32f4/touch/panels/lhs200kb-if21.c
+++ b/core/embed/trezorhal/stm32f4/touch/panels/lhs200kb-if21.c
@ -22,6 +22,7 @@

 #include "lx154a2422cpt23.h"

+#include "model.h"
 #include "touch.h"

 void lhs200kb_if21_touch_correction(uint16_t x, uint16_t y, uint16_t *x_new,
--- a/core/embed/trezorhal/stm32f4/touch/panels/lx154a2422cpt23.c
+++ b/core/embed/trezorhal/stm32f4/touch/panels/lx154a2422cpt23.c
@ -21,6 +21,7 @@

 #include "lx154a2422cpt23.h"

+#include "model.h"
 #include "touch.h"

 void lx154a2422cpt23_touch_correction(uint16_t x, uint16_t y, uint16_t *x_new,
--- a/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lhs200kb-if21.c
+++ b/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lhs200kb-if21.c
@ -1,6 +1,7 @@

 #include "lhs200kb-if21.h"
 #include "../display_io.h"
+#include "model.h"

 void lhs200kb_if21_gamma(void) {
  ISSUE_CMD_BYTE(0xE0);
--- a/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2422.c
+++ b/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2422.c
@ -20,6 +20,7 @@
 #include "lx154a2422.h"

 #include "../display_io.h"
+#include "model.h"

 void lx154a2422_gamma(void) {
  // positive voltage correction
--- a/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2482.c
+++ b/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2482.c
@ -20,6 +20,7 @@
 #include "lx154a2482.h"

 #include "../display_io.h"
+#include "model.h"

 void lx154a2482_gamma(void) {
  // positive voltage correction
--- a/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/tf15411a.c
+++ b/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/tf15411a.c
@ -19,6 +19,7 @@

 #include "tf15411a.h"
 #include "../display_io.h"
+#include "model.h"

 void tf15411a_init_seq(void) {
  // Inter Register Enable1