From baae63a330467be864de7d156bc189e84ae996b6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 15 八月 2020 16:50:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/CrnThread.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 4839c5b..eaa6b3f 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -4,8 +4,10 @@
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
+import com.alibaba.fastjson.JSON;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
+import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.Task;
@@ -28,12 +30,12 @@
public CrnThread(CrnSlave slave) {
this.slave = slave;
- this.connect();
}
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
+ this.connect();
while (true) {
try {
int step = 1;
@@ -50,15 +52,28 @@
case 2:
write((CrnCommand) task.getData());
break;
- case 3:
- break;
// 澶嶄綅
- case 4:
+ case 3:
+ CrnCommand command = (CrnCommand) task.getData();
+ if (null == command) {
+ command = new CrnCommand();
+ }
+ command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
+ command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
+ command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
+ command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
+ command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
+ write(command);
break;
default:
break;
}
- Thread.sleep(3000);
+ Thread.sleep(500);
} catch (Exception e) {
e.printStackTrace();
}
@@ -100,7 +115,7 @@
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.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+// 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));
@@ -146,7 +161,7 @@
@Override
public void close() {
-
+ siemensNet.ConnectClose();
}
public CrnProtocol getCrnProtocol(){
@@ -155,4 +170,33 @@
}
return this.crnProtocol;
}
+
+
+ /******************************************************************************************/
+ /**************************************** 娴嬭瘯涓撶敤 *****************************************/
+ /*****************************************************************************************/
+ public static void main(String[] args) {
+ CrnSlave slave = new CrnSlave();
+ slave.setIp("192.168.2.9");
+ slave.setRack(1);
+ slave.setSlot(0);
+ CrnThread crnThread = new CrnThread(slave);
+ crnThread.readStatus();
+ System.out.println(JSON.toJSONString(crnThread.crnProtocol));
+// // 鍐�
+// CrnCommand command = new CrnCommand();
+// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+// command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+// command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
+// command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
+// command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
+// command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
+// crnThread.write(command);
+
+ }
+
}
--
Gitblit v1.9.1