From 576d8ed097f702af28550bbdba5dd02ecd06148f Mon Sep 17 00:00:00 2001 From: sige Date: Wed, 20 Mar 2024 11:34:24 +0800 Subject: [PATCH] ~~ --- .../my/graphiteDigesterBg/diframe/actuator/DiActCameraBasler.java | 7 ++++++- .../diframe/actuator/impl/DiActHeaterTokyGteModbusRtuOverTcp.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/src/main/java/com/my/graphiteDigesterBg/diframe/actuator/DiActCameraBasler.java b/src/src/main/java/com/my/graphiteDigesterBg/diframe/actuator/DiActCameraBasler.java index 31cab4d..d43ba01 100644 --- a/src/src/main/java/com/my/graphiteDigesterBg/diframe/actuator/DiActCameraBasler.java +++ b/src/src/main/java/com/my/graphiteDigesterBg/diframe/actuator/DiActCameraBasler.java @@ -12,7 +12,7 @@ public class DiActCameraBasler extends DiActuatorBase { // channel protected Integer channel; // camera handle - private long cam = 0; + private long cam = -1; // get pylon private DiComBaslerCamera getPylon() { @@ -35,6 +35,10 @@ public class DiActCameraBasler extends DiActuatorBase { @Override protected void onEnable() { + if ( -1 != this.cam ) { + return ; + } + var pylon = this.getPylon(); int count = pylon.enumerateDevices(); if ( this.index >= count ) { @@ -64,6 +68,7 @@ public class DiActCameraBasler extends DiActuatorBase { protected void onDisable() { var pylon = this.getPylon(); pylon.deviceClose(this.cam); + this.cam = -1; // pylon.destroyDevice(this.cam); } diff --git a/src/src/main/java/com/my/graphiteDigesterBg/diframe/actuator/impl/DiActHeaterTokyGteModbusRtuOverTcp.java b/src/src/main/java/com/my/graphiteDigesterBg/diframe/actuator/impl/DiActHeaterTokyGteModbusRtuOverTcp.java index c3d4acb..288b6f3 100644 --- a/src/src/main/java/com/my/graphiteDigesterBg/diframe/actuator/impl/DiActHeaterTokyGteModbusRtuOverTcp.java +++ b/src/src/main/java/com/my/graphiteDigesterBg/diframe/actuator/impl/DiActHeaterTokyGteModbusRtuOverTcp.java @@ -139,7 +139,7 @@ public class DiActHeaterTokyGteModbusRtuOverTcp extends DiActuatorBase implement if (!response.isEmpty()) { temperature = response.get(3) << 8 | response.get(4); } - LOG.info("[Actuator {}({})] {} get temperature : {}", this.key, this.type, this.name, temperature); +// LOG.info("[Actuator {}({})] {} get temperature : {}", this.key, this.type, this.name, temperature); return temperature; }