diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-01-28 15:03:17 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-01-28 15:03:17 +0000 |
commit | cc99071a6827580d7b9c403a907605777522ab5f (patch) | |
tree | 70ce245409ca55cda994ce812cf1d489681dc94f /nuttx/configs | |
parent | 02b171cb25870b7caf1161469edd43486bf4145b (diff) | |
download | px4-firmware-cc99071a6827580d7b9c403a907605777522ab5f.tar.gz px4-firmware-cc99071a6827580d7b9c403a907605777522ab5f.tar.bz2 px4-firmware-cc99071a6827580d7b9c403a907605777522ab5f.zip |
Serial driver needed even when no console; Fix user LED settings in all STM32 configurations
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5575 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs')
-rw-r--r-- | nuttx/configs/cloudctrl/src/up_userleds.c | 8 | ||||
-rw-r--r-- | nuttx/configs/fire-stm32v2/src/up_userleds.c | 6 | ||||
-rw-r--r-- | nuttx/configs/lpc4330-xplorer/src/up_userleds.c | 8 | ||||
-rw-r--r-- | nuttx/configs/shenzhou/src/up_userleds.c | 8 | ||||
-rw-r--r-- | nuttx/configs/stm3220g-eval/src/up_userleds.c | 8 | ||||
-rw-r--r-- | nuttx/configs/stm3240g-eval/src/up_userleds.c | 8 | ||||
-rw-r--r-- | nuttx/configs/stm32f4discovery/README.txt | 2 | ||||
-rw-r--r-- | nuttx/configs/stm32f4discovery/src/up_userleds.c | 8 |
8 files changed, 28 insertions, 28 deletions
diff --git a/nuttx/configs/cloudctrl/src/up_userleds.c b/nuttx/configs/cloudctrl/src/up_userleds.c index 5c112123b..bbb7cc62c 100644 --- a/nuttx/configs/cloudctrl/src/up_userleds.c +++ b/nuttx/configs/cloudctrl/src/up_userleds.c @@ -123,10 +123,10 @@ void stm32_setled(int led, bool ledon) void stm32_setleds(uint8_t ledset) { - stm32_gpiowrite(BOARD_LED1, (ledset & BOARD_LED1_BIT) == 0); - stm32_gpiowrite(BOARD_LED2, (ledset & BOARD_LED2_BIT) == 0); - stm32_gpiowrite(BOARD_LED3, (ledset & BOARD_LED3_BIT) == 0); - stm32_gpiowrite(BOARD_LED4, (ledset & BOARD_LED4_BIT) == 0); + stm32_gpiowrite(GPIO_LED1, (ledset & BOARD_LED1_BIT) == 0); + stm32_gpiowrite(GPIO_LED2, (ledset & BOARD_LED2_BIT) == 0); + stm32_gpiowrite(GPIO_LED3, (ledset & BOARD_LED3_BIT) == 0); + stm32_gpiowrite(GPIO_LED4, (ledset & BOARD_LED4_BIT) == 0); } #endif /* !CONFIG_ARCH_LEDS */ diff --git a/nuttx/configs/fire-stm32v2/src/up_userleds.c b/nuttx/configs/fire-stm32v2/src/up_userleds.c index da43d03ad..3dd1843ee 100644 --- a/nuttx/configs/fire-stm32v2/src/up_userleds.c +++ b/nuttx/configs/fire-stm32v2/src/up_userleds.c @@ -131,9 +131,9 @@ void stm32_setled(int led, bool ledon) void stm32_setleds(uint8_t ledset) { - stm32_gpiowrite(BOARD_LED1, (ledset & BOARD_LED1_BIT) == 0); - stm32_gpiowrite(BOARD_LED2, (ledset & BOARD_LED2_BIT) == 0); - stm32_gpiowrite(BOARD_LED3, (ledset & BOARD_LED3_BIT) == 0); + stm32_gpiowrite(GPIO_LED1, (ledset & BOARD_LED1_BIT) == 0); + stm32_gpiowrite(GPIO_LED2, (ledset & BOARD_LED2_BIT) == 0); + stm32_gpiowrite(GPIO_LED3, (ledset & BOARD_LED3_BIT) == 0); } #endif /* !CONFIG_ARCH_LEDS */ diff --git a/nuttx/configs/lpc4330-xplorer/src/up_userleds.c b/nuttx/configs/lpc4330-xplorer/src/up_userleds.c index e7b4b1189..2d8b5b511 100644 --- a/nuttx/configs/lpc4330-xplorer/src/up_userleds.c +++ b/nuttx/configs/lpc4330-xplorer/src/up_userleds.c @@ -140,8 +140,8 @@ void lpc43_ledinit(void) void lpc43_setled(int led, bool ledon) { - uint16_t gpiocfg = (led == BOARD_LED1 ? BOARD_LED1 : BOARD_LED2); - lpc43_gpio_write(GPIO_LED1, !ledon); + uint16_t gpiocfg = (led == BOARD_LED1 ? GPIO_LED1 : GPIO_LED2); + lpc43_gpio_write(gpiocfg, !ledon); } /**************************************************************************** @@ -150,8 +150,8 @@ void lpc43_setled(int led, bool ledon) void lpc43_setleds(uint8_t ledset) { - lpc43_gpio_write(BOARD_LED1, (ledset & BOARD_LED1_BIT) == 0); - lpc43_gpio_write(BOARD_LED2, (ledset & BOARD_LED2_BIT) == 0); + lpc43_gpio_write(GPIO_LED1, (ledset & BOARD_LED1_BIT) == 0); + lpc43_gpio_write(GPIO_LED2, (ledset & BOARD_LED2_BIT) == 0); } #endif /* !CONFIG_ARCH_LEDS */ diff --git a/nuttx/configs/shenzhou/src/up_userleds.c b/nuttx/configs/shenzhou/src/up_userleds.c index 0ba029228..4e1493a8d 100644 --- a/nuttx/configs/shenzhou/src/up_userleds.c +++ b/nuttx/configs/shenzhou/src/up_userleds.c @@ -122,10 +122,10 @@ void stm32_setled(int led, bool ledon) void stm32_setleds(uint8_t ledset) { - stm32_gpiowrite(BOARD_LED1, (ledset & BOARD_LED1_BIT) == 0); - stm32_gpiowrite(BOARD_LED2, (ledset & BOARD_LED2_BIT) == 0); - stm32_gpiowrite(BOARD_LED3, (ledset & BOARD_LED3_BIT) == 0); - stm32_gpiowrite(BOARD_LED4, (ledset & BOARD_LED4_BIT) == 0); + stm32_gpiowrite(GPIO_LED1, (ledset & BOARD_LED1_BIT) == 0); + stm32_gpiowrite(GPIO_LED2, (ledset & BOARD_LED2_BIT) == 0); + stm32_gpiowrite(GPIO_LED3, (ledset & BOARD_LED3_BIT) == 0); + stm32_gpiowrite(GPIO_LED4, (ledset & BOARD_LED4_BIT) == 0); } #endif /* !CONFIG_ARCH_LEDS */ diff --git a/nuttx/configs/stm3220g-eval/src/up_userleds.c b/nuttx/configs/stm3220g-eval/src/up_userleds.c index 6dc3db135..84510c703 100644 --- a/nuttx/configs/stm3220g-eval/src/up_userleds.c +++ b/nuttx/configs/stm3220g-eval/src/up_userleds.c @@ -122,10 +122,10 @@ void stm32_setled(int led, bool ledon) void stm32_setleds(uint8_t ledset) { - stm32_gpiowrite(BOARD_LED1, (ledset & BOARD_LED1_BIT) == 0); - stm32_gpiowrite(BOARD_LED2, (ledset & BOARD_LED2_BIT) == 0); - stm32_gpiowrite(BOARD_LED3, (ledset & BOARD_LED3_BIT) == 0); - stm32_gpiowrite(BOARD_LED4, (ledset & BOARD_LED4_BIT) == 0); + stm32_gpiowrite(GPIO_LED1, (ledset & BOARD_LED1_BIT) == 0); + stm32_gpiowrite(GPIO_LED2, (ledset & BOARD_LED2_BIT) == 0); + stm32_gpiowrite(GPIO_LED3, (ledset & BOARD_LED3_BIT) == 0); + stm32_gpiowrite(GPIO_LED4, (ledset & BOARD_LED4_BIT) == 0); } #endif /* !CONFIG_ARCH_LEDS */ diff --git a/nuttx/configs/stm3240g-eval/src/up_userleds.c b/nuttx/configs/stm3240g-eval/src/up_userleds.c index 59be38561..01c4b36d6 100644 --- a/nuttx/configs/stm3240g-eval/src/up_userleds.c +++ b/nuttx/configs/stm3240g-eval/src/up_userleds.c @@ -122,10 +122,10 @@ void stm32_setled(int led, bool ledon) void stm32_setleds(uint8_t ledset) { - stm32_gpiowrite(BOARD_LED1, (ledset & BOARD_LED1_BIT) == 0); - stm32_gpiowrite(BOARD_LED2, (ledset & BOARD_LED2_BIT) == 0); - stm32_gpiowrite(BOARD_LED3, (ledset & BOARD_LED3_BIT) == 0); - stm32_gpiowrite(BOARD_LED4, (ledset & BOARD_LED4_BIT) == 0); + stm32_gpiowrite(GPIO_LED1, (ledset & BOARD_LED1_BIT) == 0); + stm32_gpiowrite(GPIO_LED2, (ledset & BOARD_LED2_BIT) == 0); + stm32_gpiowrite(GPIO_LED3, (ledset & BOARD_LED3_BIT) == 0); + stm32_gpiowrite(GPIO_LED4, (ledset & BOARD_LED4_BIT) == 0); } #endif /* !CONFIG_ARCH_LEDS */ diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt index e34168224..e9c0e81c2 100644 --- a/nuttx/configs/stm32f4discovery/README.txt +++ b/nuttx/configs/stm32f4discovery/README.txt @@ -269,7 +269,7 @@ LEDs ==== The STM32F4Discovery board has four LEDs; green, organge, red and blue on the -board.. These LEDs are not used by the board port unless CONFIG_ARCH_LEDS is +board. These LEDs are not used by the board port unless CONFIG_ARCH_LEDS is defined. In that case, the usage by the board port is defined in include/board.h and src/up_leds.c. The LEDs are used to encode OS-related events as follows: diff --git a/nuttx/configs/stm32f4discovery/src/up_userleds.c b/nuttx/configs/stm32f4discovery/src/up_userleds.c index 90adb4882..173c12696 100644 --- a/nuttx/configs/stm32f4discovery/src/up_userleds.c +++ b/nuttx/configs/stm32f4discovery/src/up_userleds.c @@ -222,10 +222,10 @@ void stm32_setled(int led, bool ledon) void stm32_setleds(uint8_t ledset) { - stm32_gpiowrite(BOARD_LED1, (ledset & BOARD_LED1_BIT) == 0); - stm32_gpiowrite(BOARD_LED2, (ledset & BOARD_LED2_BIT) == 0); - stm32_gpiowrite(BOARD_LED3, (ledset & BOARD_LED3_BIT) == 0); - stm32_gpiowrite(BOARD_LED4, (ledset & BOARD_LED4_BIT) == 0); + stm32_gpiowrite(GPIO_LED1, (ledset & BOARD_LED1_BIT) == 0); + stm32_gpiowrite(GPIO_LED2, (ledset & BOARD_LED2_BIT) == 0); + stm32_gpiowrite(GPIO_LED3, (ledset & BOARD_LED3_BIT) == 0); + stm32_gpiowrite(GPIO_LED4, (ledset & BOARD_LED4_BIT) == 0); } /**************************************************************************** |