From 67a8ef2767b1980487091e1bfcd3bd17502140e6 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 21 十一月 2023 14:30:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index ea7b1f4..63f6e5a 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -38,12 +38,19 @@
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> rowOne = new ArrayList<Short>() {{
+ add((short) 1);add((short) 5);add((short) 7);add((short) 11);add((short) 15);add((short) 19);
}};
- 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 static final List<Short> rowTwo = new ArrayList<Short>() {{
+ add((short) 2);add((short) 6);add((short) 8);add((short) 12);add((short) 16);add((short) 20);
}};
+ public static final List<Short> rowThree = new ArrayList<Short>() {{
+ add((short) 3);add((short) 9);add((short) 13);add((short) 17);add((short) 21);
+ }};
+ public static final List<Short> rowFour = new ArrayList<Short>() {{
+ add((short) 4);add((short) 10);add((short) 14);add((short) 18);
+ }};
+
public SiemensCrnThread(CrnSlave slave) {
this.slave = slave;
@@ -391,20 +398,28 @@
array[2] = command.getSourcePosY();
- if (staNoOne.contains(command.getSourcePosX())){
+ if (rowOne.contains(command.getSourcePosX())){
array[3] = (short)1;
- }else if (staNoTwo.contains(command.getSourcePosX())){
+ }else if (rowTwo.contains(command.getSourcePosX())){
array[3] = (short)2;
+ }else if (rowThree.contains(command.getSourcePosX())){
+ array[3] = (short)3;
+ }else if (rowFour.contains(command.getSourcePosX())){
+ array[3] = (short)4;
}else {
array[3] = command.getSourcePosX();
}
array[4] = command.getDestinationPosZ();
array[5] = command.getDestinationPosY();
- if (staNoOne.contains(command.getDestinationPosX())){
+ if (rowOne.contains(command.getDestinationPosX())){
array[6] = (short)1;
- }else if (staNoTwo.contains(command.getDestinationPosX())){
+ }else if (rowTwo.contains(command.getDestinationPosX())){
array[6] = (short)2;
+ }else if (rowThree.contains(command.getDestinationPosX())){
+ array[6] = (short)3;
+ }else if (rowFour.contains(command.getDestinationPosX())){
+ array[6] = (short)4;
}else {
array[6] = command.getDestinationPosX();
}
--
Gitblit v1.9.1