From 4817a1404e2ad997e94989d327d8383833778f41 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 2 Dec 2019 09:35:49 +0100 Subject: [PATCH] We waited for inputs stabilization on all radios in 2.2 --- radio/src/targets/common/arm/stm32/bootloader/boot.cpp | 2 -- radio/src/targets/horus/hal.h | 2 -- radio/src/targets/taranis/hal.h | 1 - 3 files changed, 5 deletions(-) diff --git a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp index 90166ffdd..106734a2f 100644 --- a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp +++ b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp @@ -210,14 +210,12 @@ int main() pwrInit(); keysInit(); -#if defined(BOOTLOADER_WAIT_BEFORE_READ_TRIMS) // wait a bit for the inputs to stabilize... if (!WAS_RESET_BY_WATCHDOG_OR_SOFTWARE()) { for (uint32_t i = 0; i < 150000; i++) { __ASM volatile ("nop"); } } -#endif // LHR & RHL trims not pressed simultanously if (readTrims() != BOOTLOADER_KEYS) { diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h index 64259dc09..e7afa6ddb 100644 --- a/radio/src/targets/horus/hal.h +++ b/radio/src/targets/horus/hal.h @@ -140,8 +140,6 @@ #define SWITCHES_GPIO_PIN_J GPIO_Pin_0 // PB.00 #endif -#define BOOTLOADER_WAIT_BEFORE_READ_TRIMS - // Trims #if defined(PCBX12S) #define TRIMS_GPIO_REG_RHL GPIOC->IDR diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 6b890b5e2..235e5eefb 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -228,7 +228,6 @@ #define TRIMS_GPIO_REG_RHL GPIOD->IDR #define TRIMS_GPIO_PIN_RHL GPIO_Pin_9 // PD.09 #elif defined(PCBX9DP) && PCBREV >= 2019 - #define BOOTLOADER_WAIT_BEFORE_READ_TRIMS #define TRIMS_GPIO_REG_LHL GPIOE->IDR #define TRIMS_GPIO_PIN_LHL GPIO_Pin_3 // PE.03 #define TRIMS_GPIO_REG_LHR GPIOE->IDR