diff --git a/src/main/java/iflytop/app/config/A8kSubModuleInitRegConfig.java b/src/main/java/iflytop/app/config/A8kSubModuleInitRegConfig.java index 7352c68..1df5d9b 100644 --- a/src/main/java/iflytop/app/config/A8kSubModuleInitRegConfig.java +++ b/src/main/java/iflytop/app/config/A8kSubModuleInitRegConfig.java @@ -139,6 +139,12 @@ public class A8kSubModuleInitRegConfig { addRegMarker(ModuleType.LiquidDistributionArm, RegIndex.kreg_liquid_distribution_arm_pos16_d0); addRegMarker(ModuleType.LiquidDistributionArm, RegIndex.kreg_liquid_distribution_arm_pos16_d1); + + addRegMarker(ModuleType.LeiSaiServo, RegIndex.kreg_leisai_servo_default_velocity); + addRegMarker(ModuleType.LeiSaiServo, RegIndex.kreg_leisai_servo_low_velocity); + addRegMarker(ModuleType.LeiSaiServo, RegIndex.kreg_leisai_servo_mid_velocity); + addRegMarker(ModuleType.LeiSaiServo, RegIndex.kreg_leisai_servo_high_velocity); + } private void addRegMarker(ModuleType moduleTYpe, RegIndex regIndex) { 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/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;