Browse Source

吊耳切割【封板打标】恢复电磁阀开关逻辑

master
Lizongdi 2 weeks ago
parent
commit
b8bc8d1d89
  1. 4
      diaoerqiege/BHBF_Robot_Lifting_Lug/Core/Src/FSM.c
  2. 14
      diaoerqiege/BHBF_Robot_Lifting_Lug/Core/Src/main.c

4
diaoerqiege/BHBF_Robot_Lifting_Lug/Core/Src/FSM.c

@ -155,11 +155,11 @@ void IO_Control()
if(StrongGrindingMachineCurrentState == STRONG_GRINDING_MACHINE_MOTION_STATE) 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) else if(StrongGrindingMachineCurrentState == STRONG_GRINDING_MACHINE_HALT_STATE)
{ {
//GF_BSP_GPIO_SetIO(5, 1); GF_BSP_GPIO_SetIO(5, 1);
} }
else{ else{

14
diaoerqiege/BHBF_Robot_Lifting_Lug/Core/Src/main.c

@ -272,13 +272,13 @@ void CV_GV_Init()
P_MK32 = &GV.MK32_Key; P_MK32 = &GV.MK32_Key;
// 强磨机默认å�‘é€�å�œæ­¢å‘½ä»? // 强磨机默认发送停止命�?
strong_grinding_machine_cmd = 0; strong_grinding_machine_cmd = 0;
// 电ç£�é˜?默认关闭 // 电磁�?默认关闭
GF_BSP_GPIO_SetIO(3, 1); GF_BSP_GPIO_SetIO(3, 1);
//GF_BSP_GPIO_SetIO(4, 1); //GF_BSP_GPIO_SetIO(4, 1);
// 冷å�´é€šæ°”é˜?默认关闭,动作与主轴å�Œæ­¥ // 冷却通气�?默认关闭,动作与主轴同步
//GF_BSP_GPIO_SetIO(5, 1); GF_BSP_GPIO_SetIO(5, 1);
//Error Config //Error Config
SystemErrorData= &GV.SystemErrorData;//send to upper computer SystemErrorData= &GV.SystemErrorData;//send to upper computer
@ -340,20 +340,20 @@ void GF_Robot_Init()
//SlideMotor_Controller_intialize_CAN2(&FD_CAN_2_Handler);//雷赛电机 //SlideMotor_Controller_intialize_CAN2(&FD_CAN_2_Handler);//雷赛电机
// ï¿??光测è·�传感器ï¿??115200 // �??光测距传感器�??115200
//zhr29_200_laser_sensor_intialize(&RS_485_3_UART_Handler); //zhr29_200_laser_sensor_intialize(&RS_485_3_UART_Handler);
// 雷赛485电机 // 雷赛485电机
LS_485Motors_intialize(&RS_485_3_UART_Handler); LS_485Motors_intialize(&RS_485_3_UART_Handler);
// 强磨æœ? // 强磨�?
strong_grinding_machine_intialize(&RS_485_2_UART_Handler); strong_grinding_machine_intialize(&RS_485_2_UART_Handler);
Fsm_Init(); Fsm_Init();
uint8_t _state = 1; uint8_t _state = 1;
_state = _state & GF_BSP_TIMER_Init(); //定时器最å�Žå�¯ï¿?????? _state = _state & GF_BSP_TIMER_Init(); //定时器最后启�??????
} }

Loading…
Cancel
Save