|
@ -37,7 +37,7 @@ public class MatrixSprayChangeParam extends BaseCommandHandler { |
|
|
Double highVoltageValue = form.getDoubleParam("highVoltageValue"); |
|
|
Double highVoltageValue = form.getDoubleParam("highVoltageValue"); |
|
|
Double movingSpeed = form.getDoubleParam("movingSpeed"); |
|
|
Double movingSpeed = form.getDoubleParam("movingSpeed"); |
|
|
sprayTask.setChangeSprayParam(motorZHeight, gasPressure, volume, highVoltage, highVoltageValue, movingSpeed); |
|
|
sprayTask.setChangeSprayParam(motorZHeight, gasPressure, volume, highVoltage, highVoltageValue, movingSpeed); |
|
|
if (!sprayTask.isPaused()) { |
|
|
|
|
|
|
|
|
|
|
|
//1.速度 |
|
|
//1.速度 |
|
|
DeviceCommand motorXSpeedSetCmdToDeviceCommand = DeviceCommandGenerator.motorXSpeedSet(movingSpeed);//x轴电机速度设置 |
|
|
DeviceCommand motorXSpeedSetCmdToDeviceCommand = DeviceCommandGenerator.motorXSpeedSet(movingSpeed);//x轴电机速度设置 |
|
|
DeviceCommand motorYSpeedSetCmdToDeviceCommand = DeviceCommandGenerator.motorYSpeedSet(movingSpeed);//y轴电机速度设置 |
|
|
DeviceCommand motorYSpeedSetCmdToDeviceCommand = DeviceCommandGenerator.motorYSpeedSet(movingSpeed);//y轴电机速度设置 |
|
@ -55,6 +55,7 @@ public class MatrixSprayChangeParam extends BaseCommandHandler { |
|
|
DeviceCommand smotorZPositionSetCommand = DeviceCommandGenerator.motorZPositionSet(height);//移动z轴到指定位置 |
|
|
DeviceCommand smotorZPositionSetCommand = DeviceCommandGenerator.motorZPositionSet(height);//移动z轴到指定位置 |
|
|
CommandFuture smotorZPositionSetCommandFuture = deviceCommandService.sendCommand(smotorZPositionSetCommand, form, emitter); |
|
|
CommandFuture smotorZPositionSetCommandFuture = deviceCommandService.sendCommand(smotorZPositionSetCommand, form, emitter); |
|
|
commandWait(smotorZPositionSetCommandFuture); |
|
|
commandWait(smotorZPositionSetCommandFuture); |
|
|
|
|
|
if (!sprayTask.isPaused()) { |
|
|
//4.是否打开高压 |
|
|
//4.是否打开高压 |
|
|
if (highVoltage) {//打开高压 |
|
|
if (highVoltage) {//打开高压 |
|
|
DeviceCommand highVoltageOpenCommand = DeviceCommandGenerator.highVoltageOpen(highVoltageValue);//开启高压 |
|
|
DeviceCommand highVoltageOpenCommand = DeviceCommandGenerator.highVoltageOpen(highVoltageValue);//开启高压 |
|
|