From 678f43f99d4fe259c6ce3dabbc2563776c2a25f1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 28 十二月 2020 17:40:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnError1.java | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 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;
}
--
Gitblit v1.9.1