diff options
| author | px4dev <px4@purgatory.org> | 2013-01-10 02:12:49 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-13 19:05:01 -0800 |
| commit | 5e35491a386006c8f27b7761b3845a73bf85f3fa (patch) | |
| tree | a0ae659ba5c4dbb4a1a57e899cfedfe17ccb7cf1 /nuttx | |
| parent | 329f595bca22ca7f253833d0189c1bf61c23c631 (diff) | |
| download | px4-firmware-5e35491a386006c8f27b7761b3845a73bf85f3fa.tar.gz px4-firmware-5e35491a386006c8f27b7761b3845a73bf85f3fa.tar.bz2 px4-firmware-5e35491a386006c8f27b7761b3845a73bf85f3fa.zip | |
We can't have DMA on both I2C1 and USART2. Since we need it more for I2C, and since USART2 is going back to being ignored once I2C works, let's make the call.
Turn off the debug output on I2C for now.
Diffstat (limited to 'nuttx')
| -rwxr-xr-x | nuttx/configs/px4io/io/defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nuttx/configs/px4io/io/defconfig b/nuttx/configs/px4io/io/defconfig index e0986b72c..d2a4f3848 100755 --- a/nuttx/configs/px4io/io/defconfig +++ b/nuttx/configs/px4io/io/defconfig @@ -190,7 +190,8 @@ CONFIG_USART3_2STOP=0 CONFIG_USART1_RXDMA=y SERIAL_HAVE_CONSOLE_DMA=y -CONFIG_USART2_RXDMA=y +# Conflicts with I2C1 DMA +CONFIG_USART2_RXDMA=n CONFIG_USART3_RXDMA=y # |