Merge branch 'touch'

Author: benma

.github/workflows/ci-common.yml

@@ -171,7 +171,10 @@ jobs:
           - bootloader-btc-production
           - bootloader-plus
           - bootloader-plus-development
+          - bootloader-plus-production
           - bootloader-plus-debug
+          - bootloader-btc-plus-development
+          - bootloader-btc-plus-production
           - firmware
           - firmware-btc
           - factory-setup

CHANGELOG.md

@@ -159,6 +159,9 @@ customers cannot upgrade their bootloader, its changes are recorded separately.
 
 ## Bootloader
 
+### v1.1.1
+- Fix touch in plus bootloader
+
 ### v1.1.0
 - Update manufacturer HID descriptor to bitbox.swiss
 - Implement OP_HARDWARE endpoint, to identify the secure chip model

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.0")
 set(FIRMWARE_BTC_ONLY_VERSION "v9.23.0")
-set(BOOTLOADER_VERSION "v1.1.0")
+set(BOOTLOADER_VERSION "v1.1.1")
 
 find_package(PythonInterp 3.6 REQUIRED)
 

src/bootloader/startup.c

@@ -83,7 +83,7 @@ int main(void)
     platform_init();
     __stack_chk_guard = rand_sync_read32(&RAND_0);
     screen_init();
-#ifdef BOOTLOADER_DEVDEVICE
+#if defined(BOOTLOADER_DEVDEVICE) || PLATFORM_BITBOX02PLUS == 1
     qtouch_init();
 #endif
     bootloader_jump();

src/platform/driver_init.c

@@ -395,7 +395,7 @@ void bootloader_init(void)
     _oled_set_pins();
     _ptc_clock_init();
 
-#ifdef BOOTLOADER_DEVDEVICE
+#if defined(BOOTLOADER_DEVDEVICE) || PLATFORM_BITBOX02PLUS == 1
     // Only needed for qtouch, which is only needed in the devdevice bootloader.
     _timer_peripheral_init();
 #endif