diff options
| -rw-r--r-- | os/hal/ports/STM32/STM32F0xx/stm32_registry.h | 12 | ||||
| -rw-r--r-- | os/hal/src/can.c | 2 | ||||
| -rw-r--r-- | readme.txt | 5 |
3 files changed, 9 insertions, 10 deletions
diff --git a/os/hal/ports/STM32/STM32F0xx/stm32_registry.h b/os/hal/ports/STM32/STM32F0xx/stm32_registry.h index a6176310f..4a7798258 100644 --- a/os/hal/ports/STM32/STM32F0xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F0xx/stm32_registry.h @@ -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
diff --git a/os/hal/src/can.c b/os/hal/src/can.c index 38a71873f..cfaa7264e 100644 --- a/os/hal/src/can.c +++ b/os/hal/src/can.c @@ -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),
diff --git a/readme.txt b/readme.txt index 7aa182cc5..77ca21930 100644 --- a/readme.txt +++ b/readme.txt @@ -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).
|