From 0cb523849fa0461f09353b062b70fb6fcf5e697b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 21 十一月 2023 14:10:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 91 ++++++++++++++++++++-------------------------
1 files changed, 41 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index b403e3e..ea7b1f4 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -22,6 +22,7 @@
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -37,6 +38,12 @@
private CrnSlave slave;
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
+ public static final List<Short> staNoOne = new ArrayList<Short>() {{
+ add((short) 2);add((short) 5);add((short) 8);add((short) 12);add((short) 16);add((short) 20);
+ }};
+ public static final List<Short> staNoTwo = new ArrayList<Short>() {{
+ add((short) 3);add((short) 6);add((short) 9);add((short) 13);add((short) 17);add((short) 21);
+ }};
public SiemensCrnThread(CrnSlave slave) {
this.slave = slave;
@@ -134,21 +141,33 @@
* 璇诲彇鐘舵��
*/
private void readStatus(){
- OperateResultExOne<byte[]> result = siemensNet.Read("DB11.2", (short) 104);
+
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
if (result.IsSuccess) {
if (null == crnProtocol) {
crnProtocol = new CrnProtocol();
}
- crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0)); // 2
- crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 2)); // 4
- crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 4)); // 6
- crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 6)); // 8
- crnProtocol.setValid(siemensNet.getByteTransform().TransInt16(result.Content, 8)); // 10
-
- crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 14)); // 16
- crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 16)); // 18
- crnProtocol.setRow(siemensNet.getByteTransform().TransInt16(result.Content, 18)); // 20
- crnProtocol.setLane(siemensNet.getByteTransform().TransInt16(result.Content, 20)); // 22
+ crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
+ crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
+ crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
+ 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().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));
// 寮傚父
crnProtocol.setAlarm1(0);
@@ -368,60 +387,32 @@
} else {
array[0] = 0;
}
+ array[1] = command.getSourcePosZ();
+ array[2] = command.getSourcePosY();
- if (command.getSourcePosZ()==(short)1 && command.getSourcePosY()==(short)1){
- array[1] = (short)0;
- array[2] = (short)0;
- }else if (command.getSourcePosZ()==(short)1 && command.getSourcePosY()==(short)41){
- array[1] = (short)0;
- array[2] = (short)42;
- }else {
- array[1] = command.getSourcePosZ();
- array[2] = command.getSourcePosY();
- }
- if (command.getSourcePosX()==(short)3){
+ if (staNoOne.contains(command.getSourcePosX())){
array[3] = (short)1;
- }else if (command.getSourcePosX()==(short)4){
+ }else if (staNoTwo.contains(command.getSourcePosX())){
array[3] = (short)2;
}else {
array[3] = command.getSourcePosX();
}
+ array[4] = command.getDestinationPosZ();
+ array[5] = command.getDestinationPosY();
- if (command.getDestinationPosZ()==(short)1 && command.getDestinationPosY()==(short)1){
- array[4] = (short)0;
- array[5] = (short)0;
- }else if (command.getDestinationPosZ()==(short)1 && command.getDestinationPosY()==(short)41){
- array[4] = (short)0;
- array[5] = (short)42;
- }else {
- array[4] = command.getDestinationPosZ();
- array[5] = command.getDestinationPosY();
- }
-
- if (command.getDestinationPosX()==(short)3){
+ if (staNoOne.contains(command.getDestinationPosX())){
array[6] = (short)1;
- }else if (command.getDestinationPosX()==(short)4){
+ }else if (staNoTwo.contains(command.getDestinationPosX())){
array[6] = (short)2;
}else {
array[6] = command.getDestinationPosX();
}
- if ((array[1]==(short)0 && array[2] == (short)0) || (array[1]==(short)0 && array[2] == (short)42)){
- array[7]=(short)1;
- }else {
- array[7]=(short)0;
- }
-// array[7] = command.getSourceStaNo();
-
- if ((array[4]==(short)0 && array[5] == (short)0) || (array[4]==(short)0 && array[5] == (short)42)){
- array[8]=(short)1;
- }else {
- array[8]=(short)0;
- }
-// array[8] = command.getDestinationStaNo();
+ array[7] = command.getSourceStaNo();
+ array[8] = command.getDestinationStaNo();
// 浣滀笟淇℃伅
- OperateResult result = siemensNet.Write("DB10.0", array);
+ OperateResult result = siemensNet.Write("DB100.0", array);
// 浠诲姟鍙� + 瀹屾垚浣�
short[] array2 = new short[2];
array2[0] = command.getTaskNo();
--
Gitblit v1.9.1