From d63adcb214c6bc2a72c5b5bb7bd30abc391138dd Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 03 十月 2025 15:31:37 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 53 +++++++++++++++-----------
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 9 ----
2 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index a3ac6cb..cbf5498 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -88,7 +88,6 @@
* 1 = 涓婂畾浣�
*/
public Short liftPos;
- public Short liftPosTwo;
public CrnLiftPosType liftPosType;
public CrnLiftPosType liftPosTypeTwo;
@@ -240,15 +239,7 @@
this.liftPos = CrnLiftPosType.get(type).id.shortValue();
}
- public void setLiftPosTwo(Short liftPosTwo) {
- this.liftPosTwo = liftPosTwo;
- this.liftPosTypeTwo = CrnLiftPosType.get(liftPosTwo);
- }
- public void setLiftPosTwo(CrnLiftPosType typeTwo) {
- this.liftPosTypeTwo = typeTwo;
- this.liftPosTwo = CrnLiftPosType.get(typeTwo).id.shortValue();
- }
public void setStatus(Short status){
this.status = status;
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index b1995c0..4a93d3b 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -193,27 +193,34 @@
crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
- crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
- crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
- crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
- crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
- 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, 28));
- crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
- crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
- crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
- crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
- crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
- crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
+ crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 26));
+ crnProtocol.setWalkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 28));
+ crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 30));
+
+ crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 12));
+ 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));
//2宸ヤ綅
- crnProtocol.setTaskNoTwo(siemensNet.getByteTransform().TransInt16(result.Content, 56));
- crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 58));
- crnProtocol.setLiftPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 60));
- crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 64));
+ crnProtocol.setTaskNoTwo(siemensNet.getByteTransform().TransInt16(result.Content, 14));
+ crnProtocol.setStatusTwo(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+ crnProtocol.setBayTwo(siemensNet.getByteTransform().TransInt16(result.Content, 18));
+ crnProtocol.setLevelTwo(siemensNet.getByteTransform().TransInt16(result.Content, 20));
+ crnProtocol.setForkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 22));
+ crnProtocol.setLoadedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 24));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
@@ -327,7 +334,7 @@
// convertRow(command);
command.setCrnNo(slave.getId());
// short[] array = new short[10];
- short[] array = new short[10];
+ short[] array = new short[9];
array[0] = command.getAckFinish(); // 浠诲姟瀹屾垚纭浣�
array[1] = command.getTaskNo(); // 浠诲姟鍙�
array[2] = command.getTaskMode(); // 妯″紡
@@ -337,7 +344,6 @@
array[6] = command.getDestinationPosX(); // 鐩爣浣嶇疆鎺掑彿
array[7] = command.getDestinationPosY(); // 鐩爣浣嶇疆鍒楀彿
array[8] = command.getDestinationPosZ(); // 鐩爣浣嶇疆灞傚彿
- array[9] = command.getCommand();
// array[10] = 0; //澶囩敤1
@@ -354,6 +360,7 @@
// if (!resetFlag){
News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command), writeCount1);
result = siemensNet.Write("DB100.0", array);
+
// }
Thread.sleep(100);
writeCount1++;
@@ -491,7 +498,7 @@
}
// 鍚戝爢鍨涙満鍙戜换鍔″墠鐨勫爢鍨涙満鐘舵��
try {
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 18);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.20", (short) 18);
if (resultRead.IsSuccess) {
CrnCommand one = new CrnCommand();
one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
@@ -549,7 +556,7 @@
writeCount1++;
continue;
}
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 18);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.20", (short) 18);
if (resultRead.IsSuccess) {
CrnCommand one = new CrnCommand();
one.setAckFinish(siemensNet.getByteTransform().TransInt16(resultRead.Content, 0));
--
Gitblit v1.9.1