RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

bootloaders: fix bootloader button logic

Browse Source 
Signed-off-by: Dylan Laduranty <dylan.laduranty@mesotic.com>
This commit is contained in:
Dylan Laduranty 2023-03-07 12:00:37 +01:00
parent 777857ae4c
commit 48b07eb991
4 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bootloaders/riotboot_dfu/main.c
View File

@ -36,9 +36,19 @@
static bool _bootloader_alternative_mode(void) static bool _bootloader_alternative_mode(void)
{ {
#ifdef BTN_BOOTLOADER_PIN #if defined (BTN_BOOTLOADER_PIN) && defined (BTN_BOOTLOADER_MODE)
bool state;
gpio_init(BTN_BOOTLOADER_PIN, BTN_BOOTLOADER_MODE); gpio_init(BTN_BOOTLOADER_PIN, BTN_BOOTLOADER_MODE);
return (bool)gpio_read(BTN_BOOTLOADER_PIN) != BTN_BOOTLOADER_INVERTED; state = gpio_read(BTN_BOOTLOADER_PIN);
/* If button configures w/ internal or external pullup, then it is an
active-low, thus reverts the logic */
if (BTN_BOOTLOADER_EXT_PULLUP || BTN_BOOTLOADER_MODE == GPIO_IN_PU ||
BTN_BOOTLOADER_MODE == GPIO_OD_PU ) {
return !state;
} else {
return state;
}
#else #else
return false; return false;
#endif #endif

14
bootloaders/riotboot_tinyusb_dfu/main.c
View File

@ -36,9 +36,19 @@
static bool _bootloader_alternative_mode(void) static bool _bootloader_alternative_mode(void)
{ {
#ifdef BTN_BOOTLOADER_PIN #if defined (BTN_BOOTLOADER_PIN) && defined (BTN_BOOTLOADER_MODE)
bool state;
gpio_init(BTN_BOOTLOADER_PIN, BTN_BOOTLOADER_MODE); gpio_init(BTN_BOOTLOADER_PIN, BTN_BOOTLOADER_MODE);
return (bool)gpio_read(BTN_BOOTLOADER_PIN) != BTN_BOOTLOADER_INVERTED; state = gpio_read(BTN_BOOTLOADER_PIN);
/* If button configures w/ internal or external pullup, then it is an
active-low, thus reverts the logic */
if (BTN_BOOTLOADER_EXT_PULLUP || BTN_BOOTLOADER_MODE == GPIO_IN_PU ||
BTN_BOOTLOADER_MODE == GPIO_OD_PU ) {
return !state;
} else {
return state;
}
#else #else
return false; return false;
#endif #endif

17
sys/include/riotboot/bootloader_selection.h
View File

@ -58,19 +58,12 @@ extern "C" {
/** @brief Interpretation of @ref BTN_BOOTLOADER_PIN. /** @brief Interpretation of @ref BTN_BOOTLOADER_PIN.
* *
* Set to true for active-low buttons (go to DFU if the pin is low), otherwise * This value should be set to true if the button has an *external* pull-up and
* to false (go to DFU if the pin is high). * thus, works as an active-low button.
* * If the button has an internal pull-up, the default value should remains false
* The default value for all boards is inverted (active-low), except if
* BTN0_MODE is defined as GPIO_IN_PD. In this case the value is not
* inverted (high-active).
*/ */
#ifndef BTN_BOOTLOADER_INVERTED #ifndef BTN_BOOTLOADER_EXT_PULLUP
#if (BTN0_MODE == GPIO_IN_PD) #define BTN_BOOTLOADER_EXT_PULLUP false
#define BTN_BOOTLOADER_INVERTED false
#else
#define BTN_BOOTLOADER_INVERTED true
#endif
#endif #endif
/** @brief LED pin for bootloader indication /** @brief LED pin for bootloader indication

7
sys/riotboot/serial.c
View File

@ -57,8 +57,11 @@ static inline void uart_write_byte(uart_t uart, uint8_t data)
static inline bool _boot_pin(void) static inline bool _boot_pin(void)
{ {
#ifdef BTN_BOOTLOADER_PIN #if defined (BTN_BOOTLOADER_PIN) && defined(BTN_BOOTLOADER_MODE)
if (BTN_BOOTLOADER_INVERTED) { /* Reverts the logic if the button has an internal or external pullup and
thus, is an active-low button */
if (BTN_BOOTLOADER_EXT_PULLUP || BTN_BOOTLOADER_MODE == GPIO_IN_PU ||
BTN_BOOTLOADER_MODE == GPIO_OD_PU ) {
return !gpio_read(BTN_BOOTLOADER_PIN); return !gpio_read(BTN_BOOTLOADER_PIN);
} }
else { else {