diff --git a/app.db b/app.db index 922b4dd..5007c8e 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 723e3f7..fffd692 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/resources/application-dev.yml b/src/main/resources/application-dev.yml index 8691ad6..ce1953a 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -12,19 +12,19 @@ device: connections: - name : zcancmder key : zcancmder - enable : true + enable : false type : ZcancmderWebsocket - uri: ws://192.168.8.10:19005 -# uri : ws://127.0.0.1:19005 +# uri: ws://192.168.8.10:19005 + uri : ws://127.0.0.1:19005 - name : modbus key : modbus - enable : true + enable : false type : ModbusRTUOverTCP host: 192.168.8.10 port: 20000 mqtt-broker: - uri: tcp://192.168.8.10:1883 + uri: tcp://broker.emqx.io:1883 username: admin password: public clientId: digester diff --git a/web b/web index 554d48a..0e26270 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 554d48a12c226f963de0f32b26d6823152d54546 +Subproject commit 0e2627076b17ed6becfda12905d31927e3840e0a