diff --git a/src/src/main/java/com/my/graphiteDigesterBg/step/StepHeating.java b/src/src/main/java/com/my/graphiteDigesterBg/step/StepHeating.java index e8cd3a3..04dff44 100644 --- a/src/src/main/java/com/my/graphiteDigesterBg/step/StepHeating.java +++ b/src/src/main/java/com/my/graphiteDigesterBg/step/StepHeating.java @@ -12,7 +12,7 @@ public class StepHeating extends DiTaskStepBase { public static final Logger LOG = LoggerFactory.getLogger(StepHeating.class); // temperature public Integer temperature; - // duration in seconds + // duration in minutes public Integer duration; @Override @@ -22,7 +22,7 @@ public class StepHeating extends DiTaskStepBase { var heating = new MoveHeatPlateSlotHeating(); heating.slotIndex = task.slotIndex; heating.temperature = this.temperature; - heating.duration = this.duration * 60; + heating.duration = this.duration; heating.setDevice(task.getDevice()); heating.onFinish(() -> { task.setStatus(DiTask.TaskStatus.READY); diff --git a/src/src/main/java/com/my/graphiteDigesterBg/step/StepPump.java b/src/src/main/java/com/my/graphiteDigesterBg/step/StepPump.java index c21616a..d480503 100644 --- a/src/src/main/java/com/my/graphiteDigesterBg/step/StepPump.java +++ b/src/src/main/java/com/my/graphiteDigesterBg/step/StepPump.java @@ -1,6 +1,12 @@ package com.my.graphiteDigesterBg.step; import com.my.graphiteDigesterBg.diframe.DiTaskStepBase; import com.my.graphiteDigesterBg.diframe.TaskStep; +import com.my.graphiteDigesterBg.model.MdbOperationLog; +import com.my.graphiteDigesterBg.move.MoveLiquidAdd; +import com.my.graphiteDigesterBg.move.MoveMoveTubeRackFromHeatPlateToLiquidPlate; +import com.my.graphiteDigesterBg.move.MoveMoveTubeRackFromLiquidPlateToHeatPlate; +import com.my.graphiteDigesterBg.task.TaskDigestion; + @TaskStep(name="Pump") public class StepPump extends DiTaskStepBase { // type @@ -12,6 +18,26 @@ public class StepPump extends DiTaskStepBase { @Override public void run() { - System.out.println("StepPump.run()"); + var task = (TaskDigestion)this.getTask(); + + // move tube rack from heat plate to liquid plate + var moveTubeRackFromHeatPlateToLiquidPlate = new MoveMoveTubeRackFromHeatPlateToLiquidPlate(); + moveTubeRackFromHeatPlateToLiquidPlate.setDevice(task.getDevice()); + moveTubeRackFromHeatPlateToLiquidPlate.slotIndex = task.slotIndex; + moveTubeRackFromHeatPlateToLiquidPlate.run(); + + // add liquid + var liquidAdd = new MoveLiquidAdd(); + liquidAdd.setDevice(task.getDevice()); + liquidAdd.shakeTimes = this.shake; + liquidAdd.liquidType = this.type; + liquidAdd.liquidVolume = this.amount; + liquidAdd.run(); + + // move tube rack from liquid plate to heat plate + var moveTubeRackFromLiquidPlateToHeatPlate = new MoveMoveTubeRackFromLiquidPlateToHeatPlate(); + moveTubeRackFromLiquidPlateToHeatPlate.setDevice(task.getDevice()); + moveTubeRackFromLiquidPlateToHeatPlate.slotIndex = task.slotIndex; + moveTubeRackFromLiquidPlateToHeatPlate.run(); } }