From e0e8534902ffdd066122aa2e364d01e81d1b5e5a Mon Sep 17 00:00:00 2001 From: Alexey 'Cluster' Avdyukhin Date: Mon, 7 Aug 2023 17:23:52 +0400 Subject: [PATCH] FDS_WRITE pullup --- FdsKey/Core/Src/main.c | 12 +++--------- FdsKey/FdsKey.ioc | 4 ++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/FdsKey/Core/Src/main.c b/FdsKey/Core/Src/main.c index 910ee00..c33e059 100644 --- a/FdsKey/Core/Src/main.c +++ b/FdsKey/Core/Src/main.c @@ -573,17 +573,11 @@ static void MX_GPIO_Init(void) GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); - /*Configure GPIO pin : FDS_SCAN_MEDIA_Pin */ - GPIO_InitStruct.Pin = FDS_SCAN_MEDIA_Pin; + /*Configure GPIO pins : FDS_SCAN_MEDIA_Pin FDS_WRITE_Pin */ + GPIO_InitStruct.Pin = FDS_SCAN_MEDIA_Pin|FDS_WRITE_Pin; GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING; GPIO_InitStruct.Pull = GPIO_PULLUP; - HAL_GPIO_Init(FDS_SCAN_MEDIA_GPIO_Port, &GPIO_InitStruct); - - /*Configure GPIO pin : FDS_WRITE_Pin */ - GPIO_InitStruct.Pin = FDS_WRITE_Pin; - GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING; - GPIO_InitStruct.Pull = GPIO_PULLDOWN; - HAL_GPIO_Init(FDS_WRITE_GPIO_Port, &GPIO_InitStruct); + HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); /*Configure GPIO pins : BUTTON_LEFT_Pin BUTTON_UP_Pin */ GPIO_InitStruct.Pin = BUTTON_LEFT_Pin|BUTTON_UP_Pin; diff --git a/FdsKey/FdsKey.ioc b/FdsKey/FdsKey.ioc index b5a03b4..c05fb49 100644 --- a/FdsKey/FdsKey.ioc +++ b/FdsKey/FdsKey.ioc @@ -174,7 +174,7 @@ PB1.Signal=GPXTI1 PB2.GPIOParameters=GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultEXTI PB2.GPIO_Label=FDS_WRITE PB2.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_RISING_FALLING -PB2.GPIO_PuPd=GPIO_PULLDOWN +PB2.GPIO_PuPd=GPIO_PULLUP PB2.Locked=true PB2.Signal=GPXTI2 PB3.Mode=Full_Duplex_Master @@ -235,7 +235,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_DMA_Init-DMA-false-HAL-true,4-MX_I2C1_Init-I2C1-false-HAL-true,5-MX_SPI3_Init-SPI3-false-HAL-true,6-MX_TIM3_Init-TIM3-false-HAL-true,7-MX_FATFS_Init-FATFS-false-HAL-false,8-MX_TIM17_Init-TIM17-false-HAL-true,9-MX_TIM1_Init-TIM1-false-HAL-true,10-MX_TIM4_Init-TIM4-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_I2C1_Init-I2C1-false-HAL-true,5-MX_SPI3_Init-SPI3-false-HAL-true,6-MX_TIM3_Init-TIM3-false-HAL-true,7-MX_TIM17_Init-TIM17-false-HAL-true,8-MX_TIM1_Init-TIM1-false-HAL-true,9-MX_TIM4_Init-TIM4-false-HAL-true RCC.ADCFreq_Value=64000000 RCC.AHBFreq_Value=64000000 RCC.APB1CLKDivider=RCC_HCLK_DIV2