Browse Source

调整归零顺序

master
zhaohe 3 months ago
parent
commit
9d7d209d4a
  1. 2
      src/main/java/a8k/app/constant/AppConstant.java
  2. 4
      src/main/java/a8k/app/service/lowerctrl/DeviceMoveToZeroCtrlService.java
  3. 12
      src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java

2
src/main/java/a8k/app/constant/AppConstant.java

@ -5,7 +5,7 @@ public class AppConstant {
public static final int CONSUMABLE_COL_NUM = 5;
public static final int CONSUMABLE_ROW_NUM = 5;
public static final int TIP_NUM = 120;
public static final String APP_VERSION = "1.1.4";
public static final String APP_VERSION = "1.1.5";
public static final int CONSUMABLE_CHANNEL_NUM = 6;

4
src/main/java/a8k/app/service/lowerctrl/DeviceMoveToZeroCtrlService.java

@ -179,10 +179,10 @@ public class DeviceMoveToZeroCtrlService {
log.info("入料平移电机回零");
stepMotorCtrlDriver.stepMotorEasyMoveToZeroBlock(StepMotorMId.FeedingModXM);
//板夹仓初始化
log.info("板夹仓Y轴电机回零");
stepMotorCtrlDriver.stepMotorEasyMoveToZeroBlock(StepMotorMId.PlatesBoxYM);
log.info("板夹仓推板电机回零");
stepMotorCtrlDriver.stepMotorEasyMoveToZeroBlock(StepMotorMId.PlatesBoxPusherM);
log.info("板夹仓Y轴电机回零");
stepMotorCtrlDriver.stepMotorEasyMoveToZeroBlock(StepMotorMId.PlatesBoxYM);
//光学模组初始化
log.info("光学模组扫码电机回零");
stepMotorCtrlDriver.stepMotorEasyMoveToZeroBlock(StepMotorMId.OptModScannerM);

12
src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java

@ -289,15 +289,9 @@ public class MainFlowCtrlScheduler implements ApplicationListener<ApplicationSta
}
switch (state.workState) {
case IDLE -> {
onIDLE();
}
case WORKING -> {
onWorking();
}
case PAUSE -> {
onPause();
}
case IDLE -> onIDLE();
case WORKING -> onWorking();
case PAUSE -> onPause();
}
onPostProcessing();

Loading…
Cancel
Save