退火温度/4移除

src/main/java/com/iflytop/sgs/app/service/crafts/CraftsStepService.java

@@ -85,7 +85,6 @@ public class CraftsStepService {
     public boolean preHeat(HeatModuleCode heatModuleCode, JSONObject params, CraftMonitor craftMonitor) throws Exception {
         Double temperature = params.getDouble("temperature");
         log.info("工艺{},预热", HeatModuleCode.heat_module_04);
-        //todo
         heatModuleService.heatRodOpen(HeatModuleCode.heat_module_04, temperature);
         deviceStateService.getDeviceState().getHeatModuleByCode(HeatModuleCode.heat_module_04).setTargetTemperature(temperature);//设置加热温度
         deviceStateService.getDeviceState().getHeatModuleByCode(HeatModuleCode.heat_module_04).setHeatingType(HeatingType.heating);//加热中
@@ -483,7 +482,7 @@ public class CraftsStepService {
         log.info("工艺{},温度达到", heatModuleCode);
         log.info("工艺{},恒温时间", time);
         webSocketService.pushCraftsDebug(CraftsDebugGenerator.generateJson(heatModuleCode.toString(), "温度达到", temperature));
-        deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setHeatingType(HeatingType.constant); //恒温中 todo 前端显示
+        deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setHeatingType(HeatingType.constant); //恒温中
         deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setStartHeatTime(LocalDateTime.now());//开始加热时间
         deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setTargetTime(time);//加热器目标加热时间
         int clock = 0;
@@ -767,15 +766,6 @@ public class CraftsStepService {
             webSocketService.pushCraftsDebug(CraftsDebugGenerator.generateJson(heatModuleCode.toString(), "机械臂移动至加热区", heatModuleCode));
             log.info("工艺{},申请使用转运模块", heatModuleCode);
             transferModuleService.requestTransferModule(CraftsTransferTypeCode.move_anneal);//申请使用转运模块
-            //todo 先双重检测做下判断
-//            boolean annealTrayState = deviceSensorService.getTrayStateByHeatModuleCode(HeatModuleCode.heat_module_04);
-//            if (annealTrayState) {
-//                transferModuleService.releaseTransferModule();//释放转运模组
-//                while (deviceSensorService.getTrayStateByHeatModuleCode(HeatModuleCode.heat_module_04)) {//判断退火区是否被占用
-//                    delay(1);//等待1秒
-//                }
-//                transferModuleService.requestTransferModule(CraftsTransferTypeCode.move_anneal);//申请使用转运模块
-//            }
             log.info("工艺{},加液机械臂上升", heatModuleCode);
             solutionModuleService.solutionMotorMoveZero();//加液机械臂上升
             log.info("工艺{},将X轴移动至目标加热模块托盘夹取点", heatModuleCode);
@@ -807,8 +797,7 @@ public class CraftsStepService {
             deviceStateService.getDeviceState().getHeatModuleByCode(HeatModuleCode.heat_module_04).setHeatingType(HeatingType.heating); //设置加热区状态 加热中
             deviceStateService.getDeviceState().getHeatModuleByCode(HeatModuleCode.heat_module_04).setTargetTemperature(temperature);//将加热温度设定为目标温度
             log.info("工艺{},开始加热", heatModuleCode);
-            //todo
-            heatModuleService.heatRodOpen(HeatModuleCode.heat_module_04, temperature / 4);//打开加热棒
+            heatModuleService.heatRodOpen(HeatModuleCode.heat_module_04, temperature);//打开加热棒
             //判断当前温度是否在设置温度范围内
             while (!heatIsSuitable(HeatModuleCode.heat_module_04, temperature)) {
                 delay(1);