From 5e013526cd4511fe63451762d1197503de4e3589 Mon Sep 17 00:00:00 2001 From: liuyuyan Date: Sun, 9 Jun 2024 22:01:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0adc=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Core/Inc/main.h | 2 ++ Core/Src/adc.c | 2 +- Core/Src/gpio.c | 6 ++++++ demo1_start.ioc | 37 +++++++++++++++++++++---------------- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/Core/Inc/main.h b/Core/Inc/main.h index 4fa9717..c34ded3 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -58,6 +58,8 @@ void Error_Handler(void); /* USER CODE END EFP */ /* Private defines -----------------------------------------------------------*/ +#define KEY_Pin GPIO_PIN_0 +#define KEY_GPIO_Port GPIOC #define JD_PIN_Pin GPIO_PIN_11 #define JD_PIN_GPIO_Port GPIOA /* USER CODE BEGIN Private defines */ diff --git a/Core/Src/adc.c b/Core/Src/adc.c index 8edc7f1..c974c68 100644 --- a/Core/Src/adc.c +++ b/Core/Src/adc.c @@ -27,7 +27,7 @@ ADC_HandleTypeDef hadc1; /* ADC1 init function */ -void MX_ADC1_Init(void) +void MX_ADC1_Init(void) { /* USER CODE BEGIN ADC1_Init 0 */ diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c index 8d68819..41c36b4 100644 --- a/Core/Src/gpio.c +++ b/Core/Src/gpio.c @@ -51,6 +51,12 @@ void MX_GPIO_Init(void) /*Configure GPIO pin Output Level */ HAL_GPIO_WritePin(JD_PIN_GPIO_Port, JD_PIN_Pin, GPIO_PIN_RESET); + /*Configure GPIO pin : PtPin */ + GPIO_InitStruct.Pin = KEY_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_INPUT; + GPIO_InitStruct.Pull = GPIO_NOPULL; + HAL_GPIO_Init(KEY_GPIO_Port, &GPIO_InitStruct); + /*Configure GPIO pin : PtPin */ GPIO_InitStruct.Pin = JD_PIN_Pin; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; diff --git a/demo1_start.ioc b/demo1_start.ioc index 1569636..dacdb4b 100644 --- a/demo1_start.ioc +++ b/demo1_start.ioc @@ -22,21 +22,22 @@ Mcu.Name=STM32F103R(C-D-E)Tx Mcu.Package=LQFP64 Mcu.Pin0=PD0-OSC_IN Mcu.Pin1=PD1-OSC_OUT -Mcu.Pin10=PA11 -Mcu.Pin11=PA13 -Mcu.Pin12=PA14 -Mcu.Pin13=VP_SYS_VS_Systick -Mcu.Pin14=VP_TIM2_VS_ClockSourceINT -Mcu.Pin15=VP_TIM3_VS_ClockSourceINT -Mcu.Pin2=PC1 -Mcu.Pin3=PA1 -Mcu.Pin4=PA6 -Mcu.Pin5=PA7 -Mcu.Pin6=PC6 -Mcu.Pin7=PC7 -Mcu.Pin8=PA9 -Mcu.Pin9=PA10 -Mcu.PinsNb=16 +Mcu.Pin10=PA10 +Mcu.Pin11=PA11 +Mcu.Pin12=PA13 +Mcu.Pin13=PA14 +Mcu.Pin14=VP_SYS_VS_Systick +Mcu.Pin15=VP_TIM2_VS_ClockSourceINT +Mcu.Pin16=VP_TIM3_VS_ClockSourceINT +Mcu.Pin2=PC0 +Mcu.Pin3=PC1 +Mcu.Pin4=PA1 +Mcu.Pin5=PA6 +Mcu.Pin6=PA7 +Mcu.Pin7=PC6 +Mcu.Pin8=PC7 +Mcu.Pin9=PA9 +Mcu.PinsNb=17 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32F103RCTx @@ -71,6 +72,10 @@ PA7.Locked=true PA7.Signal=S_TIM3_CH2 PA9.Mode=Asynchronous PA9.Signal=USART1_TX +PC0.GPIOParameters=GPIO_Label +PC0.GPIO_Label=KEY +PC0.Locked=true +PC0.Signal=GPIO_Input PC1.Locked=true PC1.Signal=ADCx_IN11 PC6.Locked=true @@ -109,7 +114,7 @@ ProjectManager.StackSize=0x400 ProjectManager.TargetToolchain=SW4STM32 ProjectManager.ToolChainLocation= ProjectManager.UnderRoot=true -ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_USART1_UART_Init-USART1-false-HAL-true,4-MX_TIM2_Init-TIM2-false-HAL-true,5-MX_TIM3_Init-TIM3-false-HAL-true,6-MX_TIM8_Init-TIM8-false-HAL-true +ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_USART1_UART_Init-USART1-false-HAL-true,4-MX_TIM2_Init-TIM2-false-HAL-true,5-MX_TIM3_Init-TIM3-false-HAL-true,6-MX_TIM8_Init-TIM8-false-HAL-true,7-MX_ADC1_Init-ADC1-false-HAL-true RCC.ADCFreqValue=36000000 RCC.AHBFreq_Value=72000000 RCC.APB1CLKDivider=RCC_HCLK_DIV2 -- Gitee