diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-02-08 13:11:28 +0100 |
|---|---|---|
| committer | David Sidrane <david_s5@nscdg.com> | 2015-04-07 07:49:06 -1000 |
| commit | 387a0d6541a3411726f7b4fcddacd7cb5f93f051 (patch) | |
| tree | a01d066afa0beed16ca94709b5d9879882e99747 | |
| parent | 66a02a5fcad3c22f94d7aa9bb1047737c3f885fe (diff) | |
| download | px4-firmware-387a0d6541a3411726f7b4fcddacd7cb5f93f051.tar.gz px4-firmware-387a0d6541a3411726f7b4fcddacd7cb5f93f051.tar.bz2 px4-firmware-387a0d6541a3411726f7b4fcddacd7cb5f93f051.zip | |
Fix code style in IO driver
| -rw-r--r-- | src/drivers/px4io/px4io_serial.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/drivers/px4io/px4io_serial.cpp b/src/drivers/px4io/px4io_serial.cpp index 8892690e9..c6c0126f4 100644 --- a/src/drivers/px4io/px4io_serial.cpp +++ b/src/drivers/px4io/px4io_serial.cpp @@ -252,11 +252,7 @@ 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); |