diff --git a/appresource/db/app.db b/appresource/db/app.db index 83ba50b..fbfd577 100644 Binary files a/appresource/db/app.db and b/appresource/db/app.db differ diff --git a/src/main/java/a8k/hardware/type/a8kcanprotocol/A8kEcode.java b/src/main/java/a8k/hardware/type/a8kcanprotocol/A8kEcode.java index ca0844f..c000dfa 100644 --- a/src/main/java/a8k/hardware/type/a8kcanprotocol/A8kEcode.java +++ b/src/main/java/a8k/hardware/type/a8kcanprotocol/A8kEcode.java @@ -1,5 +1,7 @@ package a8k.hardware.type.a8kcanprotocol; +import lombok.extern.slf4j.Slf4j; + /** * 错误分类 * 10, @@ -10,6 +12,7 @@ package a8k.hardware.type.a8kcanprotocol; * * */ +@Slf4j public enum A8kEcode { SUC(0), @@ -182,6 +185,7 @@ public enum A8kEcode { return e; } } + log.error("未知错误码:{}", index); A8kEcode.LOW_EXT_ERROR_UNKOWN_INDEX_ERROR.rawindex = index; return A8kEcode.LOW_EXT_ERROR_UNKOWN_INDEX_ERROR; } diff --git a/src/main/java/a8k/service/verification/PipetteGunVerificationV2.java b/src/main/java/a8k/service/verification/PipetteGunVerificationV2.java index 1de8b0a..1b657b5 100644 --- a/src/main/java/a8k/service/verification/PipetteGunVerificationV2.java +++ b/src/main/java/a8k/service/verification/PipetteGunVerificationV2.java @@ -144,9 +144,9 @@ public class PipetteGunVerificationV2 { pipetteCtrlDriver.liquidOperationClearParams(); // pipetteCtrlDriver.liquidOperationSetGunRunParams(14, 14, 0, 900, 30); //pump param - pipetteCtrlDriver.liquidOperationSetZMotorRunParams(0, 300, 30); // z motor param + pipetteCtrlDriver.liquidOperationSetZMotorRunParams(0, 500, 60); // z motor param pipetteCtrlDriver.liquidOperationFreshParams(); - pipetteCtrlDriver.pipetteLld(LldType.kplld, 0, 15); + pipetteCtrlDriver.pipetteLld(LldType.kplld, 0, 18); if (pipetteCtrlDriver.lldIsDetectLiquid()) { liquidPos = pipetteCtrlDriver.getReg(PipetteRegIndex.kreg_pipette_zm_pos); diff --git a/src/main/java/a8k/type/ecode/AECodeError.java b/src/main/java/a8k/type/ecode/AECodeError.java index 7bc8225..54a4b79 100644 --- a/src/main/java/a8k/type/ecode/AECodeError.java +++ b/src/main/java/a8k/type/ecode/AECodeError.java @@ -3,10 +3,11 @@ package a8k.type.ecode; import a8k.hardware.type.a8kcanprotocol.A8kEcode; import a8k.type.exception.AppException; import a8k.utils.ZJsonHelper; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; public class AECodeError extends AppError { - @Schema(description = "异常栈信息") + @JsonIgnore public StackTraceElement[] stackTraceElements; public AECodeError(String exmsg) {