From 4c5730c4fd59ec60fa96b2ca1625d6fc71ed9fef Mon Sep 17 00:00:00 2001 From: Maxime Date: Tue, 20 May 2025 18:49:08 +0200 Subject: [PATCH] =?UTF-8?q?correction=20des=20timers=20qui=20=C3=A9taient?= =?UTF-8?q?=20pas=20bons,=20normalement=20celle=20l=C3=A0=20c=20la=20bonne?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Core/Src/main.c | 4 ++-- Core/Src/tim.c | 16 ++++++++-------- pcb_odo.ioc | 14 ++++++++------ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Core/Src/main.c b/Core/Src/main.c index 766b66e..4c48d4d 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -100,8 +100,8 @@ int main(void) MX_TIM8_Init(); /* USER CODE BEGIN 2 */ - // HAL_TIM_PWM_Start(&htim8, TIM_CHANNEL_1); // IN1A - //HAL_TIM_PWM_Start(&htim8, TIM_CHANNEL_2); // IN2A + HAL_TIM_PWM_Start(&htim8, TIM_CHANNEL_1); // IN1A + HAL_TIM_PWM_Start(&htim8, TIM_CHANNEL_2); // IN2A HAL_TIM_PWM_Start(&htim1, TIM_CHANNEL_1); // IN1B HAL_TIM_PWM_Start(&htim1, TIM_CHANNEL_2); // IN2B HAL_TIM_Encoder_Start(&htim3, TIM_CHANNEL_ALL); diff --git a/Core/Src/tim.c b/Core/Src/tim.c index f56a766..0122c8b 100644 --- a/Core/Src/tim.c +++ b/Core/Src/tim.c @@ -399,24 +399,24 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* timHandle) /* USER CODE END TIM8_MspPostInit 0 */ - __HAL_RCC_GPIOA_CLK_ENABLE(); + __HAL_RCC_GPIOB_CLK_ENABLE(); /**TIM8 GPIO Configuration - PA14 ------> TIM8_CH2 - PA15 ------> TIM8_CH1 + PB6 ------> TIM8_CH1 + PB8-BOOT0 ------> TIM8_CH2 */ - GPIO_InitStruct.Pin = GPIO_PIN_14; + GPIO_InitStruct.Pin = GPIO_PIN_6; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Alternate = GPIO_AF5_TIM8; - HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); - GPIO_InitStruct.Pin = GPIO_PIN_15; + GPIO_InitStruct.Pin = GPIO_PIN_8; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; - GPIO_InitStruct.Alternate = GPIO_AF2_TIM8; - HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + GPIO_InitStruct.Alternate = GPIO_AF10_TIM8; + HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); /* USER CODE BEGIN TIM8_MspPostInit 1 */ diff --git a/pcb_odo.ioc b/pcb_odo.ioc index c9d7512..d1aed9a 100644 --- a/pcb_odo.ioc +++ b/pcb_odo.ioc @@ -21,7 +21,7 @@ Mcu.Name=STM32G491K(C-E)Ux Mcu.Package=UFQFPN32 Mcu.Pin0=PF0-OSC_IN Mcu.Pin1=PA0 -Mcu.Pin10=PB4 +Mcu.Pin10=PB8-BOOT0 Mcu.Pin11=VP_SYS_VS_Systick Mcu.Pin12=VP_SYS_VS_DBSignals Mcu.Pin13=VP_TIM1_VS_ClockSourceINT @@ -33,8 +33,8 @@ Mcu.Pin4=PA8 Mcu.Pin5=PA9 Mcu.Pin6=PA11 Mcu.Pin7=PA12 -Mcu.Pin8=PA14 -Mcu.Pin9=PA15 +Mcu.Pin8=PB4 +Mcu.Pin9=PB6 Mcu.PinsNb=16 Mcu.ThirdPartyNb=0 Mcu.UserConstants= @@ -68,8 +68,6 @@ PA11.Mode=Device PA11.Signal=USB_DM PA12.Mode=Device PA12.Signal=USB_DP -PA14.Signal=S_TIM8_CH2 -PA15.Signal=S_TIM8_CH1 PA4.GPIOParameters=GPIO_Speed,GPIO_PuPd PA4.GPIO_PuPd=GPIO_PULLUP PA4.GPIO_Speed=GPIO_SPEED_FREQ_HIGH @@ -84,6 +82,10 @@ PB4.GPIO_PuPd=GPIO_PULLUP PB4.GPIO_Speed=GPIO_SPEED_FREQ_HIGH PB4.Locked=true PB4.Signal=S_TIM3_CH1 +PB6.Locked=true +PB6.Signal=S_TIM8_CH1 +PB8-BOOT0.Locked=true +PB8-BOOT0.Signal=S_TIM8_CH2 PF0-OSC_IN.Mode=HSE-External-Clock-Source PF0-OSC_IN.Signal=RCC_OSC_IN PinOutPanel.RotationAngle=0 @@ -118,7 +120,7 @@ ProjectManager.ToolChainLocation= ProjectManager.UAScriptAfterPath= ProjectManager.UAScriptBeforePath= ProjectManager.UnderRoot=true -ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_TIM2_Init-TIM2-false-HAL-true,4-MX_TIM1_Init-TIM1-false-HAL-true,5-MX_TIM3_Init-TIM3-false-HAL-true,6-MX_USB_Device_Init-USB_DEVICE-false-HAL-false +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_TIM2_Init-TIM2-false-HAL-true,4-MX_TIM1_Init-TIM1-false-HAL-true,5-MX_TIM3_Init-TIM3-false-HAL-true,6-MX_USB_Device_Init-USB_DEVICE-false-HAL-false,7-MX_TIM8_Init-TIM8-false-HAL-true RCC.AHBFreq_Value=16000000 RCC.APB1Freq_Value=16000000 RCC.APB1TimFreq_Value=16000000