From cb3666255ee5315b31c87d2f73fd07ef51e0d339 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Wed, 17 Apr 2024 16:22:03 +0800
Subject: [PATCH] ~

---
 app.db                                             | Bin 331776 -> 331776 bytes
 .../com/iflytop/digester/StartResetTaskThread.java |  36 ++++++++++-----------
 src/main/resources/application-dev.yml             |   2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app.db b/app.db
index 0fd5b475987f677ca47f21f57b472f0dd607e624..56a68f0d9421073823b480197348d034cf783c30 100644
GIT binary patch
delta 149
zcmZozAkwfvWP&u~`-w8njPExlEIH52#<y}a`-Q*!%xwJJo7o@C%VIQ`zRZiU4oInb
zgQ+E8YP+%zBcmmwLAz=zBM>ufS8Zj!BPGet#o)tS#K3=@J&I)pOCJ9^RtNr8{uthZ
v?NSSv!+57ZU}IsKzAA`Og)wG&FB6OI_G4?A-5D8!+WFQqZ|7Uj@+koTBdjiv

delta 149
zcmZozAkwfvWP&u~%ZW11j4wAPEIH52&R4XV{lZ^<Amh<y_6PH_7!9W{^J1(6QmWoy
zY6+OyuI$6eXvt{UuG-27#7x^&Tbb`jN%9sj_%IhS@Ly+-Vwu5`$G?u%fxneMhTnL*
t)B@%(UKV~X2F>ZJmMkian$vrkSai1^Tg&Xu$f()Qx1M=B-+Go$2>>(1Egb*=

diff --git a/src/main/java/com/iflytop/digester/StartResetTaskThread.java b/src/main/java/com/iflytop/digester/StartResetTaskThread.java
index 9fe1b9f..6b98627 100644
--- a/src/main/java/com/iflytop/digester/StartResetTaskThread.java
+++ b/src/main/java/com/iflytop/digester/StartResetTaskThread.java
@@ -24,24 +24,24 @@ public class StartResetTaskThread extends Thread {
         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("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("设备初始化 : 完成");
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4004e56..57607cc 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -25,7 +25,7 @@ device:
       port: 20000
 
 mqtt-broker:
-  uri: mqtt://192.168.8.10:1883
+  uri: tcp://192.168.8.10:1883
   username: admin
   password: public
   clientId: digester