diff options
| author | David Sidrane <david_s5@nscdg.com> | 2015-01-26 11:24:20 -1000 |
|---|---|---|
| committer | David Sidrane <david_s5@nscdg.com> | 2015-04-07 07:49:05 -1000 |
| commit | 681c76d4530729e2062f26b54e11c142022fa293 (patch) | |
| tree | f94adb9fd5637a41489c0f4b2303fc92839a3d76 | |
| parent | 650fa8cf7fb5ad00c39c8b4cb777655da4e8e8b5 (diff) | |
| download | px4-firmware-681c76d4530729e2062f26b54e11c142022fa293.tar.gz px4-firmware-681c76d4530729e2062f26b54e11c142022fa293.tar.bz2 px4-firmware-681c76d4530729e2062f26b54e11c142022fa293.zip | |
Bug fix:The CRC detection on px4io was failing with -1 result, do the the fact that the PX4IO_Uploader had closed the port and Nuttx (now) disabled the clock and PX4IO_serial did not managed the clock
| -rw-r--r-- | src/drivers/px4io/px4io_serial.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/drivers/px4io/px4io_serial.cpp b/src/drivers/px4io/px4io_serial.cpp index c6c0126f4..8892690e9 100644 --- a/src/drivers/px4io/px4io_serial.cpp +++ b/src/drivers/px4io/px4io_serial.cpp @@ -252,7 +252,11 @@ PX4IO_serial::init() /* Enable the APB clock for the USART peripheral */ +<<<<<<< HEAD modifyreg32(STM32_RCC_APB2ENR, 0, RCC_APB2ENR_USART6EN); +======= + modifyreg32(STM32_RCC_APB2ENR, 0, RCC_APB2ENR_USART6EN); +>>>>>>> Bug fix:The CRC detection on px4io was failing with -1 result, do the the fact that the PX4IO_Uploader had closed the port and Nuttx (now) disabled the clock and PX4IO_serial did not managed the clock /* configure pins for serial use */ stm32_configgpio(PX4IO_SERIAL_TX_GPIO); |