diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-05-19 14:35:30 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-05-19 14:35:30 -0600 |
| commit | f1c45c43db08e8384e8620a703739a53826e5870 (patch) | |
| tree | b1aff24b134f30cf104607fff12f148637636900 /nuttx/configs/stm32ldiscovery/src | |
| parent | 0fc2b6c2d86d4d043f2e69de03f6409c3e964cb4 (diff) | |
| download | px4-nuttx-f1c45c43db08e8384e8620a703739a53826e5870.tar.gz px4-nuttx-f1c45c43db08e8384e8620a703739a53826e5870.tar.bz2 px4-nuttx-f1c45c43db08e8384e8620a703739a53826e5870.zip | |
Add STM32L152X RCC PLL and FLASH support. Now compiles errorfree.
Diffstat (limited to 'nuttx/configs/stm32ldiscovery/src')
| -rw-r--r-- | nuttx/configs/stm32ldiscovery/src/stm32_userleds.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/stm32ldiscovery/src/stm32ldiscovery.h | 17 |
2 files changed, 6 insertions, 13 deletions
diff --git a/nuttx/configs/stm32ldiscovery/src/stm32_userleds.c b/nuttx/configs/stm32ldiscovery/src/stm32_userleds.c index 57f2af60f..710b3f0fc 100644 --- a/nuttx/configs/stm32ldiscovery/src/stm32_userleds.c +++ b/nuttx/configs/stm32ldiscovery/src/stm32_userleds.c @@ -106,7 +106,7 @@ void stm32_ledinit(void) void stm32_setled(int led, bool ledon) { - uint16_t ledcfg; + uint32_t ledcfg; if (led == BOARD_LED1) { diff --git a/nuttx/configs/stm32ldiscovery/src/stm32ldiscovery.h b/nuttx/configs/stm32ldiscovery/src/stm32ldiscovery.h index 174d2a34d..af0ce96b5 100644 --- a/nuttx/configs/stm32ldiscovery/src/stm32ldiscovery.h +++ b/nuttx/configs/stm32ldiscovery/src/stm32ldiscovery.h @@ -79,10 +79,10 @@ * */ -#define GPIO_LED1 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\ - GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN7) -#define GPIO_LED2 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\ - GPIO_OUTPUT_CLEAR|GPIO_PORTB|GPIO_PIN6) +#define GPIO_LED1 (GPIO_OUTPUT | GPIO_PUSHPULL | GPIO_SPEED_10MHz | \ + GPIO_OUTPUT_CLEAR | GPIO_PORTB | GPIO_PIN7) +#define GPIO_LED2 (GPIO_OUTPUT | GPIO_PUSHPULL | GPIO_SPEED_10MHz | \ + GPIO_OUTPUT_CLEAR | GPIO_PORTB | GPIO_PIN6) /* Button definitions *******************************************************************************/ /* The STM32L-Discovery supports two buttons; only one button is controllable by @@ -98,14 +98,7 @@ #define MAX_IRQBUTTON BUTTON_USER #define NUM_IRQBUTTONS 1 -#define GPIO_BTN_USER (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTA|GPIO_PIN0) - -/* SPI - There is a ST MEMS L3GD20 device on SPI1 using these pins: */ - -#define GPIO_MEMS_CS (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\ - GPIO_OUTPUT_SET|GPIO_PORTE|GPIO_PIN3) -#define GPIO_MEMS_INT1 (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTE|GPIO_PIN0) -#define GPIO_MEMS_INT2 (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTE|GPIO_PIN1) +#define GPIO_BTN_USER (GPIO_INPUT | GPIO_FLOAT | GPIO_EXTI | GPIO_PORTA | GPIO_PIN0) /**************************************************************************************************** * Public Types |