From 559c77882acf51920ec1e3acd2848df7cf75f71c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 11 八月 2020 11:03:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/CrnThread.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 1b5c240..4b2442a 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -8,6 +8,7 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.Task;
+import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.CrnProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -44,9 +45,11 @@
readStatus(); // 璇诲彇鐘舵��
break;
case 2:
+ CrnCommand command = (CrnCommand) task.getData();
break;
case 3:
break;
+ // 澶嶄綅
case 4:
break;
default:
@@ -82,24 +85,31 @@
*/
private void readStatus(){
CrnProtocol protocol = new CrnProtocol();
- protocol.mode = siemensNet.ReadInt16("D2231").Content;
- protocol.eStop = siemensNet.ReadInt16("D2232").Content;
- protocol.taskNo = siemensNet.ReadInt16("D2233").Content;
- protocol.status = siemensNet.ReadInt16("D2234").Content;
- protocol.bay = siemensNet.ReadInt16("D2235").Content;
- protocol.level = siemensNet.ReadInt16("D2236").Content;
- protocol.forkPos = siemensNet.ReadInt16("D2237").Content;
- protocol.liftPos = siemensNet.ReadInt16("D2238").Content;
- protocol.walkPos = siemensNet.ReadInt16("D2239").Content;
- protocol.taskFinish = siemensNet.ReadInt16("D2240").Content;
- protocol.loaded = siemensNet.ReadInt16("D2241").Content;
- protocol.alarm = siemensNet.ReadInt16("D2242").Content;
- protocol.xDistance = siemensNet.ReadInt32("D2251").Content;
- protocol.yDistance = siemensNet.ReadInt32("D2253").Content;
- protocol.duration = siemensNet.ReadInt16("D2255").Content;
+ protocol.setMode(siemensNet.ReadInt16("D2231").Content);
+ protocol.setEStop(siemensNet.ReadInt16("D2232").Content);
+ protocol.setTaskNo(siemensNet.ReadInt16("D2233").Content);
+ protocol.setStatus(siemensNet.ReadInt16("D2234").Content);
+ protocol.setBay(siemensNet.ReadInt16("D2235").Content);
+ protocol.setLevel(siemensNet.ReadInt16("D2236").Content);
+ protocol.setForkPos(siemensNet.ReadInt16("D2237").Content);
+ protocol.setLiftPos(siemensNet.ReadInt16("D2238").Content);
+ protocol.setWalkPos(siemensNet.ReadInt16("D2239").Content);
+ protocol.setTaskFinish(siemensNet.ReadInt16("D2240").Content);
+ protocol.setLoaded(siemensNet.ReadInt16("D2241").Content);
+ protocol.setAlarm(siemensNet.ReadInt16("D2242").Content);
+ protocol.setXDistance(siemensNet.ReadInt32("D2251").Content);
+ protocol.setYDistance(siemensNet.ReadInt32("D2253").Content);
+ protocol.setDuration(siemensNet.ReadInt32("D2255").Content);
this.crnProtocol = protocol;
}
+ /**
+ * 鍐欏叆鏁版嵁
+ */
+ private void write(){
+
+ }
+
@Override
public void close() {
--
Gitblit v1.9.1