X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ssr%2FSrc%2Fstm32f1xx_it.c;h=b8a4457e4746ac26b46fde1715546b79d1273e9e;hb=1a225be603a00f82c68272074d92776c10a6f6f7;hp=c571e46e4437c3f3268db2f52146528da32cbebe;hpb=08f734c44598ca90f47f4ab0dfed232c045dd403;p=home-hw.git diff --git a/ssr/Src/stm32f1xx_it.c b/ssr/Src/stm32f1xx_it.c index c571e46..b8a4457 100644 --- a/ssr/Src/stm32f1xx_it.c +++ b/ssr/Src/stm32f1xx_it.c @@ -194,6 +194,20 @@ void SysTick_Handler(void) /* please refer to the startup file (startup_stm32f1xx.s). */ /******************************************************************************/ +/** +* @brief This function handles DMA1 channel6 global interrupt. +*/ +void DMA1_Channel6_IRQHandler(void) +{ + /* USER CODE BEGIN DMA1_Channel6_IRQn 0 */ + + /* USER CODE END DMA1_Channel6_IRQn 0 */ + + /* USER CODE BEGIN DMA1_Channel6_IRQn 1 */ + + /* USER CODE END DMA1_Channel6_IRQn 1 */ +} + /** * @brief This function handles USB high priority or CAN TX interrupts. */ @@ -222,6 +236,19 @@ void USB_LP_CAN1_RX0_IRQHandler(void) /* USER CODE END USB_LP_CAN1_RX0_IRQn 1 */ } +/** +* @brief This function handles TIM3 global interrupt. +*/ +void TIM3_IRQHandler(void) +{ + /* USER CODE BEGIN TIM3_IRQn 0 */ + + /* USER CODE END TIM3_IRQn 0 */ + /* USER CODE BEGIN TIM3_IRQn 1 */ + + /* USER CODE END TIM3_IRQn 1 */ +} + /** * @brief This function handles TIM4 global interrupt. */ @@ -230,7 +257,7 @@ void TIM4_IRQHandler(void) /* USER CODE BEGIN TIM4_IRQn 0 */ if (LL_TIM_IsActiveFlag_UPDATE(TIM4)) { - // FIXME + timer_ticked = 1; LL_TIM_ClearFlag_UPDATE(TIM4); } @@ -240,66 +267,6 @@ void TIM4_IRQHandler(void) /* USER CODE END TIM4_IRQn 1 */ } -/** -* @brief This function handles I2C1 event interrupt. -*/ -void I2C1_EV_IRQHandler(void) -{ - /* USER CODE BEGIN I2C1_EV_IRQn 0 */ - u32 sr1 = I2C1->SR1; - if (sr1 & I2C_SR1_SB) - LL_I2C_TransmitData8(I2C1, bmp_i2c_addr); - else if (bmp_i2c_addr & 1) - { - // Receive - if (sr1 & I2C_SR1_ADDR) - { - LL_I2C_DisableBitPOS(I2C1); - if (bmp_i2c_len == 1) - LL_I2C_AcknowledgeNextData(I2C1, LL_I2C_NACK); - LL_I2C_AcknowledgeNextData(I2C1, LL_I2C_ACK); - LL_I2C_ClearFlag_ADDR(I2C1); - } - else if (sr1 & I2C_SR1_RXNE) - { - if (bmp_i2c_len > 0) - { - if (bmp_i2c_len == 1) - { - LL_I2C_AcknowledgeNextData(I2C1, LL_I2C_NACK); - LL_I2C_GenerateStopCondition(I2C1); - } - *bmp_i2c_ptr++ = LL_I2C_ReceiveData8(I2C1); - bmp_i2c_len--; - } - else - LL_I2C_DisableIT_RX(I2C1); - } - } - else - { - // Transmit - if (sr1 & I2C_SR1_ADDR) - LL_I2C_ClearFlag_ADDR(I2C1); - else if (sr1 & I2C_SR1_TXE) - { - if (bmp_i2c_len) - { - LL_I2C_TransmitData8(I2C1, *bmp_i2c_ptr++); - bmp_i2c_len--; - } - else - LL_I2C_DisableIT_TX(I2C1); - } - } - - /* USER CODE END I2C1_EV_IRQn 0 */ - - /* USER CODE BEGIN I2C1_EV_IRQn 1 */ - - /* USER CODE END I2C1_EV_IRQn 1 */ -} - /* USER CODE BEGIN 1 */ /* USER CODE END 1 */