From 2774fb19decf29d33bc7ac8f764bc090f193c2c9 Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Fri, 7 Feb 2025 21:25:12 +0100 Subject: [PATCH] fix(core): enforce bolt UI for delizia-based models in prodtest [no changelog] --- core/site_scons/ui/__init__.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/core/site_scons/ui/__init__.py b/core/site_scons/ui/__init__.py index 36e31b689a..09c58c2120 100644 --- a/core/site_scons/ui/__init__.py +++ b/core/site_scons/ui/__init__.py @@ -5,28 +5,33 @@ from site_scons import models from . import ui_bolt, ui_caesar, ui_delizia -def get_ui_module(layout: str): +def get_ui_module(model: str, stage: str): ui_modules = { "delizia": ui_delizia, "caesar": ui_caesar, "bolt": ui_bolt, } - return ui_modules[models.get_model_ui(layout)] + layout = models.get_model_ui(model) + + if layout == "delizia" and stage == "prodtest": + layout = "bolt" + + return ui_modules[layout] def init_ui( model: str, - stage: int, + stage: str, rust_features: list[str], ): conf = models.get_model_ui_conf(model) - get_ui_module(model).init_ui(stage, conf, rust_features) + get_ui_module(model, stage).init_ui(stage, conf, rust_features) def get_ui_layout(model: str): - return get_ui_module(model).get_ui_layout() + return get_ui_module(model, "firmware").get_ui_layout() def get_ui_layout_path(model: str): - return get_ui_module(model).get_ui_layout_path() + return get_ui_module(model, "firmware").get_ui_layout_path()