From 77cc87b0502c8e0c9690c04ecd8aeb43a56251ce Mon Sep 17 00:00:00 2001 From: Kevin Gilbert Date: Thu, 27 Apr 2017 18:42:47 -0500 Subject: [PATCH] Adding consistent button pin mappings --- .../TARGET_KLXX/TARGET_KL46Z/PinNames.h | 2 + .../TARGET_K66F/TARGET_FRDM/PinNames.h | 2 + .../TARGET_K82F/TARGET_FRDM/PinNames.h | 2 + .../TARGET_KL27Z/TARGET_FRDM/PinNames.h | 2 + .../TARGET_KL43Z/TARGET_FRDM/PinNames.h | 2 + .../TARGET_KL82Z/TARGET_FRDM/PinNames.h | 2 + .../TARGET_KW24D/TARGET_FRDM/PinNames.h | 4 + .../TARGET_KW41Z/TARGET_FRDM/PinNames.h | 2 + .../TARGET_MCU_K22F512/TARGET_FRDM/PinNames.h | 2 + .../TARGET_MCU_K64F/TARGET_FRDM/PinNames.h | 2 + .../TARGET_MAX32600MBED/PinNames.h | 2 + .../TARGET_MAXWSNENV/PinNames.h | 1 + .../TARGET_MAX32620HSP/PinNames.h | 3 + .../TARGET_MAX32625MBED/PinNames.h | 2 + .../TARGET_MAX32625NEXPAQ/PinNames.h | 3 + .../TARGET_MAX32630FTHR/PinNames.h | 3 + .../TARGET_DELTA_DFCM_NNN40/PinNames.h | 1 + .../TARGET_HRM1017/PinNames.h | 153 ------------------ 18 files changed, 37 insertions(+), 153 deletions(-) diff --git a/targets/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PinNames.h b/targets/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PinNames.h index d5bb7bded8..5e7a6954d7 100644 --- a/targets/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PinNames.h +++ b/targets/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PinNames.h @@ -203,6 +203,8 @@ typedef enum { //Push buttons SW1 = PTC3, SW3 = PTC12, + BUTTON1 = SW1, + BUTTON2 = SW3, // USB Pins USBTX = PTA2, diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/TARGET_FRDM/PinNames.h b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/TARGET_FRDM/PinNames.h index 6f46154304..90871afa7b 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/TARGET_FRDM/PinNames.h +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/TARGET_FRDM/PinNames.h @@ -204,6 +204,8 @@ typedef enum { //Push buttons SW2 = PTD11, SW3 = PTA10, + BUTTON1 = SW2, + BUTTON2 = SW3, // USB Pins USBTX = PTB17, diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/TARGET_FRDM/PinNames.h b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/TARGET_FRDM/PinNames.h index 9e88d8e830..88419ff75c 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/TARGET_FRDM/PinNames.h +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/TARGET_FRDM/PinNames.h @@ -134,6 +134,8 @@ typedef enum { //Push buttons SW2 = PTA4, SW3 = PTC6, + BUTTON1 = SW2, + BUTTON2 = SW3, // USB Pins USBTX = PTC15, diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/TARGET_FRDM/PinNames.h b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/TARGET_FRDM/PinNames.h index dab9a16ce7..1efdb22b57 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/TARGET_FRDM/PinNames.h +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/TARGET_FRDM/PinNames.h @@ -98,6 +98,8 @@ typedef enum { //Push buttons SW1 = PTA4, SW3 = PTC1, + BUTTON1 = SW1, + BUTTON2 = SW3, // USB Pins USBTX = PTA2, diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/TARGET_FRDM/PinNames.h b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/TARGET_FRDM/PinNames.h index a767b72c21..5542e6dcc4 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/TARGET_FRDM/PinNames.h +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/TARGET_FRDM/PinNames.h @@ -97,6 +97,8 @@ typedef enum { //Push buttons SW1 = PTA4, SW3 = PTC3, + BUTTON1 = SW1, + BUTTON2 = SW3, // USB Pins USBTX = PTA2, diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/TARGET_FRDM/PinNames.h b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/TARGET_FRDM/PinNames.h index 55ad0cf4f5..b74c366c32 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/TARGET_FRDM/PinNames.h +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/TARGET_FRDM/PinNames.h @@ -118,6 +118,8 @@ typedef enum { //Push buttons SW2 = PTA4, SW3 = PTD0, + BUTTON1 = SW2, + BUTTON2 = SW3, // USB Pins USBTX = PTB17, diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/TARGET_FRDM/PinNames.h b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/TARGET_FRDM/PinNames.h index 41a1af824f..3108dc4532 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/TARGET_FRDM/PinNames.h +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/TARGET_FRDM/PinNames.h @@ -82,6 +82,10 @@ typedef enum { SW2 = PTE3, SW3 = PTD1, SW4 = PTA19, + BUTTON1 = SW1, + BUTTON2 = SW2, + BUTTON3 = SW3, + BUTTON4 = SW4, // USB Pins USBTX = PTE0, diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/TARGET_FRDM/PinNames.h b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/TARGET_FRDM/PinNames.h index 125b90c550..9f014dedf6 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/TARGET_FRDM/PinNames.h +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/TARGET_FRDM/PinNames.h @@ -69,6 +69,8 @@ typedef enum { //Push buttons SW3 = PTC4, SW4 = PTC5, + BUTTON1 = SW3, + BUTTON2 = SW4, // USB Pins USBTX = PTC7, diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/TARGET_MCU_K22F512/TARGET_FRDM/PinNames.h b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/TARGET_MCU_K22F512/TARGET_FRDM/PinNames.h index c18628ff11..77fd2ed657 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/TARGET_MCU_K22F512/TARGET_FRDM/PinNames.h +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/TARGET_MCU_K22F512/TARGET_FRDM/PinNames.h @@ -204,6 +204,8 @@ typedef enum { //Push buttons SW2 = PTC1, SW3 = PTB17, + BUTTON1 = SW2, + BUTTON2 = SW3, // USB Pins USBTX = PTE0, diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_FRDM/PinNames.h b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_FRDM/PinNames.h index d0624d1d1b..3e3b96400c 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_FRDM/PinNames.h +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_FRDM/PinNames.h @@ -204,6 +204,8 @@ typedef enum { //Push buttons SW2 = PTC6, SW3 = PTA4, + BUTTON1 = SW2, + BUTTON2 = SW3, // USB Pins USBTX = PTB17, diff --git a/targets/TARGET_Maxim/TARGET_MAX32600/TARGET_MAX32600MBED/PinNames.h b/targets/TARGET_Maxim/TARGET_MAX32600/TARGET_MAX32600MBED/PinNames.h index eddfc3f7b4..5f724d7d58 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32600/TARGET_MAX32600MBED/PinNames.h +++ b/targets/TARGET_Maxim/TARGET_MAX32600/TARGET_MAX32600MBED/PinNames.h @@ -184,6 +184,8 @@ typedef enum { // Push button SW2 = P6_4, SW3 = P6_5, + BUTTON1 = SW2, + BUTTON2 = SW3, // UART pins USBTX = P7_3, diff --git a/targets/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PinNames.h b/targets/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PinNames.h index d541185392..7be42fa88a 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PinNames.h +++ b/targets/TARGET_Maxim/TARGET_MAX32610/TARGET_MAXWSNENV/PinNames.h @@ -128,6 +128,7 @@ typedef enum { // Push button SW1 = P1_5, + BUTTON1 = SW1, // UART Pins UART0_RX = P1_0, diff --git a/targets/TARGET_Maxim/TARGET_MAX32620/TARGET_MAX32620HSP/PinNames.h b/targets/TARGET_Maxim/TARGET_MAX32620/TARGET_MAX32620HSP/PinNames.h index 559730a359..41bfd371ce 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32620/TARGET_MAX32620HSP/PinNames.h +++ b/targets/TARGET_Maxim/TARGET_MAX32620/TARGET_MAX32620HSP/PinNames.h @@ -126,6 +126,9 @@ typedef enum { SW1 = P2_1, SW2 = NOT_CONNECTED, SW3 = NOT_CONNECTED, + BUTTON1 = SW1, + BUTTON2 = SW2, + BUTTON3 = SW3, // USB bridge connected UART pins USBTX = P0_1, diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/PinNames.h b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/PinNames.h index 9ed4f7d85e..21e257d197 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/PinNames.h +++ b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625MBED/PinNames.h @@ -76,6 +76,8 @@ typedef enum { // Push button SW2 = P2_2, SW3 = P2_3, + BUTTON1 = SW2, + BUTTON2 = SW3, // USB bridge connected UART pins USBTX = P2_1, diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625NEXPAQ/PinNames.h b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625NEXPAQ/PinNames.h index 9574edf1ec..d0f8478d23 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625NEXPAQ/PinNames.h +++ b/targets/TARGET_Maxim/TARGET_MAX32625/TARGET_MAX32625NEXPAQ/PinNames.h @@ -75,6 +75,9 @@ typedef enum { SW1 = P4_2, SW2 = P4_3, SW3 = P4_4, + BUTTON1 = SW1, + BUTTON2 = SW2, + BUTTON3 = SW3, // USB bridge connected UART pins USBTX = P2_1, diff --git a/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/PinNames.h b/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/PinNames.h index d5df59a62c..98e3d43aa3 100644 --- a/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/PinNames.h +++ b/targets/TARGET_Maxim/TARGET_MAX32630/TARGET_MAX32630FTHR/PinNames.h @@ -79,6 +79,9 @@ typedef enum { SW1 = P2_3, SW2 = NOT_CONNECTED, SW3 = NOT_CONNECTED, + BUTTON1 = SW1, + BUTTON2 = SW2, + BUTTON3 = SW3, // USB bridge connected UART pins USBTX = P2_1, diff --git a/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/PinNames.h b/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/PinNames.h index 834b733338..bd3e3e53ed 100644 --- a/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/PinNames.h +++ b/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/PinNames.h @@ -136,6 +136,7 @@ typedef enum { A4 = p6, SWIO = p19, + BUTTON1 = SWIO, VERF0 = p0, // SPI for controlling internal flash, don't use it. diff --git a/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_HRM1017/PinNames.h b/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_HRM1017/PinNames.h index 031b2ad26a..e69de29bb2 100644 --- a/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_HRM1017/PinNames.h +++ b/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_HRM1017/PinNames.h @@ -1,153 +0,0 @@ -/* mbed Microcontroller Library - * Copyright (c) 2013 Nordic Semiconductor - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef MBED_PINNAMES_H -#define MBED_PINNAMES_H - -#include "cmsis.h" - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum { - PIN_INPUT, - PIN_OUTPUT -} PinDirection; - -#define PORT_SHIFT 3 - -typedef enum { - p0 = 0, - p1 = 1, - p2 = 2, - p3 = 3, - p4 = 4, - p5 = 5, - p6 = 6, - p7 = 7, - p8 = 8, - p9 = 9, - p10 = 10, - p11 = 11, - p12 = 12, - p13 = 13, - p14 = 14, - p15 = 15, - p16 = 16, - p17 = 17, - p18 = 18, - p19 = 19, - p20 = 20, - p21 = 21, - p22 = 22, - p23 = 23, - p24 = 24, - p25 = 25, - p26 = 26, - p27 = 27, - p28 = 28, - p29 = 29, - p30 = 30, -// p31=31, - - P0_0 = p0, - P0_1 = p1, - P0_2 = p2, - P0_3 = p3, - P0_4 = p4, - P0_5 = p5, - P0_6 = p6, - P0_7 = p7, - - P0_8 = p8, - P0_9 = p9, - P0_10 = p10, - P0_11 = p11, - P0_12 = p12, - P0_13 = p13, - P0_14 = p14, - P0_15 = p15, - - P0_16 = p16, - P0_17 = p17, - P0_18 = p18, - P0_19 = p19, - P0_20 = p20, - P0_21 = p21, - P0_22 = p22, - P0_23 = p23, - - P0_24 = p24, - P0_25 = p25, - P0_26 = p26, - P0_27 = p27, - P0_28 = p28, - P0_29 = p29, - P0_30 = p30, - - LED1 = p18, - LED2 = p19, - LED3 = p18, - LED4 = p19, - - BUTTON1 = p16, - BUTTON2 = p17, - - RX_PIN_NUMBER = p11, - TX_PIN_NUMBER = p9, - CTS_PIN_NUMBER = p10, - RTS_PIN_NUMBER = p8, - - // mBed interface Pins - USBTX = TX_PIN_NUMBER, - USBRX = RX_PIN_NUMBER, - - SPI_PSELMOSI0 = p20, - SPI_PSELMISO0 = p22, - SPI_PSELSS0 = p24, - SPI_PSELSCK0 = p25, - - SPI_PSELMOSI1 = p12, - SPI_PSELMISO1 = p13, - SPI_PSELSS1 = p14, - SPI_PSELSCK1 = p15, - - SPIS_PSELMOSI = p12, - SPIS_PSELMISO = p13, - SPIS_PSELSS = p14, - SPIS_PSELSCK = p15, - - I2C_SDA0 = p22, - I2C_SCL0 = p20, - - I2C_SDA1 = p13, - I2C_SCL1 = p15, - // Not connected - NC = (int)0xFFFFFFFF -} PinName; - -typedef enum { - PullNone = 0, - PullDown = 1, - PullUp = 3, - PullDefault = PullUp -} PinMode; - -#ifdef __cplusplus -} -#endif - -#endif