diff --git a/app.db b/app.db index 0fd5b47..56a68f0 100644 Binary files a/app.db and b/app.db differ 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