Skip to content

Commit dab737f

Browse files
authored
Merge pull request #3593 from 2000000/can_bug
[BSP] In bsp of stm32, Change drv_can1 to drv_can2 in function CAN2_S…
2 parents 49f366e + c4eed71 commit dab737f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

bsp/stm32/libraries/HAL_Drivers/drv_can.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -688,9 +688,9 @@ void CAN1_SCE_IRQHandler(void)
688688
drv_can1.device.status.ackerrcnt++;
689689
if (!READ_BIT(drv_can1.CanHandle.Instance->TSR, CAN_FLAG_TXOK0))
690690
rt_hw_can_isr(&drv_can1.device, RT_CAN_EVENT_TX_FAIL | 0 << 8);
691-
else if (!READ_BIT(drv_can1.CanHandle.Instance->TSR, CAN_FLAG_TXOK0))
691+
else if (!READ_BIT(drv_can1.CanHandle.Instance->TSR, CAN_FLAG_TXOK1))
692692
rt_hw_can_isr(&drv_can1.device, RT_CAN_EVENT_TX_FAIL | 1 << 8);
693-
else if (!READ_BIT(drv_can1.CanHandle.Instance->TSR, CAN_FLAG_TXOK0))
693+
else if (!READ_BIT(drv_can1.CanHandle.Instance->TSR, CAN_FLAG_TXOK2))
694694
rt_hw_can_isr(&drv_can1.device, RT_CAN_EVENT_TX_FAIL | 2 << 8);
695695
break;
696696
case RT_CAN_BUS_IMPLICIT_BIT_ERR:
@@ -806,11 +806,11 @@ void CAN2_SCE_IRQHandler(void)
806806
break;
807807
case RT_CAN_BUS_ACK_ERR:
808808
drv_can2.device.status.ackerrcnt++;
809-
if (!READ_BIT(drv_can1.CanHandle.Instance->TSR, CAN_FLAG_TXOK0))
809+
if (!READ_BIT(drv_can2.CanHandle.Instance->TSR, CAN_FLAG_TXOK0))
810810
rt_hw_can_isr(&drv_can2.device, RT_CAN_EVENT_TX_FAIL | 0 << 8);
811-
else if (!READ_BIT(drv_can2.CanHandle.Instance->TSR, CAN_FLAG_TXOK0))
811+
else if (!READ_BIT(drv_can2.CanHandle.Instance->TSR, CAN_FLAG_TXOK1))
812812
rt_hw_can_isr(&drv_can2.device, RT_CAN_EVENT_TX_FAIL | 1 << 8);
813-
else if (!READ_BIT(drv_can2.CanHandle.Instance->TSR, CAN_FLAG_TXOK0))
813+
else if (!READ_BIT(drv_can2.CanHandle.Instance->TSR, CAN_FLAG_TXOK2))
814814
rt_hw_can_isr(&drv_can2.device, RT_CAN_EVENT_TX_FAIL | 2 << 8);
815815
break;
816816
case RT_CAN_BUS_IMPLICIT_BIT_ERR:

0 commit comments

Comments
 (0)