diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-28 14:54:57 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-28 14:54:57 +0200 |
| commit | a1503a8dd7f29c52cd4bd1740ad0a0010d50ddfe (patch) | |
| tree | a0ffd694a4e337a4846f92cb5518f8b3d25b2978 /nuttx | |
| parent | 1df5e98aa507c7a89f1491254d7f34f94c04ede6 (diff) | |
| parent | 0eafc2ade1dce974d5f7bdf05ca7678fa0b59ab0 (diff) | |
| download | px4-firmware-a1503a8dd7f29c52cd4bd1740ad0a0010d50ddfe.tar.gz px4-firmware-a1503a8dd7f29c52cd4bd1740ad0a0010d50ddfe.tar.bz2 px4-firmware-a1503a8dd7f29c52cd4bd1740ad0a0010d50ddfe.zip | |
Merge branch 'public-export-build' into fmuv2_bringup
Diffstat (limited to 'nuttx')
| -rwxr-xr-x | nuttx/configs/px4io/include/board.h | 11 | ||||
| -rw-r--r-- | nuttx/configs/px4io/io/appconfig | 8 |
2 files changed, 11 insertions, 8 deletions
diff --git a/nuttx/configs/px4io/include/board.h b/nuttx/configs/px4io/include/board.h index d941985b4..fcbc93620 100755 --- a/nuttx/configs/px4io/include/board.h +++ b/nuttx/configs/px4io/include/board.h @@ -100,12 +100,19 @@ * Some of the USART pins are not available; override the GPIO * definitions with an invalid pin configuration. */ +#undef GPIO_USART2_CTS #define GPIO_USART2_CTS 0xffffffff +#undef GPIO_USART2_RTS #define GPIO_USART2_RTS 0xffffffff +#undef GPIO_USART2_CK #define GPIO_USART2_CK 0xffffffff +#undef GPIO_USART3_TX #define GPIO_USART3_TX 0xffffffff +#undef GPIO_USART3_CK #define GPIO_USART3_CK 0xffffffff +#undef GPIO_USART3_CTS #define GPIO_USART3_CTS 0xffffffff +#undef GPIO_USART3_RTS #define GPIO_USART3_RTS 0xffffffff /* @@ -156,6 +163,10 @@ extern "C" { ************************************************************************************/ EXTERN void stm32_boardinitialize(void); + +#if defined(__cplusplus) +} +#endif #endif /* __ASSEMBLY__ */ #endif /* __ARCH_BOARD_BOARD_H */ diff --git a/nuttx/configs/px4io/io/appconfig b/nuttx/configs/px4io/io/appconfig index 628607a51..48a41bcdb 100644 --- a/nuttx/configs/px4io/io/appconfig +++ b/nuttx/configs/px4io/io/appconfig @@ -30,11 +30,3 @@ # POSSIBILITY OF SUCH DAMAGE. # ############################################################################ - -CONFIGURED_APPS += drivers/boards/px4io -CONFIGURED_APPS += drivers/stm32 - -CONFIGURED_APPS += px4io - -# Mixer library from systemlib -CONFIGURED_APPS += systemlib/mixer |