From a58907b689885ca6bb9258ac81a8b279f74e7c34 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 20 八月 2020 16:50:24 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/CrnError1.java   |   39 ++++---
 src/main/java/com/zy/core/model/protocol/CrnError2.java   |   63 ++++++------
 src/main/java/com/zy/core/model/protocol/CrnError4.java   |   12 ++
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |   84 ++++++++++------
 src/main/java/com/zy/core/model/protocol/CrnError3.java   |   49 +++++++++
 5 files changed, 165 insertions(+), 82 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
index 3c522c0..0ae2829 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnError1.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnError1.java
@@ -8,8 +8,14 @@
 @Data
 public class CrnError1 {
 
-    // 鎬ュ仠
-    public boolean stop;
+    // 閬ユ帶鍣ㄦ�ュ仠
+    public boolean remoteStop;
+
+    // 涓绘帶鐩樻�ュ仠
+    public boolean mainStop;
+
+    // 鎿嶄綔鐩樻�ュ仠
+    public boolean controlStop;
 
     // X琛岃蛋鍙橀鍣ㄦ晠闅�
     public boolean xCoverErr;
@@ -20,40 +26,35 @@
     // Z璐у弶鍙橀鍣ㄦ晠闅�
     public boolean zCoverErr;
 
-    // 婵�鍏夋祴璺濅华鏁呴殰
-    public boolean rangeErr;
+    // 婵�鍏夋晠闅�
+    public boolean laserErr;
 
     // 鏉$爜闃呰鍣ㄦ晠闅�
     public boolean barcodeErr;
 
-    // X鍓嶆瀬闄愬埌浣�
+    // X鍓嶆瀬闄�
     public boolean xFrontLimitErr;
 
-    // X鍚庢瀬闄愬埌浣�
+    // X鍚庢瀬闄�
     public boolean xBackLimitErr;
 
-    // Y涓婃瀬闄愬埌浣�
+    // Y涓婃瀬闄�
     public boolean yUpLimitErr;
 
-    // Y涓嬫瀬闄愬埌浣�
+    // Y涓嬫瀬闄�
     public boolean yDownLimitErr;
 
-    // Z宸︽瀬闄愬埌浣�
+    // Z宸︽瀬闄�
     public boolean zLeftLimitErr;
 
-    // Z鍙虫瀬闄愬埌浣�
+    // Z鍙虫瀬闄�
     public boolean zRightLimitErr;
 
-    // X瀹氫綅瓒呬笂闄�
-    public boolean xLocationUpErr;
+    // 宸﹁秴瀹�1
+    public boolean leftOverWidthErr1;
 
-    // X瀹氫綅瓒呬笅闄�
-    public boolean xLocationDownErr;
+    // 宸﹁秴瀹�2
+    public boolean leftOverWidthErr2;
 
-    // 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
index 86ec143..ef0e1cd 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnError2.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnError2.java
@@ -8,52 +8,53 @@
 @Data
 public class CrnError2 {
 
-    // Z瀹氫綅瓒呬笂闄�
-    public boolean zLocationUpErr;
+    // 宸﹁秴闀�1
+    public boolean leftOverLenErr1;
 
-    // Z瀹氫綅瓒呬笅闄�
-    public boolean zLocationDownErr;
+    // 宸﹁秴闀�2
+    public boolean leftOverLenErr2;
 
-    // WCS鍛戒护寮傚父
-    public boolean wcsCommandErr;
+    // 宸﹁秴楂�
+    public boolean leftOverHighErr;
 
-    // 宸﹁秴瀹�
-    public boolean leftWidthLimitErr;
+    // 鍙宠秴瀹�1
+    public boolean rightOverWidthErr1;
 
-    // 鍙宠秴瀹�
-    public boolean rightWidthLimitErr;
+    // 鍙宠秴瀹�2
+    public boolean rightOverWidthErr2;
 
-    // 宸﹁秴闀�
-    public boolean leftLengthLimitErr;
+    // 鍙宠秴闀�1
+    public boolean rightOverLenErr1;
 
-    // 鍙宠秴闀�
-    public boolean rightLengthLimitErr;
+    // 鍙宠秴闀�2
+    public boolean rightOverLenErr2;
 
-    // 瓒呴珮
-    public boolean highLimitErr;
+    // 鍙宠秴楂�
+    public boolean rightOverHighErr;
 
-    // 宸﹀彇璐т几鍙夋椂鏃犺揣
-    public boolean leftTakeNoneErr;
+    // 宸︽澗缁�
+    public boolean leftLooseRopeErr;
 
-    // 鍙冲彇璐у崌鍙夋椂鏃犺揣
-    public boolean rightTakeNoneErr;
+    // 鍙虫澗缁�
+    public boolean rightLooseRopeErr;
 
-    // 宸︽斁璐т几鍙夋椂鏈夎揣
-    public boolean leftPutLoadErr;
+    // 鍓嶅畨鍏ㄩ棬鏁呴殰
+    public boolean frontDoorErr;
 
-    // 鍙虫斁璐т几鍙夋椂鏈夎揣
-    public boolean rightPutLoadErr;
+    // 鍚庡畨鍏ㄩ棬鏁呴殰
+    public boolean backDoorErr;
 
     // 鍚姩閿欒
-    public boolean startErr;
+    public boolean startupErr;
 
-    // 鏉剧怀鎶ヨ
-    public boolean looseRopeErr;
+    // X鍚戝墠瀹氫綅瓒呬笂闄�
+    public boolean xFrontLocaUpErr;
 
-    // 瀹夊叏闂ㄥ紑鍏虫姤璀�
-    public boolean safeDoorSwitchErr;
+    // X鍚戝墠瀹氫綅瓒呬笅闄�
+    public boolean xFrontLocaDownErr;
 
-    // --
-    public boolean none;
+    // X鍚戝悗瀹氫綅瓒呬笂闄�
+    public boolean xBackLocaUpErr;
+
 
 }
diff --git a/src/main/java/com/zy/core/model/protocol/CrnError3.java b/src/main/java/com/zy/core/model/protocol/CrnError3.java
index 0430e1e..d399480 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnError3.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnError3.java
@@ -8,4 +8,53 @@
 @Data
 public class CrnError3 {
 
+    // X鍚戝悗瀹氫綅瓒呬笅闄�
+    public boolean xBackLocaDownErr;
+
+    // Y鍚戜笂瀹氫綅瓒呬笂闄�
+    public boolean yUpLocaUpErr;
+
+    // Y鍚戜笂瀹氫綅瓒呬笅闄�
+    public boolean yUpLocaDownErr;
+
+    // Y鍚戜笅瀹氫綅瓒呬笂闄�
+    public boolean yDownLocaUpErr;
+
+    // Y鍚戜笅瀹氫綅瓒呬笅闄�
+    public boolean yDownLocaDownErr;
+
+    // Z鍚戝乏瀹氫綅瓒呬笂闄�
+    public boolean zLeftLocaUpErr;
+
+    // Z鍚戝乏瀹氫綅瓒呬笅闄�
+    public boolean zLeftLocaDownErr;
+
+    // Z鍚戝彸瀹氫綅瓒呬笂闄�
+    public boolean zRightLocaUpErr;
+
+    // Z鍚戝彸瀹氫綅瓒呬笅闄�
+    public boolean zRightLocaDownErr;
+
+    // 宸﹀彇璐ф椂搴撲綅鏃犺揣
+    public boolean leftTakeNoneErr;
+
+    // 鍙冲彇璐ф椂搴撲綅鏃犺揣
+    public boolean rightTakeNoneErr;
+
+    // 宸﹀彇璐у悗搴撲綅鏈夎揣
+    public boolean leftTakeThenLoadErr;
+
+    // 鍙冲彇璐у悗搴撲綅鏈夎揣
+    public boolean rightTakeThenLoadErr;
+
+    // 宸︽斁璐ф椂搴撲綅鏈夎揣
+    public boolean leftPutAndLoadErr;
+
+    // 鍙冲彇璐у悗搴撲綅鏈夎揣
+    public boolean rightPutAndLoadErr;
+
+    // 宸︽斁璐у悗搴撲綅鏃犺揣
+    public boolean leftPutThenNoneErr;
+
+
 }
diff --git a/src/main/java/com/zy/core/model/protocol/CrnError4.java b/src/main/java/com/zy/core/model/protocol/CrnError4.java
index 1d34239..9eb90f9 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnError4.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnError4.java
@@ -8,4 +8,16 @@
 @Data
 public class CrnError4 {
 
+    // 鍙虫斁璐у悗搴撲綅鏃犺揣
+    public boolean rightPutThenNoneErr;
+
+    // X鏉鹃椄瓒呮椂
+    public boolean xLooseBrakeTimeout;
+
+    // Y鏉鹃椄瓒呮椂
+    public boolean yLooseBrakeTimeout;
+
+    // Z鏉鹃椄瓒呮椂
+    public boolean zLooseBrakeTimeout;
+
 }
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 3fbc73c..b7c4bc5 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -227,53 +227,73 @@
     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];
+        this.crnError1.remoteStop = error1[0];
+        this.crnError1.mainStop = error1[1];
+        this.crnError1.controlStop = error1[2];
+        this.crnError1.xCoverErr = error1[3];
+        this.crnError1.yCoverErr = error1[4];
+        this.crnError1.zCoverErr = error1[5];
+        this.crnError1.laserErr = error1[6];
+        this.crnError1.barcodeErr = error1[7];
+        this.crnError1.xFrontLimitErr = error1[8];
+        this.crnError1.xBackLimitErr = error1[9];
+        this.crnError1.yUpLimitErr = error1[10];
+        this.crnError1.yDownLimitErr = error1[11];
+        this.crnError1.zLeftLimitErr = error1[12];
+        this.crnError1.zRightLimitErr = error1[13];
+        this.crnError1.leftOverWidthErr1 = error1[14];
+        this.crnError1.leftOverWidthErr2 = 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];
+        this.crnError2.leftOverLenErr1 = error2[0];
+        this.crnError2.leftOverLenErr2 = error2[1];
+        this.crnError2.leftOverHighErr = error2[2];
+        this.crnError2.rightOverWidthErr1 = error2[3];
+        this.crnError2.rightOverWidthErr2 = error2[4];
+        this.crnError2.rightOverLenErr1 = error2[5];
+        this.crnError2.rightOverLenErr2 = error2[6];
+        this.crnError2.rightOverHighErr = error2[7];
+        this.crnError2.leftLooseRopeErr = error2[8];
+        this.crnError2.rightLooseRopeErr = error2[9];
+        this.crnError2.frontDoorErr = error2[10];
+        this.crnError2.backDoorErr = error2[11];
+        this.crnError2.startupErr = error2[12];
+        this.crnError2.xFrontLocaUpErr = error2[13];
+        this.crnError2.xFrontLocaDownErr = error2[14];
+        this.crnError2.xBackLocaUpErr = error2[15];
     }
 
     public void setError3(boolean[] error3) {
         this.error3 = error3;
         this.crnError3 = new CrnError3();
+        this.crnError3.xBackLocaDownErr = error3[0];
+        this.crnError3.yUpLocaUpErr = error3[1];
+        this.crnError3.yUpLocaDownErr = error3[2];
+        this.crnError3.yDownLocaUpErr = error3[3];
+        this.crnError3.yDownLocaDownErr = error3[4];
+        this.crnError3.zLeftLocaUpErr = error3[5];
+        this.crnError3.zLeftLocaDownErr = error3[6];
+        this.crnError3.zRightLocaUpErr = error3[7];
+        this.crnError3.zRightLocaDownErr = error3[8];
+        this.crnError3.leftTakeNoneErr = error3[9];
+        this.crnError3.rightTakeNoneErr = error3[10];
+        this.crnError3.leftTakeThenLoadErr = error3[11];
+        this.crnError3.rightTakeThenLoadErr = error3[12];
+        this.crnError3.leftPutAndLoadErr = error3[13];
+        this.crnError3.rightPutAndLoadErr = error3[14];
+        this.crnError3.leftPutThenNoneErr = error3[15];
     }
 
     public void setError4(boolean[] error4) {
         this.error4 = error4;
         this.crnError4 = new CrnError4();
+        this.crnError4.rightPutThenNoneErr = error4[0];
+        this.crnError4.xLooseBrakeTimeout = error4[1];
+        this.crnError4.yLooseBrakeTimeout = error4[2];
+        this.crnError4.zLooseBrakeTimeout = error4[3];
     }
 
     public void setError5(boolean[] error5) {

--
Gitblit v1.9.1