From 38590d433b52b27447d39b3d2adeeca8d7a4c82d Mon Sep 17 00:00:00 2001 From: Jasper Date: Wed, 17 Aug 2022 08:45:48 +0200 Subject: [PATCH] LED PWM --- Core/Inc/leds.h | 4 +- Core/Inc/main.h | 4 +- Core/Inc/stm32g4xx_hal_conf.h | 2 +- Core/Src/leds.c | 10 +++-- Core/Src/main.c | 66 ++++++++++++++++++++++++++----- Core/Src/stm32g4xx_hal_msp.c | 74 ++++++++++++++++++++++++++++++++++- steering-wheel-stm.ioc | 14 +++++-- 7 files changed, 154 insertions(+), 20 deletions(-) diff --git a/Core/Inc/leds.h b/Core/Inc/leds.h index 4555473..46ea212 100644 --- a/Core/Inc/leds.h +++ b/Core/Inc/leds.h @@ -1,6 +1,8 @@ #ifndef __LEDS_H #define __LEDS_H -void leds_init(); +#include "stm32g4xx_hal.h" + +void leds_init(TIM_HandleTypeDef* timer); #endif // __LEDS_H diff --git a/Core/Inc/main.h b/Core/Inc/main.h index 6153579..6e5e298 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -49,6 +49,8 @@ extern "C" { /* USER CODE END EM */ +void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim); + /* Exported functions prototypes ---------------------------------------------*/ void Error_Handler(void); @@ -96,7 +98,7 @@ void Error_Handler(void); #define ENC1B_Pin GPIO_PIN_7 #define ENC1B_GPIO_Port GPIOB /* USER CODE BEGIN Private defines */ - +#define TOP_PWM_TIM_CHANNEL TIM_CHANNEL_1 /* USER CODE END Private defines */ #ifdef __cplusplus diff --git a/Core/Inc/stm32g4xx_hal_conf.h b/Core/Inc/stm32g4xx_hal_conf.h index cf5a208..a73c442 100644 --- a/Core/Inc/stm32g4xx_hal_conf.h +++ b/Core/Inc/stm32g4xx_hal_conf.h @@ -62,7 +62,7 @@ /*#define HAL_SMBUS_MODULE_ENABLED */ /*#define HAL_SPI_MODULE_ENABLED */ /*#define HAL_SRAM_MODULE_ENABLED */ -/*#define HAL_TIM_MODULE_ENABLED */ +#define HAL_TIM_MODULE_ENABLED /*#define HAL_UART_MODULE_ENABLED */ /*#define HAL_USART_MODULE_ENABLED */ /*#define HAL_WWDG_MODULE_ENABLED */ diff --git a/Core/Src/leds.c b/Core/Src/leds.c index 7102a18..6357b96 100644 --- a/Core/Src/leds.c +++ b/Core/Src/leds.c @@ -4,17 +4,21 @@ #include "stm32g4xx_hal.h" #include "stm32g4xx_hal_gpio.h" +#include "stm32g4xx_hal_tim.h" + +void leds_init(TIM_HandleTypeDef* timer) { + if (HAL_TIM_PWM_Start(timer, TOP_PWM_TIM_CHANNEL) != HAL_OK) { + Error_Handler(); + } -void leds_init() { HAL_GPIO_WritePin(LED_NOE_GPIO_Port, LED_NOE_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(LED_NCLR_GPIO_Port, LED_NCLR_Pin, GPIO_PIN_SET); HAL_GPIO_WritePin(LED_OCLK_GPIO_Port, LED_OCLK_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(LED_ICLK_GPIO_Port, LED_ICLK_Pin, GPIO_PIN_RESET); - HAL_GPIO_WritePin(TOP_PWM_GPIO_Port, TOP_PWM_Pin, GPIO_PIN_SET); HAL_Delay(10); for (int i = 0; i < 12; i++) { - GPIO_PinState state = (i % 2 == 0) ? GPIO_PIN_SET : GPIO_PIN_RESET; + GPIO_PinState state = GPIO_PIN_RESET; HAL_GPIO_WritePin(LED_SER_GPIO_Port, LED_SER_Pin, state); HAL_Delay(5); HAL_GPIO_WritePin(LED_ICLK_GPIO_Port, LED_ICLK_Pin, GPIO_PIN_SET); diff --git a/Core/Src/main.c b/Core/Src/main.c index 23191b1..68673b1 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -55,6 +55,8 @@ FDCAN_HandleTypeDef hfdcan1; I2C_HandleTypeDef hi2c2; +TIM_HandleTypeDef htim2; + /* USER CODE BEGIN PV */ /* USER CODE END PV */ @@ -65,6 +67,7 @@ static void MX_GPIO_Init(void); static void MX_ADC1_Init(void); static void MX_FDCAN1_Init(void); static void MX_I2C2_Init(void); +static void MX_TIM2_Init(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -105,8 +108,9 @@ int main(void) { MX_ADC1_Init(); MX_FDCAN1_Init(); MX_I2C2_Init(); + MX_TIM2_Init(); /* USER CODE BEGIN 2 */ - leds_init(); + leds_init(&htim2); state_init(); vehicle_init(&hfdcan1); rpi_init(&hi2c2); @@ -323,6 +327,50 @@ static void MX_I2C2_Init(void) { /* USER CODE END I2C2_Init 2 */ } +/** + * @brief TIM2 Initialization Function + * @param None + * @retval None + */ +static void MX_TIM2_Init(void) { + + /* USER CODE BEGIN TIM2_Init 0 */ + + /* USER CODE END TIM2_Init 0 */ + + TIM_MasterConfigTypeDef sMasterConfig = {0}; + TIM_OC_InitTypeDef sConfigOC = {0}; + + /* USER CODE BEGIN TIM2_Init 1 */ + + /* USER CODE END TIM2_Init 1 */ + htim2.Instance = TIM2; + htim2.Init.Prescaler = 79; + htim2.Init.CounterMode = TIM_COUNTERMODE_UP; + htim2.Init.Period = 255; + htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; + htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE; + if (HAL_TIM_PWM_Init(&htim2) != HAL_OK) { + Error_Handler(); + } + sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET; + sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE; + if (HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig) != HAL_OK) { + Error_Handler(); + } + sConfigOC.OCMode = TIM_OCMODE_PWM1; + sConfigOC.Pulse = 31; + sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH; + sConfigOC.OCFastMode = TIM_OCFAST_DISABLE; + if (HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_1) != HAL_OK) { + Error_Handler(); + } + /* USER CODE BEGIN TIM2_Init 2 */ + + /* USER CODE END TIM2_Init 2 */ + HAL_TIM_MspPostInit(&htim2); +} + /** * @brief GPIO Initialization Function * @param None @@ -337,17 +385,15 @@ static void MX_GPIO_Init(void) { /*Configure GPIO pin Output Level */ HAL_GPIO_WritePin(GPIOA, - TOP_PWM_Pin | LOGO_PWM_Pin | LED_ICLK_Pin | LED_OCLK_Pin | - LED_NCLR_Pin | LED_SER_Pin | LED_NOE_Pin | - DISP_RESET_Pin, + LOGO_PWM_Pin | LED_ICLK_Pin | LED_OCLK_Pin | LED_NCLR_Pin | + LED_SER_Pin | LED_NOE_Pin | DISP_RESET_Pin, GPIO_PIN_RESET); - /*Configure GPIO pins : TOP_PWM_Pin LOGO_PWM_Pin LED_ICLK_Pin LED_OCLK_Pin - LED_NCLR_Pin LED_SER_Pin LED_NOE_Pin DISP_RESET_Pin - */ - GPIO_InitStruct.Pin = TOP_PWM_Pin | LOGO_PWM_Pin | LED_ICLK_Pin | - LED_OCLK_Pin | LED_NCLR_Pin | LED_SER_Pin | - LED_NOE_Pin | DISP_RESET_Pin; + /*Configure GPIO pins : LOGO_PWM_Pin LED_ICLK_Pin LED_OCLK_Pin LED_NCLR_Pin + LED_SER_Pin LED_NOE_Pin DISP_RESET_Pin */ + GPIO_InitStruct.Pin = LOGO_PWM_Pin | LED_ICLK_Pin | LED_OCLK_Pin | + LED_NCLR_Pin | LED_SER_Pin | LED_NOE_Pin | + DISP_RESET_Pin; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; diff --git a/Core/Src/stm32g4xx_hal_msp.c b/Core/Src/stm32g4xx_hal_msp.c index 203730b..4ce5c76 100644 --- a/Core/Src/stm32g4xx_hal_msp.c +++ b/Core/Src/stm32g4xx_hal_msp.c @@ -57,7 +57,9 @@ /* USER CODE BEGIN 0 */ /* USER CODE END 0 */ -/** + +void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim); + /** * Initializes the Global MSP. */ void HAL_MspInit(void) @@ -315,6 +317,76 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c) } +/** +* @brief TIM_PWM MSP Initialization +* This function configures the hardware resources used in this example +* @param htim_pwm: TIM_PWM handle pointer +* @retval None +*/ +void HAL_TIM_PWM_MspInit(TIM_HandleTypeDef* htim_pwm) +{ + if(htim_pwm->Instance==TIM2) + { + /* USER CODE BEGIN TIM2_MspInit 0 */ + + /* USER CODE END TIM2_MspInit 0 */ + /* Peripheral clock enable */ + __HAL_RCC_TIM2_CLK_ENABLE(); + /* USER CODE BEGIN TIM2_MspInit 1 */ + + /* USER CODE END TIM2_MspInit 1 */ + } + +} + +void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim) +{ + GPIO_InitTypeDef GPIO_InitStruct = {0}; + if(htim->Instance==TIM2) + { + /* USER CODE BEGIN TIM2_MspPostInit 0 */ + + /* USER CODE END TIM2_MspPostInit 0 */ + + __HAL_RCC_GPIOA_CLK_ENABLE(); + /**TIM2 GPIO Configuration + PA0 ------> TIM2_CH1 + */ + GPIO_InitStruct.Pin = TOP_PWM_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF1_TIM2; + HAL_GPIO_Init(TOP_PWM_GPIO_Port, &GPIO_InitStruct); + + /* USER CODE BEGIN TIM2_MspPostInit 1 */ + + /* USER CODE END TIM2_MspPostInit 1 */ + } + +} +/** +* @brief TIM_PWM MSP De-Initialization +* This function freeze the hardware resources used in this example +* @param htim_pwm: TIM_PWM handle pointer +* @retval None +*/ +void HAL_TIM_PWM_MspDeInit(TIM_HandleTypeDef* htim_pwm) +{ + if(htim_pwm->Instance==TIM2) + { + /* USER CODE BEGIN TIM2_MspDeInit 0 */ + + /* USER CODE END TIM2_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_TIM2_CLK_DISABLE(); + /* USER CODE BEGIN TIM2_MspDeInit 1 */ + + /* USER CODE END TIM2_MspDeInit 1 */ + } + +} + /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ diff --git a/steering-wheel-stm.ioc b/steering-wheel-stm.ioc index 337a647..de7c6a2 100644 --- a/steering-wheel-stm.ioc +++ b/steering-wheel-stm.ioc @@ -32,7 +32,8 @@ Mcu.IP2=I2C2 Mcu.IP3=NVIC Mcu.IP4=RCC Mcu.IP5=SYS -Mcu.IPNb=6 +Mcu.IP6=TIM2 +Mcu.IPNb=7 Mcu.Name=STM32G441CBTx Mcu.Package=LQFP48 Mcu.Pin0=PA0 @@ -83,7 +84,7 @@ NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:true PA0.GPIOParameters=GPIO_Label PA0.GPIO_Label=TOP_PWM PA0.Locked=true -PA0.Signal=GPIO_Output +PA0.Signal=S_TIM2_CH1 PA1.GPIOParameters=GPIO_Label PA1.GPIO_Label=LOGO_PWM PA1.Locked=true @@ -198,7 +199,7 @@ ProjectManager.StackSize=0x400 ProjectManager.TargetToolchain=Makefile ProjectManager.ToolChainLocation= ProjectManager.UnderRoot=false -ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_ADC1_Init-ADC1-false-HAL-true,4-MX_FDCAN1_Init-FDCAN1-false-HAL-true,5-MX_I2C2_Init-I2C2-false-HAL-true +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_ADC1_Init-ADC1-false-HAL-true,4-MX_FDCAN1_Init-FDCAN1-false-HAL-true,5-MX_I2C2_Init-I2C2-false-HAL-true,6-MX_TIM2_Init-TIM2-false-HAL-true RCC.ADC12Freq_Value=80000000 RCC.AHBFreq_Value=80000000 RCC.APB1Freq_Value=80000000 @@ -249,6 +250,13 @@ SH.GPXTI14.0=GPIO_EXTI14 SH.GPXTI14.ConfNb=1 SH.GPXTI15.0=GPIO_EXTI15 SH.GPXTI15.ConfNb=1 +SH.S_TIM2_CH1.0=TIM2_CH1,PWM Generation1 CH1 +SH.S_TIM2_CH1.ConfNb=1 +TIM2.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1 +TIM2.IPParameters=Channel-PWM Generation1 CH1,Prescaler,PeriodNoDither,PulseNoDither_1 +TIM2.PeriodNoDither=255 +TIM2.Prescaler=79 +TIM2.PulseNoDither_1=31 VP_SYS_VS_DBSignals.Mode=DisableDeadBatterySignals VP_SYS_VS_DBSignals.Signal=SYS_VS_DBSignals VP_SYS_VS_Systick.Mode=SysTick