From afd0a4541ba9ce8c5c1851b9734785af7e55a524 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Wed, 26 May 2021 11:37:07 +0200 Subject: [PATCH] Enable DEBUG over serial in bootloader --- .../common/arm/stm32/bootloader/CMakeLists.txt | 13 ++++++------- .../targets/common/arm/stm32/bootloader/boot.cpp | 9 +++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt index ca437bb82..09ab30da2 100644 --- a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt +++ b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt @@ -123,12 +123,12 @@ if(PCB STREQUAL X10 OR PCB STREQUAL X12S OR PCB STREQUAL NV14) ../../../../../syscalls.c ) -if(USB_CHARGER) - set(BOOTLOADER_SRC - ${BOOTLOADER_SRC} - ../../../../../targets/${TARGET_DIR}/usb_charger_driver.cpp - ../../../../../targets/${TARGET_DIR}/led_driver.cpp - ) + if(USB_CHARGER) + set(BOOTLOADER_SRC + ${BOOTLOADER_SRC} + ../../../../../targets/${TARGET_DIR}/usb_charger_driver.cpp + ../../../../../targets/${TARGET_DIR}/led_driver.cpp + ) endif() if(DEBUG) @@ -148,7 +148,6 @@ else() remove_definitions(-DDEBUG) endif() -remove_definitions(-DDEBUG) remove_definitions(-DDISK_CACHE) remove_definitions(-DLUA) remove_definitions(-DCLI) diff --git a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp index 417d32cf2..97a488f44 100644 --- a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp +++ b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp @@ -55,6 +55,11 @@ const uint8_t bootloaderVersion[] __attribute__ ((section(".version"), used)) = volatile rotenc_t rotencValue = 0; #endif +#if defined(DEBUG) +volatile tmr10ms_t g_tmr10ms; +uint32_t debugCounter1ms = 0; +#endif + uint32_t firmwareSize; uint32_t firmwareAddress = FIRMWARE_ADDRESS; uint32_t firmwareWritten = 0; @@ -73,6 +78,10 @@ void interrupt10ms() { tenms |= 1u; // 10 mS has passed +#if defined(DEBUG) + g_tmr10ms++; +#endif + uint8_t index = 0; uint8_t in = readKeys(); for (uint8_t i = 1; i != uint8_t(1u << TRM_BASE); i <<= 1) {