From d323572043e24ecd5abe074770f134279440a8fa Mon Sep 17 00:00:00 2001 From: tianjialong Date: Tue, 28 Feb 2023 18:31:05 +0800 Subject: [PATCH] =?UTF-8?q?cubemx=20=E9=85=8D=E7=BD=AE=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E5=99=A8=E4=B8=A4=E4=B8=AA=E7=BC=96=E7=A0=81=E5=99=A8=E5=BC=95?= =?UTF-8?q?=E8=84=9A=E6=8B=89=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LWIP.ioc | 6 +++++- Src/tim.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/LWIP.ioc b/LWIP.ioc index ad4c08f..f627e5f 100644 --- a/LWIP.ioc +++ b/LWIP.ioc @@ -115,7 +115,11 @@ PC4.Mode=RMII PC4.Signal=ETH_RXD0 PC5.Mode=RMII PC5.Signal=ETH_RXD1 +PD12.GPIOParameters=GPIO_PuPd +PD12.GPIO_PuPd=GPIO_PULLUP PD12.Signal=S_TIM4_CH1 +PD13.GPIOParameters=GPIO_PuPd +PD13.GPIO_PuPd=GPIO_PULLUP PD13.Signal=S_TIM4_CH2 PD3.GPIOParameters=GPIO_Label PD3.GPIO_Label=ETH_RST @@ -166,7 +170,7 @@ ProjectManager.StackSize=0x400 ProjectManager.TargetToolchain=MDK-ARM V5 ProjectManager.ToolChainLocation= ProjectManager.UnderRoot=false -ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_LWIP_Init-LWIP-false-HAL-false,4-MX_TIM6_Init-TIM6-false-HAL-true,5-MX_USART1_UART_Init-USART1-false-HAL-true +ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_LWIP_Init-LWIP-false-HAL-false,4-MX_TIM6_Init-TIM6-false-HAL-true,5-MX_USART1_UART_Init-USART1-false-HAL-true,6-MX_TIM4_Init-TIM4-false-HAL-true RCC.48MHZClocksFreq_Value=84000000 RCC.AHBFreq_Value=168000000 RCC.APB1CLKDivider=RCC_HCLK_DIV4 diff --git a/Src/tim.c b/Src/tim.c index 082f216..8e87730 100644 --- a/Src/tim.c +++ b/Src/tim.c @@ -124,7 +124,7 @@ void HAL_TIM_Encoder_MspInit(TIM_HandleTypeDef* tim_encoderHandle) */ GPIO_InitStruct.Pin = GPIO_PIN_12|GPIO_PIN_13; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; - GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Pull = GPIO_PULLUP; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Alternate = GPIO_AF2_TIM4; HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);