From b8bc8d1d89288d09a4c1e5b84a8af27ef3d61582 Mon Sep 17 00:00:00 2001 From: Lizongdi <1210855344@qq.com> Date: Tue, 27 Oct 2026 16:36:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8A=E8=80=B3=E5=88=87=E5=89=B2=E3=80=90?= =?UTF-8?q?=E5=B0=81=E6=9D=BF=E6=89=93=E6=A0=87=E3=80=91=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E7=94=B5=E7=A3=81=E9=98=80=E5=BC=80=E5=85=B3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- diaoerqiege/BHBF_Robot_Lifting_Lug/Core/Src/FSM.c | 4 ++-- diaoerqiege/BHBF_Robot_Lifting_Lug/Core/Src/main.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/diaoerqiege/BHBF_Robot_Lifting_Lug/Core/Src/FSM.c b/diaoerqiege/BHBF_Robot_Lifting_Lug/Core/Src/FSM.c index ac818b5..4fe1f57 100644 --- a/diaoerqiege/BHBF_Robot_Lifting_Lug/Core/Src/FSM.c +++ b/diaoerqiege/BHBF_Robot_Lifting_Lug/Core/Src/FSM.c @@ -155,11 +155,11 @@ void IO_Control() if(StrongGrindingMachineCurrentState == STRONG_GRINDING_MACHINE_MOTION_STATE) { - //GF_BSP_GPIO_SetIO(5, 0); + GF_BSP_GPIO_SetIO(5, 0); } else if(StrongGrindingMachineCurrentState == STRONG_GRINDING_MACHINE_HALT_STATE) { - //GF_BSP_GPIO_SetIO(5, 1); + GF_BSP_GPIO_SetIO(5, 1); } else{ diff --git a/diaoerqiege/BHBF_Robot_Lifting_Lug/Core/Src/main.c b/diaoerqiege/BHBF_Robot_Lifting_Lug/Core/Src/main.c index 6d71f4e..64f04b4 100644 --- a/diaoerqiege/BHBF_Robot_Lifting_Lug/Core/Src/main.c +++ b/diaoerqiege/BHBF_Robot_Lifting_Lug/Core/Src/main.c @@ -272,13 +272,13 @@ void CV_GV_Init() P_MK32 = &GV.MK32_Key; - // 强磨机默认发送停止命? + // 强磨机默认发送停止命�? strong_grinding_machine_cmd = 0; - // 电磁?默认关闭 + // 电磁�?默认关闭 GF_BSP_GPIO_SetIO(3, 1); //GF_BSP_GPIO_SetIO(4, 1); - // 冷却通气?默认关闭，动作与主轴同步 - //GF_BSP_GPIO_SetIO(5, 1); + // 冷却通气�?默认关闭，动作与主轴同步 + GF_BSP_GPIO_SetIO(5, 1); //Error Config SystemErrorData= &GV.SystemErrorData;//send to upper computer @@ -340,20 +340,20 @@ void GF_Robot_Init() //SlideMotor_Controller_intialize_CAN2(&FD_CAN_2_Handler);//雷赛电机 - // ??光测距传感器??115200 + // �??光测距传感器�??115200 //zhr29_200_laser_sensor_intialize(&RS_485_3_UART_Handler); // 雷赛485电机 LS_485Motors_intialize(&RS_485_3_UART_Handler); - // 强磨? + // 强磨�? strong_grinding_machine_intialize(&RS_485_2_UART_Handler); Fsm_Init(); uint8_t _state = 1; - _state = _state & GF_BSP_TIMER_Init(); //定时器最后启?????? + _state = _state & GF_BSP_TIMER_Init(); //定时器最后启�?????? }