Merge branch 'master'

This commit is contained in:
TSC21
2015-05-21 12:26:55 +01:00
parent 1978f1bcac
commit db48df15c8
43 changed files with 481 additions and 749 deletions
+2 -2
View File
@@ -560,8 +560,8 @@ CONFIG_USART1_2STOP=0
#
# USART2 Configuration
#
CONFIG_USART2_RXBUFSIZE=512
CONFIG_USART2_TXBUFSIZE=512
CONFIG_USART2_RXBUFSIZE=600
CONFIG_USART2_TXBUFSIZE=2200
CONFIG_USART2_BAUD=57600
CONFIG_USART2_BITS=8
CONFIG_USART2_PARITY=0