From ffc3b1151655f258fb1db0b24c3434bd294b0598 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 05 十月 2025 10:35:32 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 4a93d3b..8f4ef1f 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -147,13 +147,13 @@
crnProtocol.setWalkPos((short) 0);
crnProtocol.setLoaded((short) 0);
crnProtocol.setAlarm((short) 0);
- crnProtocol.setxSpeed((short) 0);
- crnProtocol.setySpeed((short) 0);
- crnProtocol.setzSpeed((short) 0);
- crnProtocol.setxDistance((short) 0);
- crnProtocol.setyDistance((short) 0);
- crnProtocol.setxDuration((short) 0);
- crnProtocol.setyDuration((short) 0);
+ crnProtocol.setxSpeed((float) 0);
+ crnProtocol.setySpeed((float) 0);
+ crnProtocol.setzSpeed((float) 0);
+ crnProtocol.setxDistance((float) 0);
+ crnProtocol.setyDistance((float) 0);
+ crnProtocol.setxDuration((float) 0);
+ crnProtocol.setyDuration((float) 0);
}
@Override
@@ -181,7 +181,7 @@
*/
private void readStatus() {
try {
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 66);
if (result.IsSuccess) {
if (null == crnProtocol) {
crnProtocol = new CrnProtocol();
@@ -201,18 +201,17 @@
crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 32));
-
//crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
//crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
//crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
//crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
- crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 34));
- crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 38));
- crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 42));
- crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 46));
- crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 50));
- crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 54));
- crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 58));
+ crnProtocol.setxSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 34));
+ crnProtocol.setySpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 38));
+ crnProtocol.setzSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 42));
+ crnProtocol.setxDistance((float) siemensNet.getByteTransform().TransInt16(result.Content, 50) / 10000);
+ crnProtocol.setyDistance((float) siemensNet.getByteTransform().TransInt16(result.Content, 54) / 10000);
+ crnProtocol.setxDuration((float) siemensNet.getByteTransform().TransInt16(result.Content, 58) / 10000);
+ crnProtocol.setyDuration((float) siemensNet.getByteTransform().TransInt16(result.Content, 62) / 10000);
//2宸ヤ綅
crnProtocol.setTaskNoTwo(siemensNet.getByteTransform().TransInt16(result.Content, 14));
@@ -227,7 +226,7 @@
// 澶嶄綅淇″彿
if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
- News.error("---绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙颁俊鍙�:{}]==>> 鐘舵�佷负10锛岀瓑寰呯‘璁わ紒锛�",
+ News.error("---绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙�1淇″彿:{}]==>> 鐘舵�佷负10锛岀瓑寰呯‘璁わ紒锛�",
slave.getId(), crnProtocol.getTaskNo(), crnProtocol.getLoaded() == 1 ? "鏈夌墿" : "鏃犵墿");
if (resetFlag) {
if (crnProtocol.getTaskNo() == 9999) {
@@ -238,7 +237,7 @@
crnCommand.setAckFinish((short) 1);
if (write(crnCommand)) {
resetFlag = false;
- News.error("---绗簩姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}]==>> 澶嶄綅resetFlag鏍囪鎴愬姛{}锛侊紒",
+ News.error("---绗簩姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}]==>> 宸ヤ綅1澶嶄綅resetFlag鏍囪鎴愬姛{}锛侊紒",
slave.getId(), wrkNo, resetFlag);
}
}
@@ -246,7 +245,7 @@
// 澶嶄綅淇″彿
if (!Cools.isEmpty(crnProtocol.getStatusType()) && crnProtocol.getStatusTypeTwo().equals(CrnStatusType.WAITING)) {
- News.error("---绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙颁俊鍙�:{}]==>> 鐘舵�佷负10锛岀瓑寰呯‘璁わ紒锛�",
+ News.error("---绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}, 杞借揣鍙�2淇″彿:{}]==>> 鐘舵�佷负10锛岀瓑寰呯‘璁わ紒锛�",
slave.getId(), crnProtocol.getTaskNo(), crnProtocol.getLoaded() == 1 ? "鏈夌墿" : "鏃犵墿");
if (resetFlagTwo) {
if (crnProtocol.getTaskNo() == 9999) {
@@ -257,7 +256,7 @@
crnCommand.setAckFinish((short) 1);
if (write2(crnCommand)) {
resetFlagTwo = false;
- News.error("---绗簩姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}]==>> 澶嶄綅resetFlag鏍囪鎴愬姛{}锛侊紒",
+ News.error("---绗簩姝ャ�乕鍫嗗灈鏈哄彿锛歿}, 宸ヤ綔鍙凤細{}]==>> 宸ヤ綅2澶嶄綅resetFlag鏍囪鎴愬姛{}锛侊紒",
slave.getId(), wrkNo, resetFlag);
}
}
@@ -498,7 +497,7 @@
}
// 鍚戝爢鍨涙満鍙戜换鍔″墠鐨勫爢鍨涙満鐘舵��
try {
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.20", (short) 18);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.20", (short) 20);
if (resultRead.IsSuccess) {
CrnCommand one = new CrnCommand();
one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
@@ -556,7 +555,7 @@
writeCount1++;
continue;
}
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.20", (short) 18);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 36);
if (resultRead.IsSuccess) {
CrnCommand one = new CrnCommand();
one.setAckFinish(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
@@ -601,7 +600,7 @@
}
}
} catch (Exception e) {
- News.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�,寮傚父锛�" + e);
+ News.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲嚭閿�2,寮傚父锛�" + e);
}
writeCount1++;
} while (writeCount1 < 6);
--
Gitblit v1.9.1