diff --git a/Core/Src/main.c b/Core/Src/main.c index 0843de4..1770486 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -345,13 +345,13 @@ static void MX_GPIO_Init(void) /*Configure GPIO pins : HVS_OVERLOAD_Pin HVS_OVERHEAT_Pin */ GPIO_InitStruct.Pin = HVS_OVERLOAD_Pin|HVS_OVERHEAT_Pin; GPIO_InitStruct.Mode = GPIO_MODE_INPUT; - GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Pull = GPIO_PULLDOWN; HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); /*Configure GPIO pins : HVS_NOLINK_Pin HVS_XRAYON_Pin HVS_READY_Pin */ GPIO_InitStruct.Pin = HVS_NOLINK_Pin|HVS_XRAYON_Pin|HVS_READY_Pin; GPIO_InitStruct.Mode = GPIO_MODE_INPUT; - GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Pull = GPIO_PULLDOWN; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); /*Configure GPIO pin : HVS_CONN_Pin */ diff --git a/RS485_BSV.ioc b/RS485_BSV.ioc index 2664a9b..8a9c53e 100644 --- a/RS485_BSV.ioc +++ b/RS485_BSV.ioc @@ -86,8 +86,9 @@ NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:false\:true\:false NVIC.USART1_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false -PA10.GPIOParameters=GPIO_Label +PA10.GPIOParameters=GPIO_PuPd,GPIO_Label PA10.GPIO_Label=HVS_READY +PA10.GPIO_PuPd=GPIO_PULLDOWN PA10.Locked=true PA10.Signal=GPIO_Input PA11.GPIOParameters=GPIO_Label @@ -110,12 +111,14 @@ PA6.Signal=ADCx_IN6 PA7.GPIOParameters=GPIO_Label PA7.GPIO_Label=I_MON PA7.Signal=ADCx_IN7 -PA8.GPIOParameters=GPIO_Label +PA8.GPIOParameters=GPIO_PuPd,GPIO_Label PA8.GPIO_Label=HVS_NOLINK +PA8.GPIO_PuPd=GPIO_PULLDOWN PA8.Locked=true PA8.Signal=GPIO_Input -PA9.GPIOParameters=GPIO_Label +PA9.GPIOParameters=GPIO_PuPd,GPIO_Label PA9.GPIO_Label=HVS_XRAYON +PA9.GPIO_PuPd=GPIO_PULLDOWN PA9.Locked=true PA9.Signal=GPIO_Input PB3.Mode=Trace_Asynchronous_SW @@ -140,16 +143,19 @@ PC4.Signal=ADCx_IN14 PC5.GPIOParameters=GPIO_Label PC5.GPIO_Label=HVS_24V PC5.Signal=ADCx_IN15 -PC7.GPIOParameters=GPIO_Label +PC7.GPIOParameters=PinState,GPIO_Label PC7.GPIO_Label=HVS_ENABLE PC7.Locked=true +PC7.PinState=GPIO_PIN_RESET PC7.Signal=GPIO_Output -PC8.GPIOParameters=GPIO_Label +PC8.GPIOParameters=GPIO_PuPd,GPIO_Label PC8.GPIO_Label=HVS_OVERLOAD +PC8.GPIO_PuPd=GPIO_PULLDOWN PC8.Locked=true PC8.Signal=GPIO_Input -PC9.GPIOParameters=GPIO_Label +PC9.GPIOParameters=GPIO_PuPd,GPIO_Label PC9.GPIO_Label=HVS_OVERHEAT +PC9.GPIO_PuPd=GPIO_PULLDOWN PC9.Locked=true PC9.Signal=GPIO_Input PD0-OSC_IN.Mode=HSE-External-Oscillator @@ -187,7 +193,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_USART1_UART_Init-USART1-false-HAL-true,5-MX_DAC_Init-DAC-false-HAL-true,6-MX_ADC1_Init-ADC1-false-HAL-true,7-MX_UART4_Init-UART4-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_USART1_UART_Init-USART1-false-HAL-true,5-MX_DAC_Init-DAC-false-HAL-true,6-MX_ADC1_Init-ADC1-false-HAL-true RCC.ADCFreqValue=12000000 RCC.ADCPresc=RCC_ADCPCLK2_DIV6 RCC.AHBFreq_Value=72000000