From d3553d8dd6fc00634ac32228e5b8e4d0624eda11 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 30 八月 2023 11:10:51 +0800
Subject: [PATCH] 调整Modbus配置-解决轴流风机与轴流窗不在同一个分机配置的问题
---
igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java | 42 +++++++-----------------------------------
1 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java
index 56a5d85..d4385be 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/protocol/modbus/ModbusUtil2.java
@@ -47,22 +47,22 @@
*/
public static ModbusMaster getMaster(String ip, int port) throws ModbusInitException, InterruptedException {
String key = ip;
- ModbusMaster modbusMaster = masterMap.get(key);
- if (modbusMaster == null || !modbusMaster.isConnected()) {
+// ModbusMaster modbusMaster = masterMap.get(key);
+// if (modbusMaster == null || !modbusMaster.isConnected()) {
IpParameters ipParameters = new IpParameters();
ipParameters.setHost(ip);
ipParameters.setPort(port);
- modbusMaster = modbusFactory.createTcpMaster(ipParameters, true);
+ ModbusMaster modbusMaster = modbusFactory.createTcpMaster(ipParameters, false);
modbusMaster.init();
//鍒濆鍖栦箣鍚庣瓑寰咃紝閬垮厤鍑虹幇杩炴帴鏈垱寤�
- Thread.sleep(2000);
+ Thread.sleep(2500);
- masterMap.put(key, modbusMaster);
+// masterMap.put(key, modbusMaster);
return modbusMaster;
- }
- return modbusMaster;
+// }
+// return modbusMaster;
}
@@ -164,34 +164,6 @@
WriteCoilResponse coilResponse = (WriteCoilResponse) getMaster(ip, port).send(coilRequest);
return !coilResponse.isException();
}
-
-
- /**
- * 鍐欑嚎鍦堝紑鍏崇姸鎬佹暟鎹� 0x05
- *
- * @param offset
- * @param status
- * @return
- * @throws ModbusTransportException
- * @throws ModbusInitException
-
- public static Boolean writeCoilStatus(String ip, int port, int offset, boolean status) throws ModbusTransportException, ModbusInitException, InterruptedException {
- // boolean coilValue = status;
- // WriteCoilRequest coilRequest = new WriteCoilRequest(slaveId, offset, coilValue);
- // WriteCoilResponse coilResponse = (WriteCoilResponse) getMaster(ip, port).send(coilRequest);
- // return !coilResponse.isException();
-
- WriteCoilRequest coilRequest = new WriteCoilRequest(slaveId, offset, status);
- // Thread.sleep(3000);
- WriteCoilResponse coilResponse = (WriteCoilResponse) getMaster(ip, port).send(coilRequest);
-
- //鍙戦�佹竻闄ゅ懡浠�
- WriteCoilRequest coilRequest1 = new WriteCoilRequest(slaveId, offset, !status);
- getMaster(ip, port).send(coilRequest1);
-
- return !coilResponse.isException();
- }
- */
/**
--
Gitblit v1.9.3