diff --git a/Core/Inc/i2c.h b/Core/Inc/i2c.h index 4baa02a..29bebff 100644 --- a/Core/Inc/i2c.h +++ b/Core/Inc/i2c.h @@ -34,11 +34,14 @@ extern "C" { extern I2C_HandleTypeDef hi2c1; +extern I2C_HandleTypeDef hi2c2; + /* USER CODE BEGIN Private defines */ /* USER CODE END Private defines */ void MX_I2C1_Init(void); +void MX_I2C2_Init(void); /* USER CODE BEGIN Prototypes */ diff --git a/Core/Inc/stm32g0xx_it.h b/Core/Inc/stm32g0xx_it.h index 96ae761..2950058 100644 --- a/Core/Inc/stm32g0xx_it.h +++ b/Core/Inc/stm32g0xx_it.h @@ -52,8 +52,10 @@ void EXTI0_1_IRQHandler(void); void EXTI4_15_IRQHandler(void); void DMA1_Channel1_IRQHandler(void); void DMA1_Channel2_3_IRQHandler(void); +void DMA1_Ch4_5_DMAMUX1_OVR_IRQHandler(void); void TIM17_IRQHandler(void); void I2C1_IRQHandler(void); +void I2C2_IRQHandler(void); void USART2_IRQHandler(void); /* USER CODE BEGIN EFP */ diff --git a/Core/Src/dma.c b/Core/Src/dma.c index e7c0064..621bf54 100644 --- a/Core/Src/dma.c +++ b/Core/Src/dma.c @@ -49,6 +49,9 @@ void MX_DMA_Init(void) /* DMA1_Channel2_3_IRQn interrupt configuration */ HAL_NVIC_SetPriority(DMA1_Channel2_3_IRQn, 3, 0); HAL_NVIC_EnableIRQ(DMA1_Channel2_3_IRQn); + /* DMA1_Ch4_5_DMAMUX1_OVR_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(DMA1_Ch4_5_DMAMUX1_OVR_IRQn, 3, 0); + HAL_NVIC_EnableIRQ(DMA1_Ch4_5_DMAMUX1_OVR_IRQn); } diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c index adcfbee..3cc1f85 100644 --- a/Core/Src/gpio.c +++ b/Core/Src/gpio.c @@ -83,10 +83,8 @@ void MX_GPIO_Init(void) GPIO_InitStruct.Pull = GPIO_NOPULL; HAL_GPIO_Init(ENCODER_B_INPUT_GPIO_Port, &GPIO_InitStruct); - /*Configure GPIO pins : PA5 PA6 PA7 PA11 - PA12 PA15 */ - GPIO_InitStruct.Pin = GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_11 - |GPIO_PIN_12|GPIO_PIN_15; + /*Configure GPIO pins : PA5 PA6 PA7 PA15 */ + GPIO_InitStruct.Pin = GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_15; GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; GPIO_InitStruct.Pull = GPIO_NOPULL; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); diff --git a/Core/Src/i2c.c b/Core/Src/i2c.c index 92d7f41..c627488 100644 --- a/Core/Src/i2c.c +++ b/Core/Src/i2c.c @@ -25,7 +25,9 @@ /* USER CODE END 0 */ I2C_HandleTypeDef hi2c1; +I2C_HandleTypeDef hi2c2; DMA_HandleTypeDef hdma_i2c1_rx; +DMA_HandleTypeDef hdma_i2c2_tx; /* I2C1 init function */ void MX_I2C1_Init(void) @@ -69,6 +71,49 @@ void MX_I2C1_Init(void) /* USER CODE END I2C1_Init 2 */ +} +/* I2C2 init function */ +void MX_I2C2_Init(void) +{ + + /* USER CODE BEGIN I2C2_Init 0 */ + + /* USER CODE END I2C2_Init 0 */ + + /* USER CODE BEGIN I2C2_Init 1 */ + + /* USER CODE END I2C2_Init 1 */ + hi2c2.Instance = I2C2; + hi2c2.Init.Timing = 0x00C12166; + hi2c2.Init.OwnAddress1 = 0; + hi2c2.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT; + hi2c2.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE; + hi2c2.Init.OwnAddress2 = 0; + hi2c2.Init.OwnAddress2Masks = I2C_OA2_NOMASK; + hi2c2.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE; + hi2c2.Init.NoStretchMode = I2C_NOSTRETCH_DISABLE; + if (HAL_I2C_Init(&hi2c2) != HAL_OK) + { + Error_Handler(); + } + + /** Configure Analogue filter + */ + if (HAL_I2CEx_ConfigAnalogFilter(&hi2c2, I2C_ANALOGFILTER_ENABLE) != HAL_OK) + { + Error_Handler(); + } + + /** Configure Digital filter + */ + if (HAL_I2CEx_ConfigDigitalFilter(&hi2c2, 0) != HAL_OK) + { + Error_Handler(); + } + /* USER CODE BEGIN I2C2_Init 2 */ + + /* USER CODE END I2C2_Init 2 */ + } void HAL_I2C_MspInit(I2C_HandleTypeDef* i2cHandle) @@ -131,6 +176,52 @@ void HAL_I2C_MspInit(I2C_HandleTypeDef* i2cHandle) /* USER CODE END I2C1_MspInit 1 */ } + else if(i2cHandle->Instance==I2C2) + { + /* USER CODE BEGIN I2C2_MspInit 0 */ + + /* USER CODE END I2C2_MspInit 0 */ + + __HAL_RCC_GPIOA_CLK_ENABLE(); + /**I2C2 GPIO Configuration + PA11 [PA9] ------> I2C2_SCL + PA12 [PA10] ------> I2C2_SDA + */ + GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_12; + GPIO_InitStruct.Mode = GPIO_MODE_AF_OD; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF6_I2C2; + HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + + /* I2C2 clock enable */ + __HAL_RCC_I2C2_CLK_ENABLE(); + + /* I2C2 DMA Init */ + /* I2C2_TX Init */ + hdma_i2c2_tx.Instance = DMA1_Channel4; + hdma_i2c2_tx.Init.Request = DMA_REQUEST_I2C2_TX; + hdma_i2c2_tx.Init.Direction = DMA_MEMORY_TO_PERIPH; + hdma_i2c2_tx.Init.PeriphInc = DMA_PINC_DISABLE; + hdma_i2c2_tx.Init.MemInc = DMA_MINC_ENABLE; + hdma_i2c2_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE; + hdma_i2c2_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE; + hdma_i2c2_tx.Init.Mode = DMA_NORMAL; + hdma_i2c2_tx.Init.Priority = DMA_PRIORITY_LOW; + if (HAL_DMA_Init(&hdma_i2c2_tx) != HAL_OK) + { + Error_Handler(); + } + + __HAL_LINKDMA(i2cHandle,hdmatx,hdma_i2c2_tx); + + /* I2C2 interrupt Init */ + HAL_NVIC_SetPriority(I2C2_IRQn, 3, 0); + HAL_NVIC_EnableIRQ(I2C2_IRQn); + /* USER CODE BEGIN I2C2_MspInit 1 */ + + /* USER CODE END I2C2_MspInit 1 */ + } } void HAL_I2C_MspDeInit(I2C_HandleTypeDef* i2cHandle) @@ -161,6 +252,31 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* i2cHandle) /* USER CODE END I2C1_MspDeInit 1 */ } + else if(i2cHandle->Instance==I2C2) + { + /* USER CODE BEGIN I2C2_MspDeInit 0 */ + + /* USER CODE END I2C2_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_I2C2_CLK_DISABLE(); + + /**I2C2 GPIO Configuration + PA11 [PA9] ------> I2C2_SCL + PA12 [PA10] ------> I2C2_SDA + */ + HAL_GPIO_DeInit(GPIOA, GPIO_PIN_11); + + HAL_GPIO_DeInit(GPIOA, GPIO_PIN_12); + + /* I2C2 DMA DeInit */ + HAL_DMA_DeInit(i2cHandle->hdmatx); + + /* I2C2 interrupt Deinit */ + HAL_NVIC_DisableIRQ(I2C2_IRQn); + /* USER CODE BEGIN I2C2_MspDeInit 1 */ + + /* USER CODE END I2C2_MspDeInit 1 */ + } } /* USER CODE BEGIN 1 */ diff --git a/Core/Src/main.c b/Core/Src/main.c index 4ea0040..baeabf2 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -96,6 +96,7 @@ int main(void) MX_USART2_UART_Init(); MX_TIM1_Init(); MX_I2C1_Init(); + MX_I2C2_Init(); /* USER CODE BEGIN 2 */ /* USER CODE END 2 */ diff --git a/Core/Src/stm32g0xx_it.c b/Core/Src/stm32g0xx_it.c index 7f98aa6..a031be9 100644 --- a/Core/Src/stm32g0xx_it.c +++ b/Core/Src/stm32g0xx_it.c @@ -56,7 +56,9 @@ /* External variables --------------------------------------------------------*/ extern DMA_HandleTypeDef hdma_i2c1_rx; +extern DMA_HandleTypeDef hdma_i2c2_tx; extern I2C_HandleTypeDef hi2c1; +extern I2C_HandleTypeDef hi2c2; extern DMA_HandleTypeDef hdma_usart2_rx; extern DMA_HandleTypeDef hdma_usart2_tx; extern UART_HandleTypeDef huart2; @@ -164,6 +166,20 @@ void DMA1_Channel2_3_IRQHandler(void) /* USER CODE END DMA1_Channel2_3_IRQn 1 */ } +/** + * @brief This function handles DMA1 channel 4, channel 5 and DMAMUX1 interrupts. + */ +void DMA1_Ch4_5_DMAMUX1_OVR_IRQHandler(void) +{ + /* USER CODE BEGIN DMA1_Ch4_5_DMAMUX1_OVR_IRQn 0 */ + + /* USER CODE END DMA1_Ch4_5_DMAMUX1_OVR_IRQn 0 */ + HAL_DMA_IRQHandler(&hdma_i2c2_tx); + /* USER CODE BEGIN DMA1_Ch4_5_DMAMUX1_OVR_IRQn 1 */ + + /* USER CODE END DMA1_Ch4_5_DMAMUX1_OVR_IRQn 1 */ +} + /** * @brief This function handles TIM17 global interrupt. */ @@ -199,6 +215,27 @@ void I2C1_IRQHandler(void) /* USER CODE END I2C1_IRQn 1 */ } +/** + * @brief This function handles I2C2 global interrupt. + */ +void I2C2_IRQHandler(void) +{ + /* USER CODE BEGIN I2C2_IRQn 0 */ + + /* USER CODE END I2C2_IRQn 0 */ + if (hi2c2.Instance->ISR & (I2C_FLAG_BERR | I2C_FLAG_ARLO | I2C_FLAG_OVR)) + { + HAL_I2C_ER_IRQHandler(&hi2c2); + } + else + { + HAL_I2C_EV_IRQHandler(&hi2c2); + } + /* USER CODE BEGIN I2C2_IRQn 1 */ + + /* USER CODE END I2C2_IRQn 1 */ +} + /** * @brief This function handles USART2 global interrupt / USART2 wake-up interrupt through EXTI line 26. */ diff --git a/STM32G030F6P6_Evaluation.ioc b/STM32G030F6P6_Evaluation.ioc index dfc706f..4dff155 100644 --- a/STM32G030F6P6_Evaluation.ioc +++ b/STM32G030F6P6_Evaluation.ioc @@ -19,10 +19,28 @@ Dma.I2C1_RX.2.SyncEnable=DISABLE Dma.I2C1_RX.2.SyncPolarity=HAL_DMAMUX_SYNC_NO_EVENT Dma.I2C1_RX.2.SyncRequestNumber=1 Dma.I2C1_RX.2.SyncSignalID=NONE +Dma.I2C2_TX.3.Direction=DMA_MEMORY_TO_PERIPH +Dma.I2C2_TX.3.EventEnable=DISABLE +Dma.I2C2_TX.3.Instance=DMA1_Channel4 +Dma.I2C2_TX.3.MemDataAlignment=DMA_MDATAALIGN_BYTE +Dma.I2C2_TX.3.MemInc=DMA_MINC_ENABLE +Dma.I2C2_TX.3.Mode=DMA_NORMAL +Dma.I2C2_TX.3.PeriphDataAlignment=DMA_PDATAALIGN_BYTE +Dma.I2C2_TX.3.PeriphInc=DMA_PINC_DISABLE +Dma.I2C2_TX.3.Polarity=HAL_DMAMUX_REQ_GEN_RISING +Dma.I2C2_TX.3.Priority=DMA_PRIORITY_LOW +Dma.I2C2_TX.3.RequestNumber=1 +Dma.I2C2_TX.3.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,SignalID,Polarity,RequestNumber,SyncSignalID,SyncPolarity,SyncEnable,EventEnable,SyncRequestNumber +Dma.I2C2_TX.3.SignalID=NONE +Dma.I2C2_TX.3.SyncEnable=DISABLE +Dma.I2C2_TX.3.SyncPolarity=HAL_DMAMUX_SYNC_NO_EVENT +Dma.I2C2_TX.3.SyncRequestNumber=1 +Dma.I2C2_TX.3.SyncSignalID=NONE Dma.Request0=USART2_RX Dma.Request1=USART2_TX Dma.Request2=I2C1_RX -Dma.RequestsNb=3 +Dma.Request3=I2C2_TX +Dma.RequestsNb=4 Dma.USART2_RX.0.Direction=DMA_PERIPH_TO_MEMORY Dma.USART2_RX.0.EventEnable=DISABLE Dma.USART2_RX.0.Instance=DMA1_Channel1 @@ -70,25 +88,31 @@ GPIO.groupedBy=Group By Peripherals I2C1.I2C_Speed_Mode=I2C_Fast I2C1.IPParameters=Timing,I2C_Speed_Mode I2C1.Timing=0x00C12166 +I2C2.I2C_Speed_Mode=I2C_Fast +I2C2.IPParameters=Timing,I2C_Speed_Mode +I2C2.Timing=0x00C12166 KeepUserPlacement=false Mcu.CPN=STM32G030F6P6TR Mcu.Family=STM32G0 Mcu.IP0=DMA Mcu.IP1=FREERTOS Mcu.IP2=I2C1 -Mcu.IP3=NVIC -Mcu.IP4=RCC -Mcu.IP5=SYS -Mcu.IP6=TIM1 -Mcu.IP7=USART2 -Mcu.IPNb=8 +Mcu.IP3=I2C2 +Mcu.IP4=NVIC +Mcu.IP5=RCC +Mcu.IP6=SYS +Mcu.IP7=TIM1 +Mcu.IP8=USART2 +Mcu.IPNb=9 Mcu.Name=STM32G030F6Px Mcu.Package=TSSOP20 Mcu.Pin0=PB8 Mcu.Pin1=PB9 -Mcu.Pin10=PA14-BOOT0 -Mcu.Pin11=VP_FREERTOS_VS_CMSIS_V1 -Mcu.Pin12=VP_SYS_VS_tim17 +Mcu.Pin10=PA12 [PA10] +Mcu.Pin11=PA13 +Mcu.Pin12=PA14-BOOT0 +Mcu.Pin13=VP_FREERTOS_VS_CMSIS_V1 +Mcu.Pin14=VP_SYS_VS_tim17 Mcu.Pin2=PC15-OSC32_OUT (PC15) Mcu.Pin3=PA0 Mcu.Pin4=PA1 @@ -96,13 +120,14 @@ Mcu.Pin5=PA2 Mcu.Pin6=PA3 Mcu.Pin7=PA4 Mcu.Pin8=PA8 -Mcu.Pin9=PA13 -Mcu.PinsNb=13 +Mcu.Pin9=PA11 [PA9] +Mcu.PinsNb=15 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32G030F6Px MxCube.Version=6.18.0 MxDb.Version=DB.6.0.180 +NVIC.DMA1_Ch4_5_DMAMUX1_OVR_IRQn=true\:3\:0\:false\:false\:true\:true\:false\:true\:true NVIC.DMA1_Channel1_IRQn=true\:3\:0\:false\:false\:true\:true\:false\:true\:true NVIC.DMA1_Channel2_3_IRQn=true\:3\:0\:false\:false\:true\:true\:false\:true\:true NVIC.EXTI0_1_IRQn=true\:3\:0\:false\:false\:true\:true\:true\:true\:true @@ -110,6 +135,7 @@ NVIC.EXTI4_15_IRQn=true\:3\:0\:false\:false\:true\:true\:true\:true\:true NVIC.ForceEnableDMAVector=true NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false NVIC.I2C1_IRQn=true\:3\:0\:false\:false\:true\:true\:true\:true\:true +NVIC.I2C2_IRQn=true\:3\:0\:false\:false\:true\:true\:true\:true\:true NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false NVIC.PendSV_IRQn=true\:3\:0\:false\:false\:false\:true\:false\:false\:false NVIC.SVC_IRQn=true\:0\:0\:false\:false\:false\:false\:false\:false\:true @@ -130,6 +156,10 @@ PA1.GPIOParameters=GPIO_Label PA1.GPIO_Label=ENCODER_B_INPUT PA1.Locked=true PA1.Signal=GPIO_Input +PA11\ [PA9].Mode=I2C +PA11\ [PA9].Signal=I2C2_SCL +PA12\ [PA10].Mode=I2C +PA12\ [PA10].Signal=I2C2_SDA PA13.Mode=Serial_Wire PA13.Signal=SYS_SWDIO PA14-BOOT0.Mode=Serial_Wire @@ -205,7 +235,7 @@ ProjectManager.ToolChainLocation= ProjectManager.UAScriptAfterPath= ProjectManager.UAScriptBeforePath= ProjectManager.UnderRoot=false -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_USART2_UART_Init-USART2-false-HAL-true,5-MX_TIM1_Init-TIM1-false-HAL-true,6-MX_I2C1_Init-I2C1-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_USART2_UART_Init-USART2-false-HAL-true,5-MX_TIM1_Init-TIM1-false-HAL-true,6-MX_I2C1_Init-I2C1-false-HAL-true,7-MX_I2C2_Init-I2C2-false-HAL-true RCC.ADCFreq_Value=64000000 RCC.AHBFreq_Value=64000000 RCC.APBFreq_Value=64000000