Merge remote-tracking branch 'benma/bl-orientation'

benma · benma · commit c0b87ff65929 · 2025-08-07T11:20:18.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -166,6 +166,9 @@ customers cannot upgrade their bootloader, its changes are recorded separately.
 
 ## Bootloader
 
+### v1.1.2
+- BitBox02 Nova: correctly orient bootloader screen
+
 ### v1.1.1
 - Fix touch in plus bootloader
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -97,7 +97,7 @@ endif()
 # Example 'v1.0.0'. They MUST not contain a pre-release label such as '-beta'.
 set(FIRMWARE_VERSION "v9.23.1")
 set(FIRMWARE_BTC_ONLY_VERSION "v9.23.1")
-set(BOOTLOADER_VERSION "v1.1.1")
+set(BOOTLOADER_VERSION "v1.1.2")
 
 find_package(PythonInterp 3.6 REQUIRED)
 
diff --git a/src/bootloader/bootloader.c b/src/bootloader/bootloader.c
@@ -1070,11 +1070,9 @@ void bootloader_jump(void)
 
     _check_init(&bootdata);
 
-#if PLATFORM_BITBOX02 == 1
     if (shared_data.fields.upside_down) {
         screen_rotate();
     }
-#endif
 
     UG_FontSelect(&font_font_a_9X9);
 

Original file line number	Diff line number	Diff line change
`@@ -1070,11 +1070,9 @@ void bootloader_jump(void)`
`1070`	`1070`
`1071`	`1071`	`_check_init(&bootdata);`
`1072`	`1072`
`1073`		`-#if PLATFORM_BITBOX02 == 1`
`1074`	`1073`	`if (shared_data.fields.upside_down) {`
`1075`	`1074`	`screen_rotate();`
`1076`	`1075`	`}`
`1077`		`-#endif`
`1078`	`1076`
`1079`	`1077`	`UG_FontSelect(&font_font_a_9X9);`
`1080`	`1078`