xobs/simmel-bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #60 from adafruit/develop

Browse Source 
fix #59 incorrect button mapping for feather nrf52840
This commit is contained in:
hathach 2019-03-26 23:09:27 -07:00 committed by GitHub
commit 60debfc217
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -251,6 +251,8 @@ CFLAGS += -ffunction-sections -fdata-sections -fno-strict-aliasing
CFLAGS += -fno-builtin --short-enums -fstack-usage CFLAGS += -fno-builtin --short-enums -fstack-usage
# Defined Symbol (MACROS) # Defined Symbol (MACROS)
# TODO use GIT_VERSION (numberic format)
CFLAGS += -DMK_BOOTLOADER_VERSION=0x0$(SD_VER1)0$(SD_VER2)0$(SD_VER3)UL CFLAGS += -DMK_BOOTLOADER_VERSION=0x0$(SD_VER1)0$(SD_VER2)0$(SD_VER3)UL
CFLAGS += -D__HEAP_SIZE=0 CFLAGS += -D__HEAP_SIZE=0

4
src/boards/feather_nrf52840_express.h
View File

@ -53,8 +53,8 @@
/* BUTTON /* BUTTON
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
#define BUTTONS_NUMBER 2 #define BUTTONS_NUMBER 2
#define BUTTON_1 _PINNUM(0, 15) #define BUTTON_1 _PINNUM(1, 02)
#define BUTTON_2 _PINNUM(0, 19) #define BUTTON_2 _PINNUM(0, 10)
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP #define BUTTON_PULL NRF_GPIO_PIN_PULLUP
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/