From c9a657b074fefcd8d2d865e97fbabf0d0c674046 Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Tue, 15 Aug 2023 12:11:37 +0200 Subject: [PATCH] feat(core): set final name for Safe 3 [no changelog] --- core/assets/model_r/device_name.png | Bin 7341 -> 7533 bytes .../extmod/modtrezorutils/modtrezorutils.c | 5 ++++- core/embed/models/model_D001.h | 1 - core/embed/models/model_T1B1.h | 1 - core/embed/models/model_T2B1.h | 3 +-- core/embed/models/model_T2T1.h | 1 - .../ui/model_tr/component/welcome_screen.rs | 2 +- core/embed/rust/src/ui/model_tr/constant.rs | 2 +- .../rust/src/ui/model_tr/res/device_name.toif | Bin 139 -> 136 bytes core/src/apps/homescreen/__init__.py | 5 ++++- python/src/trezorlib/models.py | 2 +- 11 files changed, 12 insertions(+), 10 deletions(-) diff --git a/core/assets/model_r/device_name.png b/core/assets/model_r/device_name.png index 84cdebf5ec04d663c52805c79961e30c56810a37..62630ccb1c62e92151e3b43ed09b4fa30760adc5 100644 GIT binary patch delta 4420 zcmV-K5xefKIqf=siBL{Q4GJ0x0000DNk~Le000190000B2m}BC09=^zp#T64@Oo5O zbW&k=AaHVTW@&6?Aar?fWgumEX=VTbc-p0zYm#HRZiN4H6hkTLiMSrSG%cy5QzQr^G81Ql{nvlq@E`n088MXFN7L4SB0oio=E<88KR@$5r&!+e z`>FQ*F8%&_i0k`B<|E-%KEICkz5dtd>1Tn@%j8}CmxaduezAW4Ld$pk@y9~>^CBLR zzdzrF^t+Jc≪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 KMNUMnLSTX^Q)n~* delta 4227 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 ZpbOovKh4N|r!W8j002ovPDHLkV1lrM?_~f0 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 ab9bab67cbccf0d2afefe19ae90f4dee7e1b962d..9d506e2e85da8c27467b745de45abdbe1bccbc80 100644 GIT binary patch literal 136 zcmV;30C)dXPf15!01E(o0001mk&6w0FbG81fc>|;4Ng9#LTaOlG#rnkqR8LFk&t@9 zlEYMRF*RK$9*PGWV4aLNvQ-45j#u$OL3+i(H1uFqxWOKwt0!^wql(O?^7MptM=<6l qzE|Sbh;>Z&Y}bkBp!(zkhjbhVj)ALw;B0qqcwglEQ$Vyuy7BBn;_7PhVtsW1cUh6-ikSN1%Ko tuXl1fNEBPhJfAtCWR}rL$;b9Xyp#AzLba1GKh(RT{nW0+TU(#^9|!hTKHmTU 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,