From 3c7eea7336349475c03aa2fd186a5f73fc195d28 Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Tue, 31 May 2022 07:34:26 -0400 Subject: [PATCH] stm32: call "try_request_canboot" for bootloader requests Signed-off-by: Eric Callahan --- src/stm32/stm32f0.c | 1 + src/stm32/stm32f1.c | 1 + src/stm32/stm32f4.c | 1 + src/stm32/stm32g0.c | 1 + src/stm32/stm32h7.c | 1 + 5 files changed, 5 insertions(+) diff --git a/src/stm32/stm32f0.c b/src/stm32/stm32f0.c index 6b13d737..a751b546 100644 --- a/src/stm32/stm32f0.c +++ b/src/stm32/stm32f0.c @@ -163,6 +163,7 @@ check_usb_dfu_bootloader(void) void usb_request_bootloader(void) { + try_request_canboot(); usb_reboot_for_dfu_bootloader(); } diff --git a/src/stm32/stm32f1.c b/src/stm32/stm32f1.c index 526ec485..25bba83f 100644 --- a/src/stm32/stm32f1.c +++ b/src/stm32/stm32f1.c @@ -243,6 +243,7 @@ usb_stm32duino_bootloader(void) void usb_request_bootloader(void) { + try_request_canboot(); if (CONFIG_STM32_FLASH_START_800) usb_hid_bootloader(); else if (CONFIG_STM32_FLASH_START_2000) diff --git a/src/stm32/stm32f4.c b/src/stm32/stm32f4.c index 149cd171..58d8dbb4 100644 --- a/src/stm32/stm32f4.c +++ b/src/stm32/stm32f4.c @@ -231,6 +231,7 @@ check_usb_dfu_bootloader(void) void usb_request_bootloader(void) { + try_request_canboot(); if (CONFIG_STM32_FLASH_START_4000) usb_hid_bootloader(); usb_reboot_for_dfu_bootloader(); diff --git a/src/stm32/stm32g0.c b/src/stm32/stm32g0.c index 4906f051..a98cc811 100644 --- a/src/stm32/stm32g0.c +++ b/src/stm32/stm32g0.c @@ -133,6 +133,7 @@ check_usb_dfu_bootloader(void) void usb_request_bootloader(void) { + try_request_canboot(); usb_reboot_for_dfu_bootloader(); } diff --git a/src/stm32/stm32h7.c b/src/stm32/stm32h7.c index ebb71cfb..c615d286 100644 --- a/src/stm32/stm32h7.c +++ b/src/stm32/stm32h7.c @@ -190,6 +190,7 @@ clock_setup(void) void usb_request_bootloader(void) { + try_request_canboot(); }