diff --git a/core/assets/model_r/device_name.png b/core/assets/model_r/device_name.png index 84cdebf5e..62630ccb1 100644 Binary files a/core/assets/model_r/device_name.png and b/core/assets/model_r/device_name.png differ diff --git a/core/embed/extmod/modtrezorutils/modtrezorutils.c b/core/embed/extmod/modtrezorutils/modtrezorutils.c index 10820f5a2..fc9161543 100644 --- a/core/embed/extmod/modtrezorutils/modtrezorutils.c +++ b/core/embed/extmod/modtrezorutils/modtrezorutils.c @@ -257,6 +257,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_trezorutils_reboot_to_bootloader_obj, STATIC mp_obj_str_t mod_trezorutils_revision_obj = { {&mp_type_bytes}, 0, sizeof(SCM_REVISION) - 1, (const byte *)SCM_REVISION}; +STATIC mp_obj_str_t mod_trezorutils_model_name_obj = { + {&mp_type_str}, 0, sizeof(MODEL_NAME) - 1, (const byte *)MODEL_NAME}; + /// SCM_REVISION: bytes /// VERSION_MAJOR: int /// VERSION_MINOR: int @@ -299,7 +302,7 @@ STATIC const mp_rom_map_elem_t mp_module_trezorutils_globals_table[] = { #else {MP_ROM_QSTR(MP_QSTR_USE_BACKLIGHT), mp_const_false}, #endif - {MP_ROM_QSTR(MP_QSTR_MODEL), MP_ROM_QSTR(MODEL_NAME_QSTR)}, + {MP_ROM_QSTR(MP_QSTR_MODEL), MP_ROM_PTR(&mod_trezorutils_model_name_obj)}, {MP_ROM_QSTR(MP_QSTR_INTERNAL_MODEL), MP_ROM_QSTR(MODEL_INTERNAL_NAME_QSTR)}, #ifdef TREZOR_EMULATOR diff --git a/core/embed/models/model_D001.h b/core/embed/models/model_D001.h index bc7ec6a1c..e0af43663 100644 --- a/core/embed/models/model_D001.h +++ b/core/embed/models/model_D001.h @@ -4,7 +4,6 @@ #define MODEL_NAME "T" #define MODEL_INTERNAL_NAME "D001" #define MODEL_INTERNAL_NAME_TOKEN T -#define MODEL_NAME_QSTR MP_QSTR_T #define MODEL_INTERNAL_NAME_QSTR MP_QSTR_D001 /*** Discovery uses DEV keys in any build variant ***/ diff --git a/core/embed/models/model_T1B1.h b/core/embed/models/model_T1B1.h index c138b4711..e9f3230c7 100644 --- a/core/embed/models/model_T1B1.h +++ b/core/embed/models/model_T1B1.h @@ -4,7 +4,6 @@ #define MODEL_NAME "1" #define MODEL_INTERNAL_NAME "T1B1" #define MODEL_INTERNAL_NAME_TOKEN T1B1 -#define MODEL_NAME_QSTR MP_QSTR_1 #define MODEL_INTERNAL_NAME_QSTR MP_QSTR_T1B1 #define BOOTLOADER_START 0x08000000 diff --git a/core/embed/models/model_T2B1.h b/core/embed/models/model_T2B1.h index ce3795a37..5657e4a50 100644 --- a/core/embed/models/model_T2B1.h +++ b/core/embed/models/model_T2B1.h @@ -1,10 +1,9 @@ #ifndef MODELS_MODEL_T2B1_H_ #define MODELS_MODEL_T2B1_H_ -#define MODEL_NAME "R" +#define MODEL_NAME "Safe 3" #define MODEL_INTERNAL_NAME "T2B1" #define MODEL_INTERNAL_NAME_TOKEN T2B1 -#define MODEL_NAME_QSTR MP_QSTR_R #define MODEL_INTERNAL_NAME_QSTR MP_QSTR_T2B1 /*** PRODUCTION KEYS ***/ diff --git a/core/embed/models/model_T2T1.h b/core/embed/models/model_T2T1.h index 0af3ebfe3..c79da28f8 100644 --- a/core/embed/models/model_T2T1.h +++ b/core/embed/models/model_T2T1.h @@ -4,7 +4,6 @@ #define MODEL_NAME "T" #define MODEL_INTERNAL_NAME "T2T1" #define MODEL_INTERNAL_NAME_TOKEN T2T1 -#define MODEL_NAME_QSTR MP_QSTR_T #define MODEL_INTERNAL_NAME_QSTR MP_QSTR_T2T1 /*** PRODUCTION KEYS ***/ diff --git a/core/embed/rust/src/ui/model_tr/component/welcome_screen.rs b/core/embed/rust/src/ui/model_tr/component/welcome_screen.rs index 6c656ed15..c38fff454 100644 --- a/core/embed/rust/src/ui/model_tr/component/welcome_screen.rs +++ b/core/embed/rust/src/ui/model_tr/component/welcome_screen.rs @@ -58,6 +58,6 @@ impl Component for WelcomeScreen { impl crate::trace::Trace for WelcomeScreen { fn trace(&self, t: &mut dyn crate::trace::Tracer) { t.component("WelcomeScreen"); - t.string("model_name", "Trezor Model R"); + t.string("model_name", "Trezor Safe 3"); } } diff --git a/core/embed/rust/src/ui/model_tr/constant.rs b/core/embed/rust/src/ui/model_tr/constant.rs index e897f9d66..c2f4ecc6b 100644 --- a/core/embed/rust/src/ui/model_tr/constant.rs +++ b/core/embed/rust/src/ui/model_tr/constant.rs @@ -11,7 +11,7 @@ pub const LOADER_OUTER: i16 = 32; pub const LOADER_INNER: i16 = 18; pub const LOADER_ICON_MAX_SIZE: i16 = 8; -pub const MODEL_NAME: &str = "Trezor Model R"; +pub const MODEL_NAME: &str = "Trezor Safe 3"; pub const fn size() -> Offset { Offset::new(WIDTH, HEIGHT) diff --git a/core/embed/rust/src/ui/model_tr/res/device_name.toif b/core/embed/rust/src/ui/model_tr/res/device_name.toif index ab9bab67c..9d506e2e8 100644 Binary files a/core/embed/rust/src/ui/model_tr/res/device_name.toif and b/core/embed/rust/src/ui/model_tr/res/device_name.toif differ diff --git a/core/src/apps/homescreen/__init__.py b/core/src/apps/homescreen/__init__.py index c2a0a5876..eacf22adc 100644 --- a/core/src/apps/homescreen/__init__.py +++ b/core/src/apps/homescreen/__init__.py @@ -19,7 +19,10 @@ async def homescreen() -> None: if storage.device.is_initialized(): label = storage.device.get_label() else: - label = f"Trezor Model {utils.MODEL}" + if utils.INTERNAL_MODEL in ("T1B1", "T2T1"): + label = f"Trezor Model {utils.MODEL}" + else: + label = f"Trezor {utils.MODEL}" notification = None notification_is_error = False diff --git a/python/src/trezorlib/models.py b/python/src/trezorlib/models.py index f10eaabf1..3d83a2959 100644 --- a/python/src/trezorlib/models.py +++ b/python/src/trezorlib/models.py @@ -53,7 +53,7 @@ TREZOR_T = TrezorModel( ) TREZOR_R = TrezorModel( - name="R", + name="Safe 3", internal_name="T2B1", minimum_version=(2, 1, 0), vendors=VENDORS,