From 080a3a42da0f4244f4f078b62f10bad11156a5a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 八月 2020 13:45:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnError1.java | 59 +++++++++++++++++++
src/main/java/com/zy/core/model/protocol/CrnError2.java | 59 +++++++++++++++++++
src/main/java/com/zy/core/thread/CrnThread.java | 5 +
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 50 ++++++++++++++++
4 files changed, 169 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/CrnError1.java b/src/main/java/com/zy/core/model/protocol/CrnError1.java
new file mode 100644
index 0000000..3c522c0
--- /dev/null
+++ b/src/main/java/com/zy/core/model/protocol/CrnError1.java
@@ -0,0 +1,59 @@
+package com.zy.core.model.protocol;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020/8/17
+ */
+@Data
+public class CrnError1 {
+
+ // 鎬ュ仠
+ public boolean stop;
+
+ // X琛岃蛋鍙橀鍣ㄦ晠闅�
+ public boolean xCoverErr;
+
+ // Y鍗囬檷鍙橀鍣ㄦ晠闅�
+ public boolean yCoverErr;
+
+ // Z璐у弶鍙橀鍣ㄦ晠闅�
+ public boolean zCoverErr;
+
+ // 婵�鍏夋祴璺濅华鏁呴殰
+ public boolean rangeErr;
+
+ // 鏉＄爜闃呰鍣ㄦ晠闅�
+ public boolean barcodeErr;
+
+ // X鍓嶆瀬闄愬埌浣�
+ public boolean xFrontLimitErr;
+
+ // X鍚庢瀬闄愬埌浣�
+ public boolean xBackLimitErr;
+
+ // Y涓婃瀬闄愬埌浣�
+ public boolean yUpLimitErr;
+
+ // Y涓嬫瀬闄愬埌浣�
+ public boolean yDownLimitErr;
+
+ // Z宸︽瀬闄愬埌浣�
+ public boolean zLeftLimitErr;
+
+ // Z鍙虫瀬闄愬埌浣�
+ public boolean zRightLimitErr;
+
+ // X瀹氫綅瓒呬笂闄�
+ public boolean xLocationUpErr;
+
+ // X瀹氫綅瓒呬笅闄�
+ public boolean xLocationDownErr;
+
+ // Y瀹氫綅瓒呬笂闄�
+ public boolean yLocationUpErr;
+
+ // Y瀹氫綅瓒呬笅闄�
+ public boolean yLocationDownErr;
+
+}
diff --git a/src/main/java/com/zy/core/model/protocol/CrnError2.java b/src/main/java/com/zy/core/model/protocol/CrnError2.java
new file mode 100644
index 0000000..86ec143
--- /dev/null
+++ b/src/main/java/com/zy/core/model/protocol/CrnError2.java
@@ -0,0 +1,59 @@
+package com.zy.core.model.protocol;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020/8/17
+ */
+@Data
+public class CrnError2 {
+
+ // Z瀹氫綅瓒呬笂闄�
+ public boolean zLocationUpErr;
+
+ // Z瀹氫綅瓒呬笅闄�
+ public boolean zLocationDownErr;
+
+ // WCS鍛戒护寮傚父
+ public boolean wcsCommandErr;
+
+ // 宸﹁秴瀹�
+ public boolean leftWidthLimitErr;
+
+ // 鍙宠秴瀹�
+ public boolean rightWidthLimitErr;
+
+ // 宸﹁秴闀�
+ public boolean leftLengthLimitErr;
+
+ // 鍙宠秴闀�
+ public boolean rightLengthLimitErr;
+
+ // 瓒呴珮
+ public boolean highLimitErr;
+
+ // 宸﹀彇璐т几鍙夋椂鏃犺揣
+ public boolean leftTakeNoneErr;
+
+ // 鍙冲彇璐у崌鍙夋椂鏃犺揣
+ public boolean rightTakeNoneErr;
+
+ // 宸︽斁璐т几鍙夋椂鏈夎揣
+ public boolean leftPutLoadErr;
+
+ // 鍙虫斁璐т几鍙夋椂鏈夎揣
+ public boolean rightPutLoadErr;
+
+ // 鍚姩閿欒
+ public boolean startErr;
+
+ // 鏉剧怀鎶ヨ
+ public boolean looseRopeErr;
+
+ // 瀹夊叏闂ㄥ紑鍏虫姤璀�
+ public boolean safeDoorSwitchErr;
+
+ // --
+ public boolean none;
+
+}
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 4164f37..5383a34 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -110,12 +110,16 @@
/**
* 寮傚父1
*/
- private Short error1;
+ private boolean[] error1;
+
+ private CrnError1 crnError1;
/**
* 寮傚父2
*/
- private Short error2;
+ private boolean[] error2;
+
+ private CrnError2 crnError2;
/**
* 淇濈暀
@@ -197,6 +201,48 @@
this.status = CrnStatusType.get(type).id.shortValue();
}
+ public void setError1(boolean[] error1){
+ this.error1 = error1;
+ this.crnError1 = new CrnError1();
+ this.crnError1.stop = error1[0];
+ this.crnError1.xCoverErr = error1[1];
+ this.crnError1.yCoverErr = error1[2];
+ this.crnError1.zCoverErr = error1[3];
+ this.crnError1.rangeErr = error1[4];
+ this.crnError1.barcodeErr = error1[5];
+ this.crnError1.xFrontLimitErr = error1[6];
+ this.crnError1.xBackLimitErr = error1[7];
+ this.crnError1.yUpLimitErr = error1[8];
+ this.crnError1.yDownLimitErr = error1[9];
+ this.crnError1.zLeftLimitErr = error1[10];
+ this.crnError1.zRightLimitErr = error1[11];
+ this.crnError1.xLocationUpErr = error1[12];
+ this.crnError1.xLocationDownErr = error1[13];
+ this.crnError1.yLocationUpErr = error1[14];
+ this.crnError1.yLocationDownErr = error1[15];
+ }
+
+ public void setError2(boolean[] error2){
+ this.error2 = error2;
+ this.crnError2 = new CrnError2();
+ this.crnError2.zLocationUpErr = error2[0];
+ this.crnError2.zLocationDownErr = error2[1];
+ this.crnError2.wcsCommandErr = error2[2];
+ this.crnError2.leftWidthLimitErr = error2[3];
+ this.crnError2.rightWidthLimitErr = error2[4];
+ this.crnError2.leftLengthLimitErr = error2[5];
+ this.crnError2.rightLengthLimitErr = error2[6];
+ this.crnError2.highLimitErr = error2[7];
+ this.crnError2.leftTakeNoneErr = error2[8];
+ this.crnError2.rightTakeNoneErr = error2[9];
+ this.crnError2.leftPutLoadErr = error2[10];
+ this.crnError2.rightPutLoadErr = error2[11];
+ this.crnError2.startErr = error2[12];
+ this.crnError2.looseRopeErr = error2[13];
+ this.crnError2.safeDoorSwitchErr = error2[14];
+ this.crnError2.none = error2[15];
+ }
+
/**
* 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
* I:鍏ュ簱
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 915c442..d6b9786 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -127,8 +127,9 @@
// 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));
- crnProtocol.setError2(siemensNet.getByteTransform().TransInt16(result.Content, 24));
+ // 寮傚父淇℃伅
+ crnProtocol.setError1(siemensNet.getByteTransform().TransBool(result.Content, 22, 2));
+ crnProtocol.setError2(siemensNet.getByteTransform().TransBool(result.Content, 24, 2));
crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 26));
crnProtocol.setXSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
crnProtocol.setYSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 30));
--
Gitblit v1.9.1