Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct issue when checking for user button pressed #271

Merged
merged 1 commit into from
Mar 30, 2017
Merged

Correct issue when checking for user button pressed #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion targets/CMSIS-OS/ChibiOS/ST_NUCLEO144_F746ZG/nanoBooter/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ int main(void) {
// the board to remain in nanoBooter and not launching nanoCLR

// if the USER button (blue one) is pressed, skip the check for a valid CLR image and remain in booter
if (palReadPad(GPIOC, GPIOC_BUTTON))
// the user button in this board has a pull-up resistor so the check has to be inverted
if (!palReadPad(GPIOC, GPIOC_BUTTON))
{
// check for valid CLR image
if(CheckValidCLRImage((uint32_t)&__nanoImage_end__))
Expand Down
3 changes: 2 additions & 1 deletion targets/CMSIS-OS/ChibiOS/ST_STM32F429I_DISCOVERY/nanoBooter/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ int main(void) {
// the board to remain in nanoBooter and not launching nanoCLR

// if the USER button (blue one) is pressed, skip the check for a valid CLR image and remain in booter
if (palReadPad(GPIOA, GPIOA_BUTTON))
// the user button in this board has a pull-up resistor so the check has to be inverted
if (!palReadPad(GPIOA, GPIOA_BUTTON))
{
// check for valid CLR image
if(CheckValidCLRImage((uint32_t)&__nanoImage_end__))
Expand Down
1 change: 1 addition & 0 deletions targets/CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/nanoBooter/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ int main(void) {
// the board to remain in nanoBooter and not launching nanoCLR

// if the USER button (blue one) is pressed, skip the check for a valid CLR image and remain in booter
// the user button in this board has a pull-up resistor so the check has to be inverted
if (!palReadPad(GPIOA, GPIOA_BUTTON))
{
// check for valid CLR image
Expand Down