From 618bd5978a4e9c362a76d39e961fbdc27379f17e Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Tue, 12 Jan 2021 16:03:51 -0800 Subject: [PATCH] can-gps-v1:canbootloader SAFETY is GETNODEINFO_JUMPER --- boards/cuav/can-gps-v1/src/board_config.h | 3 +-- boards/cuav/can-gps-v1/src/boot_config.h | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/boards/cuav/can-gps-v1/src/board_config.h b/boards/cuav/can-gps-v1/src/board_config.h index 405682c609..b97bb98d6c 100644 --- a/boards/cuav/can-gps-v1/src/board_config.h +++ b/boards/cuav/can-gps-v1/src/board_config.h @@ -48,8 +48,7 @@ #include /* BUTTON *************************************************************************** */ -#define BUTTON_BOOT0n (GPIO_INPUT|GPIO_FLOAT|GPIO_PORTB|GPIO_PIN3|GPIO_EXTI) -#define IRQBUTTON BUTTON_BOOT0_BIT +#define BUTTON_SAFETY /* PB3 */ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTB|GPIO_PIN3|GPIO_EXTI) #define GPIO_RGB_S /* PB0 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN0) /* CAN Silence diff --git a/boards/cuav/can-gps-v1/src/boot_config.h b/boards/cuav/can-gps-v1/src/boot_config.h index 107a5e843b..504f9a8c4a 100644 --- a/boards/cuav/can-gps-v1/src/boot_config.h +++ b/boards/cuav/can-gps-v1/src/boot_config.h @@ -132,9 +132,5 @@ /* Bootloader Option***************************************************************** * - * GPIO Function MPU Board - * Pin # Name - * -- ----- -------------------------------- ---------------------------- - * * PC[09] PC9/TIM3_CH4 40 BOOT0 */ -#define GPIO_GETNODEINFO_JUMPER (BUTTON_BOOT0n&~(GPIO_EXTI)) +#define GPIO_GETNODEINFO_JUMPER (BUTTON_SAFETY & ~GPIO_EXTI)