Skip to content

Commit 50d4367

Browse files
committed
F411 reenable SPI1 interrupt
1 parent 4e73a9e commit 50d4367

File tree

85 files changed

+37036
-11849
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+37036
-11849
lines changed

Firmware/Targets/F411RE/Core/Inc/stm32f4xx_it.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ void TIM1_TRG_COM_TIM11_IRQHandler(void);
6262
void TIM2_IRQHandler(void);
6363
void TIM3_IRQHandler(void);
6464
void TIM4_IRQHandler(void);
65+
void SPI1_IRQHandler(void);
6566
void USART1_IRQHandler(void);
6667
void TIM5_IRQHandler(void);
6768
void DMA2_Stream0_IRQHandler(void);

Firmware/Targets/F411RE/Core/Src/main.c

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ TIM_HandleTypeDef htim3;
6464
TIM_HandleTypeDef htim4;
6565
TIM_HandleTypeDef htim5;
6666
TIM_HandleTypeDef htim9;
67+
TIM_HandleTypeDef htim10;
6768

6869
UART_HandleTypeDef huart1;
6970

@@ -94,6 +95,7 @@ static void MX_TIM4_Init(void);
9495
static void MX_TIM5_Init(void);
9596
static void MX_I2C3_Init(void);
9697
static void MX_SPI1_Init(void);
98+
static void MX_TIM10_Init(void);
9799
static void MX_TIM9_Init(void);
98100
static void MX_IWDG_Init(void);
99101
void StartDefaultTask(void *argument);
@@ -152,6 +154,7 @@ int main(void)
152154
MX_TIM5_Init();
153155
MX_I2C3_Init();
154156
MX_SPI1_Init();
157+
MX_TIM10_Init();
155158
MX_TIM9_Init();
156159
MX_IWDG_Init();
157160

@@ -831,6 +834,37 @@ static void MX_TIM9_Init(void)
831834

832835
}
833836

837+
/**
838+
* @brief TIM10 Initialization Function
839+
* @param None
840+
* @retval None
841+
*/
842+
static void MX_TIM10_Init(void)
843+
{
844+
845+
/* USER CODE BEGIN TIM10_Init 0 */
846+
847+
/* USER CODE END TIM10_Init 0 */
848+
849+
/* USER CODE BEGIN TIM10_Init 1 */
850+
851+
/* USER CODE END TIM10_Init 1 */
852+
htim10.Instance = TIM10;
853+
htim10.Init.Prescaler = 0;
854+
htim10.Init.CounterMode = TIM_COUNTERMODE_UP;
855+
htim10.Init.Period = 65535;
856+
htim10.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
857+
htim10.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
858+
if (HAL_TIM_Base_Init(&htim10) != HAL_OK)
859+
{
860+
Error_Handler();
861+
}
862+
/* USER CODE BEGIN TIM10_Init 2 */
863+
864+
/* USER CODE END TIM10_Init 2 */
865+
866+
}
867+
834868
/**
835869
* @brief USART1 Initialization Function
836870
* @param None

Firmware/Targets/F411RE/Core/Src/stm32f4xx_hal_msp.c

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,9 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi)
343343

344344
__HAL_LINKDMA(hspi,hdmarx,hdma_spi1_rx);
345345

346+
/* SPI1 interrupt Init */
347+
HAL_NVIC_SetPriority(SPI1_IRQn, 5, 0);
348+
HAL_NVIC_EnableIRQ(SPI1_IRQn);
346349
/* USER CODE BEGIN SPI1_MspInit 1 */
347350

348351
/* USER CODE END SPI1_MspInit 1 */
@@ -438,6 +441,9 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi)
438441
/* SPI1 DMA DeInit */
439442
HAL_DMA_DeInit(hspi->hdmatx);
440443
HAL_DMA_DeInit(hspi->hdmarx);
444+
445+
/* SPI1 interrupt DeInit */
446+
HAL_NVIC_DisableIRQ(SPI1_IRQn);
441447
/* USER CODE BEGIN SPI1_MspDeInit 1 */
442448

443449
/* USER CODE END SPI1_MspDeInit 1 */
@@ -538,6 +544,17 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base)
538544

539545
/* USER CODE END TIM9_MspInit 1 */
540546
}
547+
else if(htim_base->Instance==TIM10)
548+
{
549+
/* USER CODE BEGIN TIM10_MspInit 0 */
550+
551+
/* USER CODE END TIM10_MspInit 0 */
552+
/* Peripheral clock enable */
553+
__HAL_RCC_TIM10_CLK_ENABLE();
554+
/* USER CODE BEGIN TIM10_MspInit 1 */
555+
556+
/* USER CODE END TIM10_MspInit 1 */
557+
}
541558

542559
}
543560

@@ -670,6 +687,17 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base)
670687

671688
/* USER CODE END TIM9_MspDeInit 1 */
672689
}
690+
else if(htim_base->Instance==TIM10)
691+
{
692+
/* USER CODE BEGIN TIM10_MspDeInit 0 */
693+
694+
/* USER CODE END TIM10_MspDeInit 0 */
695+
/* Peripheral clock disable */
696+
__HAL_RCC_TIM10_CLK_DISABLE();
697+
/* USER CODE BEGIN TIM10_MspDeInit 1 */
698+
699+
/* USER CODE END TIM10_MspDeInit 1 */
700+
}
673701

674702
}
675703

Firmware/Targets/F411RE/Core/Src/stm32f4xx_it.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ extern DMA_HandleTypeDef hdma_spi1_tx;
6363
extern DMA_HandleTypeDef hdma_spi1_rx;
6464
extern DMA_HandleTypeDef hdma_spi2_rx;
6565
extern DMA_HandleTypeDef hdma_spi2_tx;
66+
extern SPI_HandleTypeDef hspi1;
6667
extern TIM_HandleTypeDef htim1;
6768
extern TIM_HandleTypeDef htim2;
6869
extern TIM_HandleTypeDef htim3;
@@ -302,6 +303,20 @@ void TIM4_IRQHandler(void)
302303
/* USER CODE END TIM4_IRQn 1 */
303304
}
304305

306+
/**
307+
* @brief This function handles SPI1 global interrupt.
308+
*/
309+
void SPI1_IRQHandler(void)
310+
{
311+
/* USER CODE BEGIN SPI1_IRQn 0 */
312+
313+
/* USER CODE END SPI1_IRQn 0 */
314+
HAL_SPI_IRQHandler(&hspi1);
315+
/* USER CODE BEGIN SPI1_IRQn 1 */
316+
317+
/* USER CODE END SPI1_IRQn 1 */
318+
}
319+
305320
/**
306321
* @brief This function handles USART1 global interrupt.
307322
*/

0 commit comments

Comments
 (0)