diff --git a/src/main/java/com/iflytop/colortitration/app/core/command/DeviceCommandGenerator.java b/src/main/java/com/iflytop/colortitration/app/core/command/DeviceCommandGenerator.java index de87724..8959f4b 100644 --- a/src/main/java/com/iflytop/colortitration/app/core/command/DeviceCommandGenerator.java +++ b/src/main/java/com/iflytop/colortitration/app/core/command/DeviceCommandGenerator.java @@ -43,7 +43,7 @@ public class DeviceCommandGenerator { * 蜂鸣器关闭 */ public static DeviceCommand beepClose() { - return controlCmd(Device.MAGNET, Action.CLOSE, null); + return controlCmd(Device.BEEP, Action.CLOSE, null); } // =========================================== 磁子开关 ==================================================== @@ -58,15 +58,15 @@ public class DeviceCommandGenerator { * 电磁关闭 */ public static DeviceCommand magnetClose() { - return controlCmd(Device.BEEP, Action.CLOSE, null); + return controlCmd(Device.MAGNET, Action.CLOSE, null); } // =========================================== 加热棒 ==================================================== /** - * 加热棒 1 获取参数 todo controlCmd->getInfoCmd + * 加热棒 1 获取温度 */ public static DeviceCommand heatRod1Get() { - return controlCmd(Device.HEAT_ROD_1, Action.GET, null); + return getInfoCmd(Device.HEAT_ROD_1); } /** @@ -84,10 +84,10 @@ public class DeviceCommandGenerator { } /** - * 加热棒 2 获取参数 + * 加热棒 2 获取温度 */ public static DeviceCommand heatRod2Get() { - return controlCmd(Device.HEAT_ROD_2, Action.GET, null); + return getInfoCmd(Device.HEAT_ROD_2); } /** @@ -352,7 +352,7 @@ public class DeviceCommandGenerator { } /** - * 陶瓷泵 3 设置速度 + * 无刷泵 3 设置速度 */ public static DeviceCommand brushlessPump3SetSpeed(double speed) { DeviceCommandParams params = new DeviceCommandParams();