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

Fixed bugs #619 and #620. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8124 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2015-07-29 06:56:10 +00:00
parent 4a4cf02fd5
commit b0b485d70c
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os/hal/ports/STM32/STM32F0xx/stm32_registry.h
View File

@ -732,14 +732,7 @@
#define STM32_HAS_USART6 FALSE
/* USB attributes.*/
#if defined(STM32F042x6)
#define STM32_HAS_USB TRUE
#define STM32_USB_ACCESS_SCHEME_2x16 TRUE
#define STM32_USB_PMA_SIZE 768
#define STM32_USB_HAS_BCDR TRUE
#else
#define STM32_HAS_USB FALSE
#endif
#define STM32_HAS_OTG1 FALSE
#define STM32_HAS_OTG2 FALSE
@ -893,7 +886,10 @@
#define STM32_UART_USART1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
#define STM32_UART_USART1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
#define STM32_HAS_USART2 FALSE
#define STM32_HAS_USART2 TRUE
#define STM32_UART_USART1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
#define STM32_UART_USART1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
#define STM32_HAS_USART3 FALSE
#define STM32_HAS_UART4 FALSE
#define STM32_HAS_UART5 FALSE

2
os/hal/src/can.c
View File

@ -213,7 +213,7 @@ msg_t canReceive(CANDriver *canp,
systime_t timeout) {
osalDbgCheck((canp != NULL) && (crfp != NULL) &&
(mailbox < (canmbx_t)CAN_RX_MAILBOXES));
(mailbox <= (canmbx_t)CAN_RX_MAILBOXES));
osalSysLock();
osalDbgAssert((canp->state == CAN_READY) || (canp->state == CAN_SLEEP),

5
readme.txt
View File

@ -78,7 +78,10 @@
- HAL: Introduced support for TIM21 and TIM22 in STM32 ST driver.
- HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support
for STM32F030xC, STM32F070x6, STM32F070xB devices.
- HAL: Fixed wWrong EXTI[18] vector number on STM32F373 (bug #618)(backported
- HAL: Fixed STM32F042 registry error (bug #620)(backported to 3.0.1).
- HAL: Fixed wrong check in canReceive() (bug #619)(backported to 3.0.1
and 2.6.9).
- HAL: Fixed wrong EXTI[18] vector number on STM32F373 (bug #618)(backported
to 3.0.1 and 2.6.9).
- HAL: Fixed wrong check on STM32_LSE_ENABLED definition in STM32L1xx HAL port
(bug #617)(backported to 3.0.1 and 2.6.9).