refactor(core): reorganize model-specific files in embed/models

[no changelog]

core/Makefile

@@ -46,30 +46,30 @@ BINDGEN_MACROS_COMMON=-I../unix;-I../trezorhal/unix;-I../../build/unix;-I../../v
 
 ifeq ($(TREZOR_MODEL), 1)
 MCU = STM32F2
-LAYOUT_FILE = embed/models/model_T1B1.h
+LAYOUT_FILE = embed/models/T1B1/model_T1B1.h
 OPENOCD_TARGET = target/stm32f2x.cfg
 else ifeq ($(TREZOR_MODEL),$(filter $(TREZOR_MODEL),T))
 MCU = STM32F4
-LAYOUT_FILE = embed/models/model_T2T1.h
+LAYOUT_FILE = embed/models/T2T1/model_T2T1.h
 OPENOCD_TARGET = target/stm32f4x.cfg
 BINDGEN_MACROS_MODEL = -DSTM32F427;-DTREZOR_MODEL_T;-DFLASH_BIT_ACCESS=1;-DFLASH_BLOCK_WORDS=1;-DTREZOR_BOARD="T2T1/boards/t2t1-unix.h";
 MODEL_FEATURE = model_tt
 else ifeq ($(TREZOR_MODEL),$(filter $(TREZOR_MODEL),R))
 MCU = STM32F4
-LAYOUT_FILE = embed/models/model_T2B1.h
+LAYOUT_FILE = embed/models/T2B1/model_T2B1.h
 OPENOCD_TARGET = target/stm32f4x.cfg
 BINDGEN_MACROS_MODEL =-DSTM32F427;-DTREZOR_MODEL_R;-DFLASH_BIT_ACCESS=1;-DFLASH_BLOCK_WORDS=1;-DTREZOR_BOARD="T2B1/boards/t2b1-unix.h";
 MODEL_FEATURE = model_tr
 else ifeq ($(TREZOR_MODEL),$(filter $(TREZOR_MODEL),T3T1))
 MCU = STM32U5
 OPENOCD_TARGET = target/stm32u5x.cfg
-LAYOUT_FILE = embed/models/model_T3T1.h
+LAYOUT_FILE = embed/models/T3T1/model_T3T1.h
 else ifeq ($(TREZOR_MODEL),$(filter $(TREZOR_MODEL),DISC1))
 MCU = STM32F4
-LAYOUT_FILE = embed/models/model_D001.h
+LAYOUT_FILE = embed/models/D001/model_D001.h
 else ifeq ($(TREZOR_MODEL),$(filter $(TREZOR_MODEL),DISC2))
 MCU = STM32U5
-LAYOUT_FILE = embed/models/model_D002.h
+LAYOUT_FILE = embed/models/D002/model_D002.h
 OPENOCD_TARGET = target/stm32u5x.cfg
 else
 $(error Unknown TREZOR_MODEL: $(TREZOR_MODEL))

core/embed/models/D001/model_D001_layout.c

@@ -0,0 +1 @@
+../T2T1/model_T2T1_layout.c

core/embed/models/T1B1/boards/t1b1-unix.h

@@ -16,7 +16,7 @@
 
 #define ORIENTATION_NS 1
 
-#define BACKGROUND_FILE "background_1.h"
+#define BACKGROUND_FILE "T1B1/background_1.h"
 #define BACKGROUND_NAME background_1_jpg
 
 #include "display-unix.h"

core/embed/models/T2B1/boards/t2b1-unix.h

@@ -18,8 +18,8 @@
 
 #define ORIENTATION_NS 1
 
-#define BACKGROUND_FILE "background_T2B1.h"
+#define BACKGROUND_FILE "T2B1/background_T2B1.h"
-#define BACKGROUND_NAME background_T2B1_jpg
+#define BACKGROUND_NAME background_T2B1_png
 
 #include "display-unix.h"
 

core/embed/models/T2T1/boards/t2t1-unix.h

@@ -31,7 +31,7 @@
 #define TOUCH_OFFSET_X 80
 #define TOUCH_OFFSET_Y 110
 
-#define BACKGROUND_FILE "background_T.h"
+#define BACKGROUND_FILE "T2T1/background_T.h"
 #define BACKGROUND_NAME background_T_jpg
 
 #endif

core/embed/models/T3T1/boards/t3t1-unix.h

@@ -21,8 +21,8 @@
 
 #define ORIENTATION_NSEW 1
 
-#define BACKGROUND_FILE "background_T.h"
+#define BACKGROUND_FILE "T3T1/background_T3T1.h"
-#define BACKGROUND_NAME background_T_jpg
+#define BACKGROUND_NAME background_T3T1_jpg
 
 #include "display-unix.h"
 

core/embed/models/model.h

@@ -4,17 +4,17 @@
 #include "layout_common.h"
 
 #if defined TREZOR_MODEL_1
-#include "model_T1B1.h"
+#include "T1B1/model_T1B1.h"
 #elif defined TREZOR_MODEL_T
-#include "model_T2T1.h"
+#include "T2T1/model_T2T1.h"
 #elif defined TREZOR_MODEL_R
-#include "model_T2B1.h"
+#include "T2B1/model_T2B1.h"
 #elif defined TREZOR_MODEL_T3T1
-#include "model_T3T1.h"
+#include "T3T1/model_T3T1.h"
 #elif defined TREZOR_MODEL_DISC1
-#include "model_D001.h"
+#include "D001/model_D001.h"
 #elif defined TREZOR_MODEL_DISC2
-#include "model_D002.h"
+#include "D002/model_D002.h"
 #else
 #error Unknown Trezor model
 #endif

core/embed/models/model_D001_layout.c

@@ -1 +0,0 @@
-model_T2T1_layout.c

core/site_scons/models/D001/discovery.py

@@ -12,7 +12,7 @@ def configure(
     paths: list[str],
 ) -> list[str]:
     features_available: list[str] = []
-    board = "stm32f429i-disc1.h"
+    board = "D001/boards/stm32f429i-disc1.h"
     display = "ltdc.c"
     hw_model = get_hw_model_as_number("D001")
     hw_revision = 0
@@ -30,11 +30,11 @@ def configure(
     env.get("ENV")["RUST_TARGET"] = "thumbv7em-none-eabihf"
 
     defines += [mcu]
-    defines += [f'TREZOR_BOARD=\\"boards/{board}\\"']
+    defines += [f'TREZOR_BOARD=\\"{board}\\"']
     defines += [f"HW_MODEL={hw_model}"]
     defines += [f"HW_REVISION={hw_revision}"]
     sources += [
-        "embed/models/model_D001_layout.c",
+        "embed/models/D001/model_D001_layout.c",
     ]
     sources += [f"embed/trezorhal/stm32f4/displays/{display}"]
     sources += ["embed/trezorhal/stm32f4/displays/ili9341_spi.c"]

core/site_scons/models/D002/discovery2.py

@@ -12,7 +12,7 @@ def configure(
     paths: list[str],
 ) -> list[str]:
     features_available: list[str] = []
-    board = "stm32u5a9j-dk.h"
+    board = "D002/boards/stm32u5a9j-dk.h"
     display = "dsi.c"
     hw_model = get_hw_model_as_number("D002")
     hw_revision = 0
@@ -32,7 +32,7 @@ def configure(
 
     defines += [mcu]
     defines += [
-        f'TREZOR_BOARD=\\"boards/{board}\\"',
+        f'TREZOR_BOARD=\\"{board}\\"',
     ]
     defines += [
         f"HW_MODEL={hw_model}",
@@ -41,7 +41,7 @@ def configure(
         f"HW_REVISION={hw_revision}",
     ]
     sources += [
-        "embed/models/model_D002_layout.c",
+        "embed/models/D002/model_D002_layout.c",
     ]
     sources += [
         f"embed/trezorhal/stm32u5/displays/{display}",

core/site_scons/models/T1B1/emulator.py

@@ -11,14 +11,14 @@ def configure(
     paths: list[str],
 ) -> list[str]:
 
-    board = "t1b1-unix.h"
+    board = "T1B1/boards/t1b1-unix.h"
     hw_model = get_hw_model_as_number("T1B1")
     hw_revision = 0
     mcu = "STM32F405xx"
 
     features = []
     defines += [mcu]
-    defines += [f'TREZOR_BOARD=\\"boards/{board}\\"']
+    defines += [f'TREZOR_BOARD=\\"{board}\\"']
     defines += [f"HW_MODEL={hw_model}"]
     defines += [f"HW_REVISION={hw_revision}"]
     defines += [f"MCU_TYPE={mcu}"]
@@ -28,6 +28,6 @@ def configure(
     if "input" in features_wanted:
         features.append("button")
 
-    sources += ["embed/models/model_T1B1_layout.c"]
+    sources += ["embed/models/T1B1/model_T1B1_layout.c"]
 
     return features

core/site_scons/models/T1B1/trezor_1.py

@@ -12,7 +12,7 @@ def configure(
     paths: list[str],
 ) -> list[str]:
     features_available: list[str] = []
-    board = "trezor_1.h"
+    board = "T1B1/boards/trezor_1.h"
     display = "vg-2864ksweg01.c"
     hw_model = get_hw_model_as_number("T1B1")
     hw_revision = 0
@@ -28,11 +28,11 @@ def configure(
     env.get("ENV")["RUST_TARGET"] = "thumbv7m-none-eabi"
 
     defines += [mcu]
-    defines += [f'TREZOR_BOARD=\\"boards/{board}\\"']
+    defines += [f'TREZOR_BOARD=\\"{board}\\"']
     defines += [f"HW_MODEL={hw_model}"]
     defines += [f"HW_REVISION={hw_revision}"]
     sources += [
-        "embed/models/model_T1B1_layout.c",
+        "embed/models/T1B1/model_T1B1_layout.c",
     ]
     sources += [f"embed/trezorhal/stm32f4/displays/{display}"]
 

core/site_scons/models/T2B1/emulator.py

@@ -11,14 +11,14 @@ def configure(
     paths: list[str],
 ) -> list[str]:
 
-    board = "t2b1-unix.h"
+    board = "T2B1/boards/t2b1-unix.h"
     hw_model = get_hw_model_as_number("T2B1")
     hw_revision = 0
     mcu = "STM32F427xx"
 
     features = []
     defines += [mcu]
-    defines += [f'TREZOR_BOARD=\\"boards/{board}\\"']
+    defines += [f'TREZOR_BOARD=\\"{board}\\"']
     defines += [f"HW_MODEL={hw_model}"]
     defines += [f"HW_REVISION={hw_revision}"]
     defines += [f"MCU_TYPE={mcu}"]
@@ -37,6 +37,6 @@ def configure(
     if "input" in features_wanted:
         features.append("button")
 
-    sources += ["embed/models/model_T2B1_layout.c"]
+    sources += ["embed/models/T2B1/model_T2B1_layout.c"]
 
     return features

core/site_scons/models/T2B1/trezor_r_v10.py

@@ -14,7 +14,7 @@ def configure(
     features_available: list[str] = []
     hw_model = get_hw_model_as_number("T2B1")
     hw_revision = 10
-    board = "trezor_r_v10.h"
+    board = "T2B1/boards/trezor_r_v10.h"
     display = "vg-2864ksweg01.c"
 
     mcu = "STM32F427xx"
@@ -30,11 +30,11 @@ def configure(
     env.get("ENV")["RUST_TARGET"] = "thumbv7em-none-eabihf"
 
     defines += [mcu]
-    defines += [f'TREZOR_BOARD=\\"boards/{board}\\"']
+    defines += [f'TREZOR_BOARD=\\"{board}\\"']
     defines += [f"HW_MODEL={hw_model}"]
     defines += [f"HW_REVISION={hw_revision}"]
     sources += [
-        "embed/models/model_T2B1_layout.c",
+        "embed/models/T2B1/model_T2B1_layout.c",
     ]
     sources += [f"embed/trezorhal/stm32f4/displays/{display}"]
 

core/site_scons/models/T2B1/trezor_r_v3.py

@@ -14,7 +14,7 @@ def configure(
     features_available: list[str] = []
     hw_model = get_hw_model_as_number("T2B1")
     hw_revision = 3
-    board = "trezor_r_v3.h"
+    board = "T2B1/boards/trezor_r_v3.h"
     display = "ug-2828tswig01.c"
 
     mcu = "STM32F427xx"
@@ -30,11 +30,11 @@ def configure(
     env.get("ENV")["RUST_TARGET"] = "thumbv7em-none-eabihf"
 
     defines += [mcu]
-    defines += [f'TREZOR_BOARD=\\"boards/{board}\\"']
+    defines += [f'TREZOR_BOARD=\\"{board}\\"']
     defines += [f"HW_MODEL={hw_model}"]
     defines += [f"HW_REVISION={hw_revision}"]
     sources += [
-        "embed/models/model_T2B1_layout.c",
+        "embed/models/T2B1/model_T2B1_layout.c",
     ]
     sources += [f"embed/trezorhal/stm32f4/displays/{display}"]
 

core/site_scons/models/T2B1/trezor_r_v4.py

@@ -14,7 +14,7 @@ def configure(
     features_available: list[str] = []
     hw_model = get_hw_model_as_number("T2B1")
     hw_revision = 4
-    board = "trezor_r_v4.h"
+    board = "T2B1/boards/trezor_r_v4.h"
     display = "vg-2864ksweg01.c"
 
     mcu = "STM32F427xx"
@@ -30,11 +30,11 @@ def configure(
     env.get("ENV")["RUST_TARGET"] = "thumbv7em-none-eabihf"
 
     defines += [mcu]
-    defines += [f'TREZOR_BOARD=\\"boards/{board}\\"']
+    defines += [f'TREZOR_BOARD=\\"{board}\\"']
     defines += [f"HW_MODEL={hw_model}"]
     defines += [f"HW_REVISION={hw_revision}"]
     sources += [
-        "embed/models/model_T2B1_layout.c",
+        "embed/models/T2B1/model_T2B1_layout.c",
     ]
     sources += [f"embed/trezorhal/stm32f4/displays/{display}"]
 

core/site_scons/models/T2B1/trezor_r_v6.py

@@ -14,7 +14,7 @@ def configure(
     features_available: list[str] = []
     hw_model = get_hw_model_as_number("T2B1")
     hw_revision = 6
-    board = "trezor_r_v6.h"
+    board = "T2B1/boards/trezor_r_v6.h"
     display = "vg-2864ksweg01.c"
 
     mcu = "STM32F427xx"
@@ -30,11 +30,11 @@ def configure(
     env.get("ENV")["RUST_TARGET"] = "thumbv7em-none-eabihf"
 
     defines += [mcu]
-    defines += [f'TREZOR_BOARD=\\"boards/{board}\\"']
+    defines += [f'TREZOR_BOARD=\\"{board}\\"']
     defines += [f"HW_MODEL={hw_model}"]
     defines += [f"HW_REVISION={hw_revision}"]
     sources += [
-        "embed/models/model_T2B1_layout.c",
+        "embed/models/T2B1/model_T2B1_layout.c",
     ]
     sources += [f"embed/trezorhal/stm32f4/displays/{display}"]
 

core/site_scons/models/T2T1/emulator.py

@@ -11,14 +11,14 @@ def configure(
     paths: list[str],
 ) -> list[str]:
 
-    board = "t2t1-unix.h"
+    board = "T2T1/boards/t2t1-unix.h"
     hw_model = get_hw_model_as_number("T2T1")
     hw_revision = 0
     mcu = "STM32F427xx"
 
     features = []
     defines += [mcu]
-    defines += [f'TREZOR_BOARD=\\"boards/{board}\\"']
+    defines += [f'TREZOR_BOARD=\\"{board}\\"']
     defines += [f"HW_MODEL={hw_model}"]
     defines += [f"HW_REVISION={hw_revision}"]
     defines += [f"MCU_TYPE={mcu}"]
@@ -46,6 +46,6 @@ def configure(
 
     features.append("backlight")
 
-    sources += ["embed/models/model_T2T1_layout.c"]
+    sources += ["embed/models/T2T1/model_T2T1_layout.c"]
 
     return features

core/site_scons/models/T2T1/trezor_t.py

@@ -12,7 +12,7 @@ def configure(
     paths: list[str],
 ) -> list[str]:
     features_available: list[str] = []
-    board = "trezor_t.h"
+    board = "T2T1/boards/trezor_t.h"
     display = "st7789v.c"
     hw_model = get_hw_model_as_number("T2T1")
     hw_revision = 0
@@ -31,11 +31,11 @@ def configure(
     env.get("ENV")["RUST_TARGET"] = "thumbv7em-none-eabihf"
 
     defines += [mcu]
-    defines += [f'TREZOR_BOARD=\\"boards/{board}\\"']
+    defines += [f'TREZOR_BOARD=\\"{board}\\"']
     defines += [f"HW_MODEL={hw_model}"]
     defines += [f"HW_REVISION={hw_revision}"]
     sources += [
-        "embed/models/model_T2T1_layout.c",
+        "embed/models/T2T1/model_T2T1_layout.c",
     ]
     sources += [f"embed/trezorhal/stm32f4/displays/{display}"]
     sources += ["embed/trezorhal/stm32f4/backlight_pwm.c"]

core/site_scons/models/T3T1/emulator.py

@@ -11,14 +11,14 @@ def configure(
     paths: list[str],
 ) -> list[str]:
 
-    board = "t3t1-unix.h"
+    board = "T3T1/boards/t3t1-unix.h"
     hw_model = get_hw_model_as_number("T3T1")
     hw_revision = 0
     mcu = "STM32FU585xx"
 
     features = []
     defines += [mcu]
-    defines += [f'TREZOR_BOARD=\\"boards/{board}\\"']
+    defines += [f'TREZOR_BOARD=\\"{board}\\"']
     defines += [f"HW_MODEL={hw_model}"]
     defines += [f"HW_REVISION={hw_revision}"]
     defines += [f"MCU_TYPE={mcu}"]
@@ -53,6 +53,6 @@ def configure(
 
     features.append("backlight")
 
-    sources += ["embed/models/model_T3T1_layout.c"]
+    sources += ["embed/models/T3T1/model_T3T1_layout.c"]
 
     return features

core/site_scons/models/T3T1/trezor_t3t1_revE.py

@@ -12,7 +12,7 @@ def configure(
     paths: list[str],
 ) -> list[str]:
     features_available: list[str] = []
-    board = "trezor_t3t1_revE.h"
+    board = "T3T1/boards/trezor_t3t1_revE.h"
     display = "st7789v.c"
     hw_model = get_hw_model_as_number("T3T1")
     hw_revision = 0
@@ -34,11 +34,11 @@ def configure(
     env.get("ENV")["RUST_TARGET"] = "thumbv8m.main-none-eabihf"
 
     defines += [mcu]
-    defines += [f'TREZOR_BOARD=\\"boards/{board}\\"']
+    defines += [f'TREZOR_BOARD=\\"{board}\\"']
     defines += [f"HW_MODEL={hw_model}"]
     defines += [f"HW_REVISION={hw_revision}"]
     sources += [
-        "embed/models/model_T3T1_layout.c",
+        "embed/models/T3T1/model_T3T1_layout.c",
     ]
     sources += [f"embed/trezorhal/stm32u5/displays/{display}"]
     sources += ["embed/trezorhal/stm32u5/backlight_pwm.c"]

core/site_scons/models/T3T1/trezor_t3t1_v4.py

@@ -12,7 +12,7 @@ def configure(
     paths: list[str],
 ) -> list[str]:
     features_available: list[str] = []
-    board = "trezor_t3t1_v4.h"
+    board = "T3T1/boards/trezor_t3t1_v4.h"
     display = "st7789v.c"
     hw_model = get_hw_model_as_number("T3T1")
     hw_revision = 0
@@ -34,11 +34,11 @@ def configure(
     env.get("ENV")["RUST_TARGET"] = "thumbv8m.main-none-eabihf"
 
     defines += [mcu]
-    defines += [f'TREZOR_BOARD=\\"boards/{board}\\"']
+    defines += [f'TREZOR_BOARD=\\"{board}\\"']
     defines += [f"HW_MODEL={hw_model}"]
     defines += [f"HW_REVISION={hw_revision}"]
     sources += [
-        "embed/models/model_T3T1_layout.c",
+        "embed/models/T3T1/model_T3T1_layout.c",
     ]
     sources += [f"embed/trezorhal/stm32u5/displays/{display}"]
     sources += ["embed/trezorhal/stm32u5/backlight_pwm.c"]