andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #837. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10207 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2017-05-27 15:55:29 +00:00
parent 0d9f42c9d9
commit 5cb659cbc1
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demos/STM32/RT-STM32F070RB-NUCLEO64/mcuconf.h
View File

@ -137,8 +137,7 @@
#define STM32_SERIAL_USE_UART4 FALSE #define STM32_SERIAL_USE_UART4 FALSE
#define STM32_SERIAL_USART1_PRIORITY 3 #define STM32_SERIAL_USART1_PRIORITY 3
#define STM32_SERIAL_USART2_PRIORITY 3 #define STM32_SERIAL_USART2_PRIORITY 3
#define STM32_SERIAL_USART3_PRIORITY 3 #define STM32_SERIAL_USART3_8_PRIORITY 3
#define STM32_SERIAL_UART4_PRIORITY 3
/* /*
* SPI driver system settings. * SPI driver system settings.

14
os/hal/ports/STM32/LLD/USARTv2/hal_serial_lld.c
View File

@ -53,14 +53,18 @@
#define USART_CR1_M_1 (1 << 28) #define USART_CR1_M_1 (1 << 28)
#endif #endif
/* Handling the case where UART4 and UART5 are actually USARTs, this happens /* Workarounds for those devices where UARTs are USARTs.*/
in the STM32F0xx.*/
#if defined(USART4) #if defined(USART4)
#define UART4 USART4 #define UART4 USART4
#endif #endif
#if defined(USART5) #if defined(USART5)
#define UART5 USART5 #define UART5 USART5
#endif
#if defined(USART7)
#define UART7 USART7
#endif
#if defined(USART8)
#define UART8 USART8
#endif #endif
/*===========================================================================*/ /*===========================================================================*/

14
os/hal/ports/STM32/LLD/USARTv2/hal_uart_lld.c
View File

@ -30,6 +30,20 @@
/* Driver local definitions. */ /* Driver local definitions. */
/*===========================================================================*/ /*===========================================================================*/
/* For compatibility for those devices without LIN support in the USARTs.*/
#if !defined(USART_ISR_LBDF)
#define USART_ISR_LBDF 0
#endif
#if !defined(USART_CR2_LBDIE)
#define USART_CR2_LBDIE 0
#endif
/* STM32L0xx/STM32F7xx ST headers difference.*/
#if !defined(USART_ISR_LBDF)
#define USART_ISR_LBDF USART_ISR_LBD
#endif
/* STM32L0xx/STM32F7xx ST headers difference.*/ /* STM32L0xx/STM32F7xx ST headers difference.*/
#if !defined(USART_ISR_LBDF) #if !defined(USART_ISR_LBDF)
#define USART_ISR_LBDF USART_ISR_LBD #define USART_ISR_LBDF USART_ISR_LBD

2
readme.txt
View File

@ -165,6 +165,8 @@
(backported to 16.1.9). (backported to 16.1.9).
- HAL: Fixed dependency to kernel in uart lld (v1) (bug #838)(backported - HAL: Fixed dependency to kernel in uart lld (v1) (bug #838)(backported
to 16.1.9). to 16.1.9).
- HAL: Fixed issue with not supported LIN on STM32F070xB (bug #837)(backported
to 16.1.9).
- HAL: Fixed STM32 OTGv1 number of endpoints (bug #833)(backported to 16.1.8). - HAL: Fixed STM32 OTGv1 number of endpoints (bug #833)(backported to 16.1.8).
- HAL: Fixed transaction end problem with STM32 OTGv1 driver (bug #832) - HAL: Fixed transaction end problem with STM32 OTGv1 driver (bug #832)
(backported to 16.1.8). (backported to 16.1.8).