diff --git a/Core/Src/main.c b/Core/Src/main.c index 1234cd6..0e5da33 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -317,6 +317,7 @@ static void MX_TIM2_Init(void) { Error_Handler(); } + sConfigIC.ICPolarity = TIM_INPUTCHANNELPOLARITY_FALLING; sConfigIC.ICSelection = TIM_ICSELECTION_INDIRECTTI; if (HAL_TIM_IC_ConfigChannel(&htim2, &sConfigIC, TIM_CHANNEL_2) != HAL_OK) { diff --git a/Core/Src/stm32f4xx_it.c b/Core/Src/stm32f4xx_it.c index 727aa8b..e0a4389 100644 --- a/Core/Src/stm32f4xx_it.c +++ b/Core/Src/stm32f4xx_it.c @@ -274,7 +274,6 @@ void TIM2_IRQHandler(void) /* USER CODE END TIM2_IRQn 0 */ - //HAL_TIM_IRQHandler(&htim2); /* USER CODE BEGIN TIM2_IRQn 1 */ /* USER CODE END TIM2_IRQn 1 */ @@ -288,7 +287,6 @@ void TIM5_IRQHandler(void) /* USER CODE BEGIN TIM5_IRQn 0 */ /* USER CODE END TIM5_IRQn 0 */ - HAL_TIM_IRQHandler(&htim5); /* USER CODE BEGIN TIM5_IRQn 1 */ /* USER CODE END TIM5_IRQn 1 */ diff --git a/f411-pulse-recorder.ioc b/f411-pulse-recorder.ioc index d86dcb3..04d72a2 100644 --- a/f411-pulse-recorder.ioc +++ b/f411-pulse-recorder.ioc @@ -85,8 +85,8 @@ NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:false\:true\:false NVIC.TIM1_TRG_COM_TIM11_IRQn=true\:15\:0\:true\:false\:true\:true\:true\:true -NVIC.TIM2_IRQn=true\:1\:0\:true\:false\:true\:true\:true\:true -NVIC.TIM5_IRQn=true\:1\:0\:true\:false\:true\:true\:true\:true +NVIC.TIM2_IRQn=true\:1\:0\:true\:false\:true\:true\:false\:true +NVIC.TIM5_IRQn=true\:1\:0\:true\:false\:true\:true\:false\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false PA0-WKUP.Signal=S_TIM5_CH1 PA11.Mode=Device_Only @@ -139,7 +139,7 @@ ProjectManager.StackSize=0x400 ProjectManager.TargetToolchain=STM32CubeIDE ProjectManager.ToolChainLocation= ProjectManager.UnderRoot=true -ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_TIM2_Init-TIM2-false-HAL-true,5-MX_TIM5_Init-TIM5-false-HAL-true,6-MX_USB_DEVICE_Init-USB_DEVICE-false-HAL-false,7-MX_TIM11_Init-TIM11-false-HAL-true +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_TIM2_Init-TIM2-false-HAL-true,5-MX_TIM5_Init-TIM5-false-HAL-true,6-MX_USB_DEVICE_Init-USB_DEVICE-false-HAL-false,7-MX_TIM11_Init-TIM11-false-HAL-true,8-MX_IWDG_Init-IWDG-false-HAL-true RCC.48MHZClocksFreq_Value=48000000 RCC.AHBFreq_Value=96000000 RCC.APB1CLKDivider=RCC_HCLK_DIV2 @@ -179,7 +179,8 @@ TIM11.Period=10000 TIM11.Prescaler=95 TIM2.Channel-Input_Capture1_from_TI1=TIM_CHANNEL_1 TIM2.Channel-Input_Capture2_from_TI1_63=TIM_CHANNEL_2 -TIM2.IPParameters=Channel-Input_Capture1_from_TI1,Channel-Input_Capture2_from_TI1_63,TIM_MasterOutputTrigger +TIM2.ICPolarity_CH2=TIM_INPUTCHANNELPOLARITY_FALLING +TIM2.IPParameters=Channel-Input_Capture1_from_TI1,Channel-Input_Capture2_from_TI1_63,TIM_MasterOutputTrigger,ICPolarity_CH2 TIM2.TIM_MasterOutputTrigger=TIM_TRGO_OC2REF TIM5.Channel-Input_Capture1_from_TI1=TIM_CHANNEL_1 TIM5.Channel-Input_Capture2_from_TI1_63=TIM_CHANNEL_2