From e52f649555bd907e5aa431dc03c7d0f01be7d403 Mon Sep 17 00:00:00 2001
From: Kevin Gilbert <Kevin.Gilbert@arm.com>
Date: Tue, 2 May 2017 12:20:05 -0500
Subject: [PATCH] Addressed review comments: fixed unmapped switches and added
 Hexiware buttons

---
 .../TARGET_MCU_K64F/TARGET_HEXIWEAR/PinNames.h           | 5 +++++
 .../TARGET_MAX32620/TARGET_MAX32620HSP/PinNames.h        | 2 --
 .../TARGET_MAX32630/TARGET_MAX32630FTHR/PinNames.h       | 2 --
 targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h         | 9 +++++++--
 .../TARGET_STM32L476xG/TARGET_DISCO_L476VG/PinNames.h    | 5 +++++
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_HEXIWEAR/PinNames.h b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_HEXIWEAR/PinNames.h
index 32983d0a36..f674c9477c 100644
--- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_HEXIWEAR/PinNames.h
+++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_HEXIWEAR/PinNames.h
@@ -201,6 +201,11 @@ typedef enum {
     LED3 = LED_BLUE,
     LED4 = LED_RED,
 
+    // Standardized button names
+    BUTTON1 = PTA12,
+    BUTTON2 = PTA13,
+    BUTTON3 = PTA15,
+
     // USB Pins
     USBTX = PTB17,
     USBRX = PTB16,
diff --git a/targets/TARGET_Maxim/TARGET_MAX32620/TARGET_MAX32620HSP/PinNames.h b/targets/TARGET_Maxim/TARGET_MAX32620/TARGET_MAX32620HSP/PinNames.h
index 748c45f3bb..c6030ef13d 100644
--- a/targets/TARGET_Maxim/TARGET_MAX32620/TARGET_MAX32620HSP/PinNames.h
+++ b/targets/TARGET_Maxim/TARGET_MAX32620/TARGET_MAX32620HSP/PinNames.h
@@ -128,8 +128,6 @@ typedef enum {
     SW3 = NOT_CONNECTED,
     // Standardized button names
     BUTTON1 = SW1,
-    BUTTON2 = SW2,
-    BUTTON3 = SW3,
 
     // USB bridge connected UART pins
     USBTX = P0_1,
diff --git a/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/PinNames.h b/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/PinNames.h
index c942660651..1b5719533a 100644
--- a/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/PinNames.h
+++ b/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/PinNames.h
@@ -81,8 +81,6 @@ typedef enum {
     SW3 = NOT_CONNECTED,
     // Standardized button names
     BUTTON1 = SW1,
-    BUTTON2 = SW2,
-    BUTTON3 = SW3,
 
     // USB bridge connected UART pins
     USBTX = P2_1,
diff --git a/targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h b/targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h
index efd753bff8..a819364ee7 100644
--- a/targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h
+++ b/targets/TARGET_ONSEMI/TARGET_NCS36510/PinNames.h
@@ -128,10 +128,15 @@ typedef enum {
     LED_YELLOW  = GPIO6,
     LED_BLUE    = GPIO5,
     USER_BUTTON = GPIO7,  /*NEW connection on NCS36510-RF Rev 1.1 - Alias of SW1 */
-    // Standardized button names
-    BUTTON1 = USER_BUTTON,
+
     SW1 = GPIO7,  /*NEW connection on NCS36510-RF Rev 1.1 */
     SW2 = GPIO10,   /*NEW connection on NCS36510-RF Rev 1.1 */
+
+    // Standardized button names
+    BUTTON1 = USER_BUTTON,
+    BUTTON2 = SW1,
+    BUTTON3 = SW2,
+
     SERIAL_TX   = GPIO0,
     SERIAL_RX   = GPIO1,
     USBTX       = GPIO0,
diff --git a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_DISCO_L476VG/PinNames.h b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_DISCO_L476VG/PinNames.h
index 2a50d06a01..3f77490067 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_DISCO_L476VG/PinNames.h
+++ b/targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_DISCO_L476VG/PinNames.h
@@ -144,6 +144,11 @@ typedef enum {
     USER_BUTTON = JOYSTICK_CENTER,
     // Standardized button names
     BUTTON1 = USER_BUTTON,
+    BUTTON2 = JOYSTICK_LEFT,
+    BUTTON3 = JOYSTICK_RIGH,
+    BUTTON4 = JOYSTICK_UP, 
+    BUTTON5 = JOYSTICK_DOWN,
+
     SERIAL_TX = PD_5,
     SERIAL_RX = PD_6,
     USBTX = PD_5,