diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-12-04 12:04:21 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-12-04 12:04:21 -0600 |
| commit | 6fd7621780918711869ca4e763c406d2365f55cf (patch) | |
| tree | fd66baf5cfb0a3ec69b90094e762d17a9b14b27d /nuttx/configs/nucleo-f4x1re | |
| parent | d8f9c5a271166cf46e0839273ff5c85c5e9ac36b (diff) | |
| download | nuttx-6fd7621780918711869ca4e763c406d2365f55cf.tar.gz nuttx-6fd7621780918711869ca4e763c406d2365f55cf.tar.bz2 nuttx-6fd7621780918711869ca4e763c406d2365f55cf.zip | |
Nucleo-f4x1re: Fix some joystick pin definitions
Diffstat (limited to 'nuttx/configs/nucleo-f4x1re')
| -rw-r--r-- | nuttx/configs/nucleo-f4x1re/README.txt | 10 | ||||
| -rw-r--r-- | nuttx/configs/nucleo-f4x1re/src/nucleo-f4x1re.h | 8 | ||||
| -rw-r--r-- | nuttx/configs/nucleo-f4x1re/src/stm32_ajoystick.c | 5 |
3 files changed, 18 insertions, 5 deletions
diff --git a/nuttx/configs/nucleo-f4x1re/README.txt b/nuttx/configs/nucleo-f4x1re/README.txt index 46c127536..ac40c152e 100644 --- a/nuttx/configs/nucleo-f4x1re/README.txt +++ b/nuttx/configs/nucleo-f4x1re/README.txt @@ -576,6 +576,16 @@ Shields CONFIG_EXAMPLES_AJOYSTICK_DEVNAME="/dev/ajoy0" CONFIG_EXAMPLES_AJOYSTICK_SIGNO=13 + STATUS: + 2014-12-04: + - Without ADC DMA support, it is not possible to sample both X and Y + with a single ADC. Right now, only one axis is being converted. + - There is conflicts with some of the Arduino data pins and the + default USART1 configuration. I am currently running with USART1 + but with CONFIG_NUCLEO_F401RE_AJOY_MINBUTTONS to eliminate the + conflict. + - Current showstopper: I am not getting joystick button interrupts. + Configurations ============== diff --git a/nuttx/configs/nucleo-f4x1re/src/nucleo-f4x1re.h b/nuttx/configs/nucleo-f4x1re/src/nucleo-f4x1re.h index 808659c9f..f96fa4cc7 100644 --- a/nuttx/configs/nucleo-f4x1re/src/nucleo-f4x1re.h +++ b/nuttx/configs/nucleo-f4x1re/src/nucleo-f4x1re.h @@ -205,15 +205,15 @@ #define ADC_YOUPUT 0 /* Y output is on ADC channel 0 */ #define GPIO_BUTTON_A \ - (GPIO_INPUT | GPIO_FLOAT |GPIO_EXTI | GPIO_PORTB | GPIO_PIN3) + (GPIO_INPUT | GPIO_FLOAT |GPIO_EXTI | GPIO_PORTA | GPIO_PIN8) #define GPIO_BUTTON_B \ - (GPIO_INPUT | GPIO_FLOAT |GPIO_EXTI | GPIO_PORTB | GPIO_PIN5) + (GPIO_INPUT | GPIO_FLOAT |GPIO_EXTI | GPIO_PORTB | GPIO_PIN10) #define GPIO_BUTTON_C \ (GPIO_INPUT | GPIO_FLOAT |GPIO_EXTI | GPIO_PORTB | GPIO_PIN4) #define GPIO_BUTTON_D \ - (GPIO_INPUT | GPIO_FLOAT |GPIO_EXTI | GPIO_PORTB | GPIO_PIN10) + (GPIO_INPUT | GPIO_FLOAT |GPIO_EXTI | GPIO_PORTB | GPIO_PIN5) #define GPIO_BUTTON_E \ - (GPIO_INPUT | GPIO_FLOAT |GPIO_EXTI | GPIO_PORTA | GPIO_PIN8) + (GPIO_INPUT | GPIO_FLOAT |GPIO_EXTI | GPIO_PORTB | GPIO_PIN3) #define GPIO_BUTTON_F \ (GPIO_INPUT | GPIO_FLOAT |GPIO_EXTI | GPIO_PORTA | GPIO_PIN9) #define GPIO_BUTTON_G \ diff --git a/nuttx/configs/nucleo-f4x1re/src/stm32_ajoystick.c b/nuttx/configs/nucleo-f4x1re/src/stm32_ajoystick.c index c05049dba..47e44b243 100644 --- a/nuttx/configs/nucleo-f4x1re/src/stm32_ajoystick.c +++ b/nuttx/configs/nucleo-f4x1re/src/stm32_ajoystick.c @@ -474,7 +474,10 @@ int board_ajoy_initialize(void) } #endif - /* Configure the GPIO pins as interrupting inputs. */ + /* Configure the GPIO pins as interrupting inputs. NOTE: This is + * unnecessary for interrupting pins since it will also be done by + * stm32_gpiosetevent(). + */ for (i = 0; i < AJOY_NGPIOS; i++) { |