From fe450ec174430c0febf351ea27e27739f12988d2 Mon Sep 17 00:00:00 2001 From: nitiantuhao <2062405236@qq.com> Date: Fri, 13 Mar 2026 23:52:13 +0800 Subject: [PATCH] 1.0 --- Core/Inc/stm32f4xx_it.h | 1 - Core/Src/can.c | 5 +---- Core/Src/stm32f4xx_it.c | 14 -------------- FDR-Core.ioc | 6 ++---- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/Core/Inc/stm32f4xx_it.h b/Core/Inc/stm32f4xx_it.h index ae0f282..fca404e 100644 --- a/Core/Inc/stm32f4xx_it.h +++ b/Core/Inc/stm32f4xx_it.h @@ -55,7 +55,6 @@ void SVC_Handler(void); void DebugMon_Handler(void); void PendSV_Handler(void); void SysTick_Handler(void); -void CAN1_TX_IRQHandler(void); void CAN1_RX0_IRQHandler(void); void TIM6_DAC_IRQHandler(void); void OTG_FS_IRQHandler(void); diff --git a/Core/Src/can.c b/Core/Src/can.c index 05c3003..3ade804 100644 --- a/Core/Src/can.c +++ b/Core/Src/can.c @@ -39,7 +39,7 @@ void MX_CAN1_Init(void) /* USER CODE END CAN1_Init 1 */ hcan1.Instance = CAN1; hcan1.Init.Prescaler = 21; - hcan1.Init.Mode = CAN_MODE_LOOPBACK; + hcan1.Init.Mode = CAN_MODE_NORMAL; hcan1.Init.SyncJumpWidth = CAN_SJW_1TQ; hcan1.Init.TimeSeg1 = CAN_BS1_6TQ; hcan1.Init.TimeSeg2 = CAN_BS2_1TQ; @@ -84,8 +84,6 @@ void HAL_CAN_MspInit(CAN_HandleTypeDef* canHandle) HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); /* CAN1 interrupt Init */ - HAL_NVIC_SetPriority(CAN1_TX_IRQn, 0, 0); - HAL_NVIC_EnableIRQ(CAN1_TX_IRQn); HAL_NVIC_SetPriority(CAN1_RX0_IRQn, 0, 0); HAL_NVIC_EnableIRQ(CAN1_RX0_IRQn); /* USER CODE BEGIN CAN1_MspInit 1 */ @@ -112,7 +110,6 @@ void HAL_CAN_MspDeInit(CAN_HandleTypeDef* canHandle) HAL_GPIO_DeInit(GPIOB, GPIO_PIN_8|GPIO_PIN_9); /* CAN1 interrupt Deinit */ - HAL_NVIC_DisableIRQ(CAN1_TX_IRQn); HAL_NVIC_DisableIRQ(CAN1_RX0_IRQn); /* USER CODE BEGIN CAN1_MspDeInit 1 */ diff --git a/Core/Src/stm32f4xx_it.c b/Core/Src/stm32f4xx_it.c index 7074a86..30faa20 100644 --- a/Core/Src/stm32f4xx_it.c +++ b/Core/Src/stm32f4xx_it.c @@ -200,20 +200,6 @@ void SysTick_Handler(void) /* please refer to the startup file (startup_stm32f4xx.s). */ /******************************************************************************/ -/** - * @brief This function handles CAN1 TX interrupts. - */ -void CAN1_TX_IRQHandler(void) -{ - /* USER CODE BEGIN CAN1_TX_IRQn 0 */ - - /* USER CODE END CAN1_TX_IRQn 0 */ - HAL_CAN_IRQHandler(&hcan1); - /* USER CODE BEGIN CAN1_TX_IRQn 1 */ - - /* USER CODE END CAN1_TX_IRQn 1 */ -} - /** * @brief This function handles CAN1 RX0 interrupts. */ diff --git a/FDR-Core.ioc b/FDR-Core.ioc index edb4842..b2fced0 100644 --- a/FDR-Core.ioc +++ b/FDR-Core.ioc @@ -6,8 +6,7 @@ CAN1.BS1=CAN_BS1_6TQ CAN1.CalculateBaudRate=250000 CAN1.CalculateTimeBit=4000 CAN1.CalculateTimeQuantum=500.0 -CAN1.IPParameters=CalculateTimeQuantum,CalculateTimeBit,CalculateBaudRate,Prescaler,BS1,Mode -CAN1.Mode=CAN_MODE_LOOPBACK +CAN1.IPParameters=CalculateTimeQuantum,CalculateTimeBit,CalculateBaudRate,Prescaler,BS1 CAN1.Prescaler=21 File.Version=6 GPIO.groupedBy= @@ -71,8 +70,7 @@ Mcu.UserName=STM32F407VGTx MxCube.Version=6.15.0 MxDb.Version=DB.6.0.150 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false -NVIC.CAN1_RX0_IRQn=true\:0\:0\:true\:false\:true\:true\:true\:true -NVIC.CAN1_TX_IRQn=true\:0\:0\:true\:false\:true\:true\:true\:true +NVIC.CAN1_RX0_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.ForceEnableDMAVector=true NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false