diff --git a/configs/tm4c123g-launchpad/src/Makefile b/configs/tm4c123g-launchpad/src/Makefile index 4ff1d8e0bb..27b0cdc329 100644 --- a/configs/tm4c123g-launchpad/src/Makefile +++ b/configs/tm4c123g-launchpad/src/Makefile @@ -55,6 +55,10 @@ CSRCS += tm4c_at24.c endif endif +ifeq ($(CONFIG_ARCH_BUTTONS),y) +CSRCS += tm4c_buttons.c +endif + COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) diff --git a/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h b/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h index 05c5ea6b28..668ef2ef4a 100644 --- a/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h +++ b/configs/tm4c123g-launchpad/src/tm4c123g-launchpad.h @@ -167,8 +167,12 @@ * BOARD_SW2 -- Connected to PF0 */ -#define GPIO_SW1 (GPIO_FUNC_INTERRUPT | GPIO_INT_BOTHEDGES | GPIO_PORTF | GPIO_PIN_1) -#define GPIO_SW2 (GPIO_FUNC_INTERRUPT | GPIO_INT_BOTHEDGES | GPIO_PORTF | GPIO_PIN_1) +#define GPIO_SW1 (GPIO_FUNC_INTERRUPT | GPIO_INT_BOTHEDGES | \ + GPIO_STRENGTH_2MA | GPIO_PADTYPE_STDWPU | GPIO_PORTF | \ + GPIO_PIN_4) +#define GPIO_SW2 (GPIO_FUNC_INTERRUPT | GPIO_INT_BOTHEDGES | \ + GPIO_STRENGTH_2MA | GPIO_PADTYPE_STDWPU | GPIO_PORTF | \ + GPIO_PIN_0) /************************************************************************************ * Public Functions diff --git a/configs/tm4c123g-launchpad/src/tm4c_buttons.c b/configs/tm4c123g-launchpad/src/tm4c_buttons.c new file mode 100644 index 0000000000..58ba624e8a --- /dev/null +++ b/configs/tm4c123g-launchpad/src/tm4c_buttons.c @@ -0,0 +1,167 @@ +/**************************************************************************** + * config/tm4c123g-launchpad/src/tm4c_buttons.c + * + * Copyright (C) 2015 Gregory Nutt. All rights reserved. + * Author: Bradley Noyes + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/************************************************************************************ + * Included Files + ************************************************************************************/ + +#include + +#include + +#include + +#include "tm4c123g-launchpad.h" + +#ifdef CONFIG_ARCH_BUTTONS + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: board_button_initialize + * + * Description: + * board_button_initialize() must be called to initialize button resources. + * After that, board_buttons() may be called to collect the current state of + * all buttons or board_button_irq() may be called to register button interrupt + * handlers. + * + ****************************************************************************/ + +void board_button_initialize(void) +{ + /* Unlock GPIOF from NMI to use it w/ buttons see Register 19 of GPIOs + * and see table 10-10 in datasheet for pins with special considerations. + */ + + modifyreg32(TIVA_GPIOF_LOCK, 0, GPIO_LOCK_UNLOCK); + modifyreg32(TIVA_GPIOF_CR, 0, 0x01); + modifyreg32(TIVA_GPIOF_LOCK, GPIO_LOCK_UNLOCK, GPIO_LOCK_LOCKED); + + /* Configure the GPIO pins as inputs. NOTE that EXTI interrupts are + * configured for some pins but NOT used in this file + */ + + tiva_configgpio(GPIO_SW1); + tiva_configgpio(GPIO_SW2); +} + +/**************************************************************************** + * Name: board_buttons + ****************************************************************************/ + +uint8_t board_buttons(void) +{ + uint8_t ret = 0x0; + + /* Check that state of each key. A LOW value means that the key is + * pressed. + */ + + if (!tiva_gpioread(GPIO_SW1)) + { + ret |= (1 << GPIO_PIN_4); + } + + if (!tiva_gpioread(GPIO_SW2)) + { + ret |= (1 << GPIO_PIN_0); + } + + return ret; +} + +/***************************************************************************** + * Button support. + * + * Description: + * board_button_initialize() must be called to initialize button resources. + * After that, board_buttons() may be called to collect the current state + * of all buttons or board_button_irq() may be called to register button + * interrupt handlers. + * + * After board_button_initialize() has been called, board_buttons() may be + * called to collect the state of all buttons. board_buttons() returns an + * 8-bit bit set with each bit associated with a button. See the + * BUTTON_*_BIT and JOYSTICK_*_BIT definitions in board.h for the meaning + * of each bit. + * + * board_button_irq() may be called to register an interrupt handler that + * will be called when a button is depressed or released. The ID value is + * a button enumeration value that uniquely identifies a button resource. + * See the BUTTON_* and JOYSTICK_* definitions in board.h for the meaning + * of enumeration values. The previous interrupt handler address is + * returned (so that it may restored, if so desired). + * + ****************************************************************************/ + +#if 0 +#ifdef CONFIG_ARCH_IRQBUTTONS +xcpt_t board_button_irq(int id, xcpt_t irqhandler) +{ + uint16_t gpio; + + if (id == BUTTON_KEY1) + { + gpio = GPIO_SW1; + } + else if (id == BUTTON_KEY2) + { + gpio = GPIO_SW2; + } + else + { + return NULL; + } + + return stm32_gpiosetevent(gpio, true, true, true, irqhandler); +} +#endif +#endif // 0 +#endif /* CONFIG_ARCH_BUTTONS */