From ba9a7642a2c07af4a26911ca4ebf7087c4854548 Mon Sep 17 00:00:00 2001 From: Lizongdi <1210855344@qq.com> Date: Wed, 10 Jun 2026 11:24:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=94=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 32g431.ioc | 2 +- Core/Inc/main.h | 4 ++-- Core/Src/gpio.c | 6 +++--- robot | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/32g431.ioc b/32g431.ioc index ea54031..0445142 100644 --- a/32g431.ioc +++ b/32g431.ioc @@ -133,7 +133,7 @@ PB11.Locked=true PB11.Mode=Asynchronous PB11.Signal=LPUART1_TX PB12.GPIOParameters=GPIO_Label -PB12.GPIO_Label=RS4851_DIR +PB12.GPIO_Label=RS485_1_DIR PB12.Locked=true PB12.Signal=GPIO_Output PB3.GPIOParameters=GPIO_Label diff --git a/Core/Inc/main.h b/Core/Inc/main.h index 55812be..c6342f0 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -67,8 +67,8 @@ void Error_Handler(void); #define K2_GPIO_Port GPIOA #define K3_Pin GPIO_PIN_4 #define K3_GPIO_Port GPIOC -#define RS4851_DIR_Pin GPIO_PIN_12 -#define RS4851_DIR_GPIO_Port GPIOB +#define RS485_1_DIR_Pin GPIO_PIN_12 +#define RS485_1_DIR_GPIO_Port GPIOB #define RS485_2_DIR_Pin GPIO_PIN_8 #define RS485_2_DIR_GPIO_Port GPIOA #define LED3_Pin GPIO_PIN_3 diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c index 7f8110f..1812f4c 100644 --- a/Core/Src/gpio.c +++ b/Core/Src/gpio.c @@ -58,7 +58,7 @@ void MX_GPIO_Init(void) HAL_GPIO_WritePin(K3_GPIO_Port, K3_Pin, GPIO_PIN_RESET); /*Configure GPIO pin Output Level */ - HAL_GPIO_WritePin(GPIOB, RS4851_DIR_Pin|LED3_Pin|LED2_Pin|LED1_Pin, GPIO_PIN_RESET); + HAL_GPIO_WritePin(GPIOB, RS485_1_DIR_Pin|LED3_Pin|LED2_Pin|LED1_Pin, GPIO_PIN_RESET); /*Configure GPIO pins : K4_Pin K5_Pin K1_Pin K2_Pin RS485_2_DIR_Pin */ @@ -76,8 +76,8 @@ void MX_GPIO_Init(void) GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; HAL_GPIO_Init(K3_GPIO_Port, &GPIO_InitStruct); - /*Configure GPIO pins : RS4851_DIR_Pin LED3_Pin LED2_Pin LED1_Pin */ - GPIO_InitStruct.Pin = RS4851_DIR_Pin|LED3_Pin|LED2_Pin|LED1_Pin; + /*Configure GPIO pins : RS485_1_DIR_Pin LED3_Pin LED2_Pin LED1_Pin */ + GPIO_InitStruct.Pin = RS485_1_DIR_Pin|LED3_Pin|LED2_Pin|LED1_Pin; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; diff --git a/robot b/robot index 0fc4bcb..3b944f9 160000 --- a/robot +++ b/robot @@ -1 +1 @@ -Subproject commit 0fc4bcb8ff16a6d09a47ef6b475875a724bc7e77 +Subproject commit 3b944f95c34661aa9fe1659971f3a3853694ec57