From f28c4b7a2f1fea4f6eae78d60b030e8ca1900b2f Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Sat, 27 Apr 2024 09:27:41 +0800
Subject: [PATCH] 1

---
 .../com/iflytop/digester/EmergencyStopThread.java  |  9 +++++
 .../com/iflytop/digester/StartResetTaskThread.java | 42 +++++++++++-----------
 .../underframework/connection/UfConnection.java    |  5 +++
 .../connection/UfModbusRTUOverTCP.java             |  5 +++
 .../connection/UfZcancmderWebsocket.java           |  5 +++
 5 files changed, 45 insertions(+), 21 deletions(-)
 create mode 100644 src/main/java/com/iflytop/digester/EmergencyStopThread.java

diff --git a/src/main/java/com/iflytop/digester/EmergencyStopThread.java b/src/main/java/com/iflytop/digester/EmergencyStopThread.java
new file mode 100644
index 0000000..3fdc515
--- /dev/null
+++ b/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 );
+    }
+}
diff --git a/src/main/java/com/iflytop/digester/StartResetTaskThread.java b/src/main/java/com/iflytop/digester/StartResetTaskThread.java
index a820985..0b2bd23 100644
--- a/src/main/java/com/iflytop/digester/StartResetTaskThread.java
+++ b/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");
diff --git a/src/main/java/com/iflytop/digester/underframework/connection/UfConnection.java b/src/main/java/com/iflytop/digester/underframework/connection/UfConnection.java
index decd671..912f5ec 100644
--- a/src/main/java/com/iflytop/digester/underframework/connection/UfConnection.java
+++ b/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();
 }
diff --git a/src/main/java/com/iflytop/digester/underframework/connection/UfModbusRTUOverTCP.java b/src/main/java/com/iflytop/digester/underframework/connection/UfModbusRTUOverTCP.java
index 5bd03f2..7f917f9 100644
--- a/src/main/java/com/iflytop/digester/underframework/connection/UfModbusRTUOverTCP.java
+++ b/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);
diff --git a/src/main/java/com/iflytop/digester/underframework/connection/UfZcancmderWebsocket.java b/src/main/java/com/iflytop/digester/underframework/connection/UfZcancmderWebsocket.java
index 490d8e7..684de69 100644
--- a/src/main/java/com/iflytop/digester/underframework/connection/UfZcancmderWebsocket.java
+++ b/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，测试一下会不会死掉