arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-12 23:52:39 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
[no changelog]
This commit is contained in:
cepetr 2024-10-31 21:15:18 +01:00
parent 5c40ec99cf
commit c0e5bb0d67
25 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/embed/lib/buffers.h
View File

@ -23,6 +23,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "common.h" #include "common.h"
#include "model.h"
#include TREZOR_BOARD #include TREZOR_BOARD
#define BUFFER_PIXELS DISPLAY_RESX #define BUFFER_PIXELS DISPLAY_RESX

2
core/embed/models/D001/boards/stm32f429i-disc1.h
View File

@ -3,8 +3,6 @@
#define HSE_8MHZ #define HSE_8MHZ
#define DISPLAY_RESX 240
#define DISPLAY_RESY 320
#define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565
#define DISPLAY_LEGACY_HEADER "displays/ltdc.h" #define DISPLAY_LEGACY_HEADER "displays/ltdc.h"

3
core/embed/models/D001/model_D001.h
View File

@ -24,7 +24,10 @@
#define IMAGE_CHUNK_SIZE (128 * 1024) #define IMAGE_CHUNK_SIZE (128 * 1024)
#define IMAGE_HASH_BLAKE2S #define IMAGE_HASH_BLAKE2S
#define DISPLAY_JUMP_BEHAVIOR DISPLAY_RESET_CONTENT #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RESET_CONTENT
#define DISPLAY_RESX 240
#define DISPLAY_RESY 320
// SHARED WITH MAKEFILE // SHARED WITH MAKEFILE
// common // common

3
core/embed/models/D002/boards/stm32u5a9j-dk.h
View File

@ -4,9 +4,6 @@
#define HSE_16MHZ #define HSE_16MHZ
#define VDD_1V8 1 #define VDD_1V8 1
#define DISPLAY_RESX 240
#define DISPLAY_RESY 240
#define DISPLAY_COLOR_MODE DMA2D_OUTPUT_ARGB8888 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_ARGB8888
#define DISPLAY_LEGACY_HEADER "displays/dsi.h" #define DISPLAY_LEGACY_HEADER "displays/dsi.h"

3
core/embed/models/D002/model_D002.h
View File

@ -26,7 +26,10 @@
#define IMAGE_CHUNK_SIZE SIZE_256K #define IMAGE_CHUNK_SIZE SIZE_256K
#define IMAGE_HASH_SHA256 #define IMAGE_HASH_SHA256
#define DISPLAY_JUMP_BEHAVIOR DISPLAY_RESET_CONTENT #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RESET_CONTENT
#define DISPLAY_RESX 240
#define DISPLAY_RESY 240
// SHARED WITH MAKEFILE, LINKER SCRIPT etc. // SHARED WITH MAKEFILE, LINKER SCRIPT etc.
// misc // misc

3
core/embed/models/T2B1/boards/t2b1-unix.h
View File

@ -1,9 +1,6 @@
#ifndef BOARDS_T2B1_UNIX_H #ifndef BOARDS_T2B1_UNIX_H
#define BOARDS_T2B1_UNIX_H #define BOARDS_T2B1_UNIX_H
#define DISPLAY_RESX 128
#define DISPLAY_RESY 64
#define WINDOW_WIDTH 193 #define WINDOW_WIDTH 193
#define WINDOW_HEIGHT 339 #define WINDOW_HEIGHT 339
#define TOUCH_OFFSET_X 32 #define TOUCH_OFFSET_X 32

2
core/embed/models/T2B1/boards/trezor_r_v10.h
View File

@ -3,8 +3,6 @@
#define HSE_8MHZ #define HSE_8MHZ
#define DISPLAY_RESX 128
#define DISPLAY_RESY 64
#define DISPLAY_LEGACY_HEADER "displays/vg-2864ksweg01.h" #define DISPLAY_LEGACY_HEADER "displays/vg-2864ksweg01.h"
#define BTN_LEFT_PIN GPIO_PIN_10 #define BTN_LEFT_PIN GPIO_PIN_10

3
core/embed/models/T2B1/model_T2B1.h
View File

@ -24,7 +24,10 @@
#define IMAGE_CHUNK_SIZE (128 * 1024) #define IMAGE_CHUNK_SIZE (128 * 1024)
#define IMAGE_HASH_BLAKE2S #define IMAGE_HASH_BLAKE2S
#define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
#define DISPLAY_RESX 128
#define DISPLAY_RESY 64
// SHARED WITH MAKEFILE // SHARED WITH MAKEFILE
// common // common

3
core/embed/models/T2T1/boards/t2t1-unix.h
View File

@ -1,9 +1,6 @@
#ifndef BOARDS_T2T1_UNIX_H #ifndef BOARDS_T2T1_UNIX_H
#define BOARDS_T2T1_UNIX_H #define BOARDS_T2T1_UNIX_H
#define DISPLAY_RESX 240
#define DISPLAY_RESY 240
#define ORIENTATION_NSEW 1 #define ORIENTATION_NSEW 1
#ifdef TREZOR_EMULATOR_RASPI #ifdef TREZOR_EMULATOR_RASPI

2
core/embed/models/T2T1/boards/trezor_t.h
View File

@ -3,8 +3,6 @@
#define HSE_8MHZ #define HSE_8MHZ
#define DISPLAY_RESX 240
#define DISPLAY_RESY 240
#define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565
#define DISPLAY_LEGACY_HEADER "displays/st7789v.h" #define DISPLAY_LEGACY_HEADER "displays/st7789v.h"

3
core/embed/models/T2T1/model_T2T1.h
View File

@ -24,7 +24,10 @@
#define IMAGE_CHUNK_SIZE (128 * 1024) #define IMAGE_CHUNK_SIZE (128 * 1024)
#define IMAGE_HASH_BLAKE2S #define IMAGE_HASH_BLAKE2S
#define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
#define DISPLAY_RESX 240
#define DISPLAY_RESY 240
// SHARED WITH MAKEFILE // SHARED WITH MAKEFILE
// common // common

3
core/embed/models/T3B1/boards/t3b1-unix.h
View File

@ -1,9 +1,6 @@
#ifndef BOARDS_T3B1_UNIX_H #ifndef BOARDS_T3B1_UNIX_H
#define BOARDS_T3B1_UNIX_H #define BOARDS_T3B1_UNIX_H
#define DISPLAY_RESX 128
#define DISPLAY_RESY 64
#define WINDOW_WIDTH 193 #define WINDOW_WIDTH 193
#define WINDOW_HEIGHT 339 #define WINDOW_HEIGHT 339
#define TOUCH_OFFSET_X 32 #define TOUCH_OFFSET_X 32

3
core/embed/models/T3B1/boards/trezor_t3b1_revB.h
View File

@ -1,9 +1,6 @@
#ifndef _TREZOR_T3B1_H #ifndef _TREZOR_T3B1_H
#define _TREZOR_T3B1_H #define _TREZOR_T3B1_H
#define DISPLAY_RESX 128
#define DISPLAY_RESY 64
#define VDD_3V3 1 #define VDD_3V3 1
#define DISPLAY_LEGACY_HEADER "displays/vg-2864ksweg01.h" #define DISPLAY_LEGACY_HEADER "displays/vg-2864ksweg01.h"

3
core/embed/models/T3B1/model_T3B1.h
View File

@ -25,7 +25,10 @@
#define IMAGE_CHUNK_SIZE (128 * 1024) #define IMAGE_CHUNK_SIZE (128 * 1024)
#define IMAGE_HASH_SHA256 #define IMAGE_HASH_SHA256
#define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
#define DISPLAY_RESX 128
#define DISPLAY_RESY 64
// SHARED WITH MAKEFILE, LINKER SCRIPT etc. // SHARED WITH MAKEFILE, LINKER SCRIPT etc.
// misc // misc

3
core/embed/models/T3T1/boards/t3t1-unix.h
View File

@ -1,9 +1,6 @@
#ifndef BOARDS_T3T1_UNIX_H #ifndef BOARDS_T3T1_UNIX_H
#define BOARDS_T3T1_UNIX_H #define BOARDS_T3T1_UNIX_H
#define DISPLAY_RESX 240
#define DISPLAY_RESY 240
#define WINDOW_WIDTH 400 #define WINDOW_WIDTH 400
#define WINDOW_HEIGHT 600 #define WINDOW_HEIGHT 600
#define TOUCH_OFFSET_X 80 #define TOUCH_OFFSET_X 80

2
core/embed/models/T3T1/boards/trezor_t3t1_revE.h
View File

@ -3,8 +3,6 @@
#define VDD_3V3 1 #define VDD_3V3 1
#define DISPLAY_RESX 240
#define DISPLAY_RESY 240
#define DISPLAY_LEGACY_HEADER "displays/st7789v.h" #define DISPLAY_LEGACY_HEADER "displays/st7789v.h"
#define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565
#define DISPLAY_PANEL_LX154A2482 1 #define DISPLAY_PANEL_LX154A2482 1

3
core/embed/models/T3T1/model_T3T1.h
View File

@ -25,7 +25,10 @@
#define IMAGE_CHUNK_SIZE (128 * 1024) #define IMAGE_CHUNK_SIZE (128 * 1024)
#define IMAGE_HASH_SHA256 #define IMAGE_HASH_SHA256
#define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
#define DISPLAY_RESX 240
#define DISPLAY_RESY 240
// SHARED WITH MAKEFILE, LINKER SCRIPT etc. // SHARED WITH MAKEFILE, LINKER SCRIPT etc.
// misc // misc

2
core/embed/models/T3W1/boards/trezor_t3w1_d1.h
View File

@ -3,8 +3,6 @@
#define HSE_8MHZ #define HSE_8MHZ
#define DISPLAY_RESX 240
#define DISPLAY_RESY 320
#define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565
#define DISPLAY_LEGACY_HEADER "displays/st7789v.h" #define DISPLAY_LEGACY_HEADER "displays/st7789v.h"
#define DISPLAY_PANEL_LHS200KB_IF21 1 #define DISPLAY_PANEL_LHS200KB_IF21 1

9
core/embed/models/T3W1/model_T3W1.h
View File

@ -26,8 +26,17 @@
#define IMAGE_CHUNK_SIZE (128 * 1024) #define IMAGE_CHUNK_SIZE (128 * 1024)
#define IMAGE_HASH_BLAKE2S #define IMAGE_HASH_BLAKE2S
#define DISPLAY_JUMP_BEHAVIOR DISPLAY_RESET_CONTENT #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 // SHARED WITH MAKEFILE
// common // common

1
core/embed/trezorhal/stm32f4/touch/panels/lhs200kb-if21.c
View File

@ -22,6 +22,7 @@
#include "lx154a2422cpt23.h" #include "lx154a2422cpt23.h"
#include "model.h"
#include "touch.h" #include "touch.h"
void lhs200kb_if21_touch_correction(uint16_t x, uint16_t y, uint16_t *x_new, void lhs200kb_if21_touch_correction(uint16_t x, uint16_t y, uint16_t *x_new,

1
core/embed/trezorhal/stm32f4/touch/panels/lx154a2422cpt23.c
View File

@ -21,6 +21,7 @@
#include "lx154a2422cpt23.h" #include "lx154a2422cpt23.h"
#include "model.h"
#include "touch.h" #include "touch.h"
void lx154a2422cpt23_touch_correction(uint16_t x, uint16_t y, uint16_t *x_new, void lx154a2422cpt23_touch_correction(uint16_t x, uint16_t y, uint16_t *x_new,

1
core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lhs200kb-if21.c
View File

@ -1,6 +1,7 @@
#include "lhs200kb-if21.h" #include "lhs200kb-if21.h"
#include "../display_io.h" #include "../display_io.h"
#include "model.h"
void lhs200kb_if21_gamma(void) { void lhs200kb_if21_gamma(void) {
ISSUE_CMD_BYTE(0xE0); ISSUE_CMD_BYTE(0xE0);

1
core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2422.c
View File

@ -20,6 +20,7 @@
#include "lx154a2422.h" #include "lx154a2422.h"
#include "../display_io.h" #include "../display_io.h"
#include "model.h"
void lx154a2422_gamma(void) { void lx154a2422_gamma(void) {
// positive voltage correction // positive voltage correction

1
core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2482.c
View File

@ -20,6 +20,7 @@
#include "lx154a2482.h" #include "lx154a2482.h"
#include "../display_io.h" #include "../display_io.h"
#include "model.h"
void lx154a2482_gamma(void) { void lx154a2482_gamma(void) {
// positive voltage correction // positive voltage correction

1
core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/tf15411a.c
View File

@ -19,6 +19,7 @@
#include "tf15411a.h" #include "tf15411a.h"
#include "../display_io.h" #include "../display_io.h"
#include "model.h"
void tf15411a_init_seq(void) { void tf15411a_init_seq(void) {
// Inter Register Enable1 // Inter Register Enable1