sige 1 year ago
parent
commit
f28c4b7a2f
  1. 9
      src/main/java/com/iflytop/digester/EmergencyStopThread.java
  2. 42
      src/main/java/com/iflytop/digester/StartResetTaskThread.java
  3. 5
      src/main/java/com/iflytop/digester/underframework/connection/UfConnection.java
  4. 5
      src/main/java/com/iflytop/digester/underframework/connection/UfModbusRTUOverTCP.java
  5. 5
      src/main/java/com/iflytop/digester/underframework/connection/UfZcancmderWebsocket.java

9
src/main/java/com/iflytop/digester/EmergencyStopThread.java

@ -0,0 +1,9 @@
package com.iflytop.digester;
public class EmergencyStopThread extends Thread {
@Override
public void run() {
do {
// check file
} while ( true );
}
}

42
src/main/java/com/iflytop/digester/StartResetTaskThread.java

@ -23,27 +23,27 @@ public class StartResetTaskThread extends Thread {
var device = Device.getInstance();
device.setStatus("preparing");
this.setProgressMessage("设备初始化...");
//
// UfCmdSnippetExecutor.execute("StartResetInitDevices");
// // 加热盘初始化
// UfCmdSnippetExecutor.execute("StartResetInitHeatingPlateMotor");
// // 加液盘初始化
// UfCmdSnippetExecutor.execute("StartResetInitLiquidPlateMotor");
// // 加热位密封盖初始化
// this.setupHeatingSlotCover();
// // 蠕动泵初始化
// this.setupPeristalticPump();
// if ( this.isErrorTubeRackRequired ) {
// this.setupErrorTubeRack();
// }
//
// this.setProgressMessage("设备初始化 : 相机");
// device.camera.enable();
//
// this.setProgressMessage("设备初始化 : 定时刷新加热盘温度");
// device.heatingTurntable.temperatureMonitorStart();
// UfCmdSnippetExecutor.execute("StatusLampRunning");
UfCmdSnippetExecutor.execute("StartResetInitDevices");
// 加热盘初始化
UfCmdSnippetExecutor.execute("StartResetInitHeatingPlateMotor");
// 加液盘初始化
UfCmdSnippetExecutor.execute("StartResetInitLiquidPlateMotor");
// 加热位密封盖初始化
this.setupHeatingSlotCover();
// 蠕动泵初始化
this.setupPeristalticPump();
if ( this.isErrorTubeRackRequired ) {
this.setupErrorTubeRack();
}
this.setProgressMessage("设备初始化 : 相机");
device.camera.enable();
this.setProgressMessage("设备初始化 : 定时刷新加热盘温度");
device.heatingTurntable.temperatureMonitorStart();
UfCmdSnippetExecutor.execute("StatusLampRunning");
this.setProgressMessage("设备初始化 : 完成");
device.setStatus("ready");
UfMdbRuntimeVariable.setString("设备已就绪","device.message");

5
src/main/java/com/iflytop/digester/underframework/connection/UfConnection.java

@ -25,4 +25,9 @@ public interface UfConnection {
* @return true if enable
*/
Boolean getIsEnabled();
/**
* stop connection
*/
void stop();
}

5
src/main/java/com/iflytop/digester/underframework/connection/UfModbusRTUOverTCP.java

@ -35,6 +35,11 @@ public class UfModbusRTUOverTCP extends UfConnectionBase {
}
@Override
public void stop() {
}
@Override
synchronized public String execute(UfMdbActuatorCmd command) {
if ( "03".equals(command.cmdId) ) {
Integer slaveId = Integer.parseInt(command.cmdFlags);

5
src/main/java/com/iflytop/digester/underframework/connection/UfZcancmderWebsocket.java

@ -67,6 +67,11 @@ public class UfZcancmderWebsocket extends UfConnectionBase {
}
@Override
public void stop() {
}
@Override
synchronized public String execute(UfMdbActuatorCmd command) {
UfCommon.delay(20); // 先延时个20ms测试一下会不会死掉

Loading…
Cancel
Save