diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-22 11:23:02 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-22 11:23:02 -0600 |
| commit | bf307ddb85502a825db10d75959f3622f1eafbde (patch) | |
| tree | af76cc848f4cb51cf927a5d33561060efe1806d3 | |
| parent | 0682c01e1cc91129b83660457f7cde6ca5ac04b1 (diff) | |
| download | px4-nuttx-bf307ddb85502a825db10d75959f3622f1eafbde.tar.gz px4-nuttx-bf307ddb85502a825db10d75959f3622f1eafbde.tar.bz2 px4-nuttx-bf307ddb85502a825db10d75959f3622f1eafbde.zip | |
Fix a few compile bugs and minor corrections to the mikroe-stm32f4 configuration source. From Ken Pettit
| -rw-r--r-- | nuttx/configs/mikroe-stm32f4/include/board.h | 6 | ||||
| -rw-r--r-- | nuttx/configs/mikroe-stm32f4/src/up_nsh.c | 6 | ||||
| -rw-r--r-- | nuttx/configs/mikroe-stm32f4/src/up_touchscreen.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/nuttx/configs/mikroe-stm32f4/include/board.h b/nuttx/configs/mikroe-stm32f4/include/board.h index dfd5f302a..03e709b85 100644 --- a/nuttx/configs/mikroe-stm32f4/include/board.h +++ b/nuttx/configs/mikroe-stm32f4/include/board.h @@ -231,9 +231,9 @@ /* SPI - Onboard devices use SPI3, plus SPI2 routes to the I/O header */ -#define GPIO_SPI2_MISO GPIO_SPI3_MISO_2 -#define GPIO_SPI2_MOSI GPIO_SPI3_MOSI_2 -#define GPIO_SPI2_SCK GPIO_SPI3_SCK_2 +#define GPIO_SPI2_MISO GPIO_SPI2_MISO_1 +#define GPIO_SPI2_MOSI GPIO_SPI2_MOSI_1 +#define GPIO_SPI2_SCK GPIO_SPI2_SCK_2 #define DMACHAN_SPI2_RX DMAMAP_SPI2_RX #define DMACHAN_SPI2_TX DMAMAP_SPI2_TX diff --git a/nuttx/configs/mikroe-stm32f4/src/up_nsh.c b/nuttx/configs/mikroe-stm32f4/src/up_nsh.c index 80331fe40..8346f4908 100644 --- a/nuttx/configs/mikroe-stm32f4/src/up_nsh.c +++ b/nuttx/configs/mikroe-stm32f4/src/up_nsh.c @@ -277,14 +277,14 @@ int nsh_archinitialize(void) partno++; } + } #else /* CONFIG_MIKROE_FLASH_PART */ - /* Configure the device with no partition support */ + /* Configure the device with no partition support */ - smart_initialize(CONFIG_MIKROE_FLASH_MINOR, mtd, NULL); + smart_initialize(CONFIG_MIKROE_FLASH_MINOR, mtd, NULL); #endif /* CONFIG_MIKROE_FLASH_PART */ - } } /* Create a RAM MTD device if configured */ diff --git a/nuttx/configs/mikroe-stm32f4/src/up_touchscreen.c b/nuttx/configs/mikroe-stm32f4/src/up_touchscreen.c index 3466e60b0..f8b7f5e4d 100644 --- a/nuttx/configs/mikroe-stm32f4/src/up_touchscreen.c +++ b/nuttx/configs/mikroe-stm32f4/src/up_touchscreen.c @@ -160,7 +160,7 @@ #define TC_PENDOWN_POLL_TICKS MSEC2TICK(40) /* Active polling rate: 40 MSec */ #define TC_DEBOUNCE_TICKS MSEC2TICK(16) /* Delay before re-sampling: 16 MSec */ #define TC_SAMPLE_TICKS MSEC2TICK(4) /* Delay for A/D sampling: 4 MSec */ -#define TC_SETTLE_TICKS MSECT2TICK(10) /* Delay for A/D settling: 10 MSec */ +#define TC_SETTLE_TICKS MSEC2TICK(10) /* Delay for A/D settling: 10 MSec */ #define TC_RESAMPLE_TICKS TC_SAMPLE_TICKS /************************************************************************************ |