From ae71b59d481be89095b4035307b5c679c1832fe0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 18 八月 2020 10:07:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/CrnThread.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 915c442..c16717e 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -67,7 +67,7 @@
command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo((short) 0); // 宸ヤ綔鍙�
command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
- command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
@@ -110,7 +110,7 @@
* 璇诲彇鐘舵��
*/
private void readStatus(){
- OperateResultExOne<byte[]> result = siemensNet.Read("DB8.18", (short) 46);
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB8.18", (short) 56);
if (result.IsSuccess) {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
if (null == crnProtocol) {
@@ -127,16 +127,17 @@
// crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 18));
crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
- crnProtocol.setError1(siemensNet.getByteTransform().TransInt16(result.Content, 22));
- crnProtocol.setError2(siemensNet.getByteTransform().TransInt16(result.Content, 24));
+ // 寮傚父淇℃伅
+ crnProtocol.setError1(siemensNet.getByteTransform().TransBool(result.Content, 22, 2));
+ crnProtocol.setError2(siemensNet.getByteTransform().TransBool(result.Content, 24, 2));
crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 26));
- crnProtocol.setXSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
- crnProtocol.setYSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 30));
- crnProtocol.setZSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
- crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 34));
- crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 38));
- crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 42));
- crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 46));
+ crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
+ crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
+ crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
+ crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
+ crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
+ crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
+ crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
--
Gitblit v1.9.1