Merge pull request adafruit#60 from adafruit/develop

fix adafruit#59 incorrect button mapping for feather nrf52840
electronut · Mar 27, 2019 · 60debfc · 60debfc
2 parents 8df909f + 2713069
commit 60debfc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -251,6 +251,8 @@ CFLAGS += -ffunction-sections -fdata-sections -fno-strict-aliasing
 CFLAGS += -fno-builtin --short-enums -fstack-usage
 
 # Defined Symbol (MACROS)
+
+# TODO use GIT_VERSION (numberic format)
 CFLAGS += -DMK_BOOTLOADER_VERSION=0x0$(SD_VER1)0$(SD_VER2)0$(SD_VER3)UL
 
 CFLAGS += -D__HEAP_SIZE=0

diff --git a/src/boards/feather_nrf52840_express.h b/src/boards/feather_nrf52840_express.h
@@ -53,8 +53,8 @@
 /* BUTTON
  *------------------------------------------------------------------*/
 #define BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(0, 15)
-#define BUTTON_2              _PINNUM(0, 19)
+#define BUTTON_1              _PINNUM(1, 02)
+#define BUTTON_2              _PINNUM(0, 10)
 #define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
 
 /*------------------------------------------------------------------*/