From 0c843eceb37437198d1a0e5fa454db64009a2ba9 Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 4 Jun 2019 16:42:02 +0200 Subject: [PATCH] Fix critical issue when flashing 2.2.x firm from 2.3 bootloader (making 2.3 BL init wrong interupt not handled by 2.2 firm) --- radio/src/targets/common/arm/stm32/bootloader/boot.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp index d44576bea..bcadf7e08 100644 --- a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp +++ b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp @@ -210,10 +210,6 @@ int main() keysInit(); -#if defined(ROTARY_ENCODER_NAVIGATION) - rotaryEncoderInit(); -#endif - boardPreInit(); // wait for inputs to stabilize @@ -227,6 +223,10 @@ int main() jumpTo(APP_START_ADDRESS); } +#if defined(ROTARY_ENCODER_NAVIGATION) + rotaryEncoderInit(); +#endif + pwrInit(); delaysInit(); // needed for lcdInit()