bootloader production mode fix #4195
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cepetr
requested changes
Sep 19, 2024
core/embed/bootloader/main.c
Outdated
| #ifdef TREZOR_MODEL_T3T1 | ||
| // on T3T1, tester needs to run without touch, so making an exception | ||
| // until unit variant is written in OTP | ||
| if (unit_variant_present()) { | ||
| ensure(touch_init(), "Touch screen panel was not loaded properly."); | ||
| secbool production_mode = unit_variant_present() ? secfalse : sectrue; |
There was a problem hiding this comment.
How about something like this:
#ifdef USE_TOUCH
secbool touch_initialized = secfalse;
#ifdef TREZOR_MODEL_T3T1
secbool manufacturing_mode = unit_variant_present() ? secfalse : sectrue;
secbool allow_touchless_mode = manufacturing_mode;
touch_initialized = touch_init();
if (allow_touchless_mode != sectrue) {
ensure((touch_initialized, "Touch panel...");
}
#endif // TREZOR_MODEL_T3T1
#endif // USE_TOUCH
..
..
..
if (touch_initialized != secfalse) {
while (touch_ready() != sectrue) {
hal_delay(1);
}
}
There was a problem hiding this comment.
yeah its a bit better. Adjusted a bit to allow touch initialization for other models too, see 6187233
[no changelog]
TychoVrahe
force-pushed
the
tychovrahe/bootloader/production_mode_fix
branch
from
6187233
to
ce47da9
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes stuck bootloader when in production mode and touch is not present.
(some touch related typos fixed too)