From 64a64b36c34ee6328ed59e986d62e21d01aa4c10 Mon Sep 17 00:00:00 2001 From: Anton Mukhin Date: Tue, 2 Jul 2024 18:47:33 +0300 Subject: [PATCH] rearranged pins --- Core/Inc/main.h | 6 ++-- Core/Src/main.c | 36 ------------------------ Core/Src/stm32f1xx_hal_msp.c | 53 +++--------------------------------- RS485_BSV.ioc | 31 ++++++++------------- 4 files changed, 18 insertions(+), 108 deletions(-) diff --git a/Core/Inc/main.h b/Core/Inc/main.h index 4712bc0..a2a7d34 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -67,10 +67,10 @@ void Error_Handler(void); #define U_MON_GPIO_Port GPIOA #define I_MON_Pin GPIO_PIN_7 #define I_MON_GPIO_Port GPIOA -#define HVS_24V_Pin GPIO_PIN_4 -#define HVS_24V_GPIO_Port GPIOC -#define HVS_15V_Pin GPIO_PIN_5 +#define HVS_15V_Pin GPIO_PIN_4 #define HVS_15V_GPIO_Port GPIOC +#define HVS_24V_Pin GPIO_PIN_5 +#define HVS_24V_GPIO_Port GPIOC #define HVS_ENABLE_Pin GPIO_PIN_7 #define HVS_ENABLE_GPIO_Port GPIOC #define HVS_OVERLOAD_Pin GPIO_PIN_8 diff --git a/Core/Src/main.c b/Core/Src/main.c index 4db2e00..0843de4 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -44,7 +44,6 @@ ADC_HandleTypeDef hadc1; DAC_HandleTypeDef hdac; -UART_HandleTypeDef huart4; UART_HandleTypeDef huart1; DMA_HandleTypeDef hdma_usart1_rx; DMA_HandleTypeDef hdma_usart1_tx; @@ -60,7 +59,6 @@ static void MX_DMA_Init(void); static void MX_USART1_UART_Init(void); static void MX_DAC_Init(void); static void MX_ADC1_Init(void); -static void MX_UART4_Init(void); /* USER CODE BEGIN PFP */ /* USER CODE END PFP */ @@ -103,7 +101,6 @@ int main(void) MX_USART1_UART_Init(); MX_DAC_Init(); MX_ADC1_Init(); - MX_UART4_Init(); /* USER CODE BEGIN 2 */ /* USER CODE END 2 */ @@ -263,39 +260,6 @@ static void MX_DAC_Init(void) } -/** - * @brief UART4 Initialization Function - * @param None - * @retval None - */ -static void MX_UART4_Init(void) -{ - - /* USER CODE BEGIN UART4_Init 0 */ - - /* USER CODE END UART4_Init 0 */ - - /* USER CODE BEGIN UART4_Init 1 */ - - /* USER CODE END UART4_Init 1 */ - huart4.Instance = UART4; - huart4.Init.BaudRate = 115200; - huart4.Init.WordLength = UART_WORDLENGTH_8B; - huart4.Init.StopBits = UART_STOPBITS_1; - huart4.Init.Parity = UART_PARITY_NONE; - huart4.Init.Mode = UART_MODE_TX_RX; - huart4.Init.HwFlowCtl = UART_HWCONTROL_NONE; - huart4.Init.OverSampling = UART_OVERSAMPLING_16; - if (HAL_UART_Init(&huart4) != HAL_OK) - { - Error_Handler(); - } - /* USER CODE BEGIN UART4_Init 2 */ - - /* USER CODE END UART4_Init 2 */ - -} - /** * @brief USART1 Initialization Function * @param None diff --git a/Core/Src/stm32f1xx_hal_msp.c b/Core/Src/stm32f1xx_hal_msp.c index 4f5c62b..6cffff1 100644 --- a/Core/Src/stm32f1xx_hal_msp.c +++ b/Core/Src/stm32f1xx_hal_msp.c @@ -113,7 +113,7 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc) GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); - GPIO_InitStruct.Pin = HVS_24V_Pin|HVS_15V_Pin; + GPIO_InitStruct.Pin = HVS_15V_Pin|HVS_24V_Pin; GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); @@ -148,7 +148,7 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc) */ HAL_GPIO_DeInit(GPIOA, U_MON_Pin|I_MON_Pin); - HAL_GPIO_DeInit(GPIOC, HVS_24V_Pin|HVS_15V_Pin); + HAL_GPIO_DeInit(GPIOC, HVS_15V_Pin|HVS_24V_Pin); /* USER CODE BEGIN ADC1_MspDeInit 1 */ @@ -228,34 +228,7 @@ void HAL_DAC_MspDeInit(DAC_HandleTypeDef* hdac) void HAL_UART_MspInit(UART_HandleTypeDef* huart) { GPIO_InitTypeDef GPIO_InitStruct = {0}; - if(huart->Instance==UART4) - { - /* USER CODE BEGIN UART4_MspInit 0 */ - - /* USER CODE END UART4_MspInit 0 */ - /* Peripheral clock enable */ - __HAL_RCC_UART4_CLK_ENABLE(); - - __HAL_RCC_GPIOC_CLK_ENABLE(); - /**UART4 GPIO Configuration - PC10 ------> UART4_TX - PC11 ------> UART4_RX - */ - GPIO_InitStruct.Pin = GPIO_PIN_10; - GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; - HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); - - GPIO_InitStruct.Pin = GPIO_PIN_11; - GPIO_InitStruct.Mode = GPIO_MODE_INPUT; - GPIO_InitStruct.Pull = GPIO_NOPULL; - HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); - - /* USER CODE BEGIN UART4_MspInit 1 */ - - /* USER CODE END UART4_MspInit 1 */ - } - else if(huart->Instance==USART1) + if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspInit 0 */ @@ -331,25 +304,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) */ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) { - if(huart->Instance==UART4) - { - /* USER CODE BEGIN UART4_MspDeInit 0 */ - - /* USER CODE END UART4_MspDeInit 0 */ - /* Peripheral clock disable */ - __HAL_RCC_UART4_CLK_DISABLE(); - - /**UART4 GPIO Configuration - PC10 ------> UART4_TX - PC11 ------> UART4_RX - */ - HAL_GPIO_DeInit(GPIOC, GPIO_PIN_10|GPIO_PIN_11); - - /* USER CODE BEGIN UART4_MspDeInit 1 */ - - /* USER CODE END UART4_MspDeInit 1 */ - } - else if(huart->Instance==USART1) + if(huart->Instance==USART1) { /* USER CODE BEGIN USART1_MspDeInit 0 */ diff --git a/RS485_BSV.ioc b/RS485_BSV.ioc index 3258639..2664a9b 100644 --- a/RS485_BSV.ioc +++ b/RS485_BSV.ioc @@ -39,9 +39,8 @@ Mcu.IP2=DMA Mcu.IP3=NVIC Mcu.IP4=RCC Mcu.IP5=SYS -Mcu.IP6=UART4 -Mcu.IP7=USART1 -Mcu.IPNb=8 +Mcu.IP6=USART1 +Mcu.IPNb=7 Mcu.Name=STM32F103R(C-D-E)Tx Mcu.Package=LQFP64 Mcu.Pin0=PD0-OSC_IN @@ -54,14 +53,12 @@ Mcu.Pin14=PA10 Mcu.Pin15=PA11 Mcu.Pin16=PA13 Mcu.Pin17=PA14 -Mcu.Pin18=PC10 -Mcu.Pin19=PC11 +Mcu.Pin18=PB3 +Mcu.Pin19=PB5 Mcu.Pin2=PC1 -Mcu.Pin20=PB3 -Mcu.Pin21=PB5 -Mcu.Pin22=PB6 -Mcu.Pin23=PB7 -Mcu.Pin24=VP_SYS_VS_Systick +Mcu.Pin20=PB6 +Mcu.Pin21=PB7 +Mcu.Pin22=VP_SYS_VS_Systick Mcu.Pin3=PA4 Mcu.Pin4=PA5 Mcu.Pin5=PA6 @@ -69,7 +66,7 @@ Mcu.Pin6=PA7 Mcu.Pin7=PC4 Mcu.Pin8=PC5 Mcu.Pin9=PC7 -Mcu.PinsNb=25 +Mcu.PinsNb=23 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32F103RCTx @@ -137,15 +134,11 @@ PC1.GPIOParameters=GPIO_Label PC1.GPIO_Label=LED_ACT PC1.Locked=true PC1.Signal=GPIO_Output -PC10.Mode=Asynchronous -PC10.Signal=UART4_TX -PC11.Mode=Asynchronous -PC11.Signal=UART4_RX PC4.GPIOParameters=GPIO_Label -PC4.GPIO_Label=HVS_24V +PC4.GPIO_Label=HVS_15V PC4.Signal=ADCx_IN14 PC5.GPIOParameters=GPIO_Label -PC5.GPIO_Label=HVS_15V +PC5.GPIO_Label=HVS_24V PC5.Signal=ADCx_IN15 PC7.GPIOParameters=GPIO_Label PC7.GPIO_Label=HVS_ENABLE @@ -194,7 +187,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 +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 RCC.ADCFreqValue=12000000 RCC.ADCPresc=RCC_ADCPCLK2_DIV6 RCC.AHBFreq_Value=72000000 @@ -236,8 +229,6 @@ SH.COMP_DAC2_group.0=DAC_OUT2,DAC_OUT2 SH.COMP_DAC2_group.ConfNb=1 SH.GPXTI11.0=GPIO_EXTI11 SH.GPXTI11.ConfNb=1 -UART4.IPParameters=VirtualMode -UART4.VirtualMode=Asynchronous USART1.BaudRate=9600 USART1.IPParameters=VirtualMode,BaudRate USART1.VirtualMode=VM_ASYNC