diff --git a/src/main/java/iflytop/app/hardware/type/LeisaiServoMId.java b/src/main/java/iflytop/app/hardware/type/LeisaiServoMId.java index 83d724b..1b5d710 100644 --- a/src/main/java/iflytop/app/hardware/type/LeisaiServoMId.java +++ b/src/main/java/iflytop/app/hardware/type/LeisaiServoMId.java @@ -3,8 +3,8 @@ package iflytop.app.hardware.type; import org.springframework.util.Assert; public enum LeisaiServoMId { - HBotXLeisaiSV(MId.MainXSV), - HBotYLeisaiSV(MId.MainYSV), + MainXSV(MId.MainXSV), + MainYSV(MId.MainYSV), ; final public MId mid; diff --git a/src/main/java/iflytop/app/hardware/type/StepMotorMId.java b/src/main/java/iflytop/app/hardware/type/StepMotorMId.java index e9b242b..c5755b6 100644 --- a/src/main/java/iflytop/app/hardware/type/StepMotorMId.java +++ b/src/main/java/iflytop/app/hardware/type/StepMotorMId.java @@ -19,10 +19,10 @@ public enum StepMotorMId { AcidPump2M(MId.AcidPump2M), AcidPump3M(MId.AcidPump3M), AcidPump4M(MId.AcidPump4M), -// AcidPump5M(MId.AcidPump5M), + AcidPump5M(MId.AcidPump5M), AcidPump6M(MId.AcidPump6M), -// AcidPump7M(MId.AcidPump7M), -// AcidPump8M(MId.AcidPump8M), + AcidPump7M(MId.AcidPump7M), + AcidPump8M(MId.AcidPump8M), ; final public MId mid; diff --git a/src/main/java/iflytop/app/page/LeisaiServoPage.java b/src/main/java/iflytop/app/page/LeisaiServoPage.java index 02bbb95..87ba196 100644 --- a/src/main/java/iflytop/app/page/LeisaiServoPage.java +++ b/src/main/java/iflytop/app/page/LeisaiServoPage.java @@ -5,7 +5,6 @@ import iflytop.app.hardware.driver.LeisaiServoDriver; import iflytop.app.hardware.type.LeisaiRegIndex; import iflytop.app.hardware.type.LeisaiServoMId; import iflytop.app.hardware.type.LeisaiServoSpeedLevel; -import iflytop.app.hardware.type.MiniServoRegIndex; import iflytop.app.type.exception.HardwareException; import iflytop.app.utils.ZJsonNode; import iflytop.extui.mgr.ExtApiPageMgr; @@ -24,7 +23,7 @@ public class LeisaiServoPage { @Resource private ExtApiPageMgr extApiPageMgr; - private LeisaiServoMId id = LeisaiServoMId.HBotXLeisaiSV; + private LeisaiServoMId id = LeisaiServoMId.MainXSV; private Integer dpos = 10; private LeisaiServoSpeedLevel speedLevel = LeisaiServoSpeedLevel.DEFAULT;