diff --git a/midi2cv/drivers/peripherals.c b/midi2cv/drivers/peripherals.c index f0540bd..b29959b 100644 --- a/midi2cv/drivers/peripherals.c +++ b/midi2cv/drivers/peripherals.c @@ -3,3 +3,8 @@ IWDG_HandleTypeDef hiwdg = { .Instance = IWDG }; TIM_HandleTypeDef htim2 = { .Instance = TIM2 }; SPI_HandleTypeDef hspi2 = { .Instance = SPI2 }; + +void TIM2_IRQHandler() +{ + HAL_TIM_IRQHandler(&htim2); +} diff --git a/midi2cv/midi2cv.cc b/midi2cv/midi2cv.cc index 6f9a2be..5df6a48 100644 --- a/midi2cv/midi2cv.cc +++ b/midi2cv/midi2cv.cc @@ -110,11 +110,6 @@ void SysTick_Handler(void) system_clock.Tick(); } -void TIM2_IRQHandler() -{ - HAL_TIM_IRQHandler(&htim2); -} - void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef* htim) { if (htim != &htim2) { diff --git a/stereo_mix/drivers/peripherals.c b/stereo_mix/drivers/peripherals.c index a8a6c9b..38c43e9 100644 --- a/stereo_mix/drivers/peripherals.c +++ b/stereo_mix/drivers/peripherals.c @@ -3,3 +3,12 @@ ADC_HandleTypeDef hadc1 = { .Instance = ADC1 }; DMA_HandleTypeDef hdma1_channel1 = { .Instance = DMA1_Channel1 }; SPI_HandleTypeDef hspi1 = { .Instance = SPI1 }; + +void DMA1_Channel1_IRQHandler(void) +{ + HAL_DMA_IRQHandler(&hdma1_channel1); +} +void ADC1_IRQHandler(void) +{ + HAL_ADC_IRQHandler(&hadc1); +} diff --git a/stereo_mix/stereo_mix.cc b/stereo_mix/stereo_mix.cc index f9a6649..4cb5978 100644 --- a/stereo_mix/stereo_mix.cc +++ b/stereo_mix/stereo_mix.cc @@ -80,14 +80,6 @@ void SystemClock_Config(void) Error_Handler(); } } -void DMA1_Channel1_IRQHandler(void) -{ - HAL_DMA_IRQHandler(&hdma1_channel1); -} -void ADC1_IRQHandler(void) -{ - HAL_ADC_IRQHandler(&hadc1); -} void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc) {