diff --git a/src/main/java/a8k/service/app/devicectrl/param/param_mgr/TubePreProcesPosParamMgr.java b/src/main/java/a8k/service/app/devicectrl/param/param_mgr/TubePreProcesPosParamMgr.java index bef997b..dfed57d 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/param_mgr/TubePreProcesPosParamMgr.java +++ b/src/main/java/a8k/service/app/devicectrl/param/param_mgr/TubePreProcesPosParamMgr.java @@ -38,42 +38,42 @@ public class TubePreProcesPosParamMgr extends ParamMgr { public void setPos(TubePreProcessZAxisPos pos, Integer value) {setParam(pos, value);} - private Integer getParam(Enum pos) {return getParam(pos, Integer.class);} + private Integer getParamInteger(Enum pos) {return getParam(pos, Integer.class);} //Public - public Integer getPos(TubePreProcessGripperPos pos) {return getParam(pos);} + public Integer getPos(TubePreProcessGripperPos pos) {return getParamInteger(pos);} - public Integer getPos(TubePreProcessTubeClamp pos) {return getParam(pos);} + public Integer getPos(TubePreProcessTubeClamp pos) {return getParamInteger(pos);} - public Integer getPos(TubePreProcessYPos pos) {return getParam(pos);} + public Integer getPos(TubePreProcessYPos pos) {return getParamInteger(pos);} - public Integer getPos(TubePreProcessZAxisPos pos) {return getParam(pos);} + public Integer getPos(TubePreProcessZAxisPos pos) {return getParamInteger(pos);} - public Integer getGripperServoOpenPos() {return getParam(TubePreProcessGripperPos.GripperServoOpenPos);} + public Integer getGripperServoOpenPos() {return getParamInteger(TubePreProcessGripperPos.GripperServoOpenPos);} - public Integer getGripperServoTakeCapPos() {return getParam(TubePreProcessGripperPos.GripperServoTakeCapPos);} + public Integer getGripperServoTakeCapPos() {return getParamInteger(TubePreProcessGripperPos.GripperServoTakeCapPos);} - public Integer getYServoTakeTubePos() {return getParam(TubePreProcessYPos.YServoTakeTubePos);} + public Integer getYServoTakeTubePos() {return getParamInteger(TubePreProcessYPos.YServoTakeTubePos);} - public Integer getYServoShakePos() {return getParam(TubePreProcessYPos.YServoShakePos);} + public Integer getYServoShakePos() {return getParamInteger(TubePreProcessYPos.YServoShakePos);} public Integer getZMotorTakeTubePos(Boolean hightTuhe) { if (hightTuhe) { - return getParam(TubePreProcessZAxisPos.ZMotorTakeHTubePos); + return getParamInteger(TubePreProcessZAxisPos.ZMotorTakeHTubePos); } else { - return getParam(TubePreProcessZAxisPos.ZMotorTakeSTubePos); + return getParamInteger(TubePreProcessZAxisPos.ZMotorTakeSTubePos); } } - public Integer getZMotorShakeTubePos() {return getParam(TubePreProcessZAxisPos.ZMotorShakeTubePos);} + public Integer getZMotorShakeTubePos() {return getParamInteger(TubePreProcessZAxisPos.ZMotorShakeTubePos);} - public Integer getZMotorPutCapPos() {return getParam(TubePreProcessZAxisPos.ZMotorShakeTubePos) + getParam(TubePreProcessGripperPos.GripperRedundancyHeight);} + public Integer getZMotorPutCapPos() {return getParamInteger(TubePreProcessZAxisPos.ZMotorShakeTubePos) + getParamInteger(TubePreProcessGripperPos.GripperRedundancyHeight);} - public Integer getShakeClampMotorClampPos() {return getParam(TubePreProcessTubeClamp.ShakeClampMotorClampPos);} + public Integer getShakeClampMotorClampPos() {return getParamInteger(TubePreProcessTubeClamp.ShakeClampMotorClampPos);} - public Integer getShakeClampMotorReleasePos() {return getParam(TubePreProcessTubeClamp.ShakeClampMotorReleasePos);} + public Integer getShakeClampMotorReleasePos() {return getParamInteger(TubePreProcessTubeClamp.ShakeClampMotorReleasePos);} }