From 00d72b2165634e2d695c0fd9e7e4b5190dfce574 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期二, 18 八月 2020 14:54:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 160 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 122 insertions(+), 38 deletions(-)
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 49a760b..13c51ed 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -16,49 +16,40 @@
* 1 = 鎵嬪姩妯″紡
* 2 = 鑷姩妯″紡
* 3 = 鐢佃剳妯″紡
- * 4 = 鎵嬪姩妯″紡鍚姩涓�
- * 5 = 鑷姩妯″紡鍚姩涓�
- * 6 = 鐢佃剳妯″紡鍚姩涓�
*/
- public short mode;
+ public Short mode;
public CrnModeType modeType;
/**
* 1 = 鎬ュ仠
*/
- public short eStop;
+ public Short eStop;
/**
* 寮傚父鐮�
*/
- public short alarm;
+ public Short alarm;
/**
* 浠诲姟鍙�
*/
- public short taskNo;
+ public Short taskNo = 0;
/**
* 鍫嗗灈鏈哄綋鍓嶇姸鎬�
- * 0 = 鏈煡
- * 1 = 绌洪棽
- * 2 = 妫�鏌ヤ换鍔℃暟鎹�
- * 3 = 瀹氫綅鍒板彇璐т綅
- * 7 = 鍙栬揣瀹屾垚
- * 8 = 绛夊緟璋冨害鏌滃厑璁�
- * 9 = 绉诲姩鍒版斁璐т綅缃�
- * 10 = 鏀捐揣涓�
- * 13 = 鎼繍瀹屾垚
- * 14 = 绌鸿浇閬胯
- * 15 = 妫�鏌ヤ换鍔℃暟鎹�
- * 20 = 妫�鏌ユ簮浣嶇疆
- * 21 = 妫�鏌ョ洰鏍囦綅缃�
- * 50 = 绉诲姩浠诲姟
- * 98 = 浠诲姟瀹屾垚锛寃cs鏈‘璁�
- * 99 = 鎶ヨ
+ * 0锛氱┖闂诧紝鏃犱换鍔�
+ * 1锛氬彇璐у畾浣嶄腑
+ * 2锛氬彇璐т腑
+ * 3锛氬彇璐у畬鎴愶紝鏀捐揣瀹氫綅涓�
+ * 4锛氭斁璐т腑
+ * 5锛氬洖鍘熺偣涓�
+ * 6锛氬弽鍘熺偣
+ * 7锛氬簱浣嶇Щ浣�
+ * 90锛氫换鍔″畬鎴愮瓑寰匴CS纭
+ * 99锛氭姤璀�
*/
- public short status;
+ public Short status;
/**
* 鐘舵�佹灇涓�
@@ -68,12 +59,12 @@
/**
* 鍫嗗灈鏈哄綋鍓嶅垪鍙�
*/
- public short bay;
+ public Short bay;
/**
* 鍫嗗灈鏈哄綋鍓嶅眰鍙�
*/
- public short level;
+ public Short level;
/**
* 褰撳墠璐у弶浣嶇疆
@@ -81,16 +72,16 @@
* 1 = 璐у弶鍦ㄥ乏渚�
* 2 = 璐у弶鍦ㄥ彸渚�
*/
- public short forkPos;
+ public Short forkPos;
- private CrnForkPosType forkPosType;
+ public CrnForkPosType forkPosType;
/**
* 褰撳墠杞借揣鍙颁綅缃�
* 0 = 涓嬪畾浣�
* 1 = 涓婂畾浣�
*/
- public short liftPos;
+ public Short liftPos;
public CrnLiftPosType liftPosType;
@@ -99,32 +90,76 @@
* 0 = 鍦ㄥ畾浣�
* 1 = 涓嶅湪瀹氫綅
*/
- public short walkPos;
+ public Short walkPos;
/**
* 鍫嗗灈鏈轰换鍔″畬鎴�
*/
- public short taskFinish;
+ public Short taskFinish;
/**
* 杞借揣鍙版湁鐗�
*/
- public short loaded;
+ public Short loaded;
/**
- * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂�
+ * 寮傚父鐮侊紙鏁板�兼樉绀猴級
*/
- public int xDistance;
+ private Short alarm1;
/**
- * 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂�
+ * 寮傚父1
*/
- public int yDistance;
+ private boolean[] error1;
+
+ private CrnError1 crnError1;
/**
- * 鍫嗗灈鏈虹疮璁¤繍琛屾椂闀�
+ * 寮傚父2
*/
- public int duration;
+ private boolean[] error2;
+
+ private CrnError2 crnError2;
+
+ /**
+ * 淇濈暀
+ */
+ private Short temp1;
+
+ /**
+ * X琛岃蛋绾块�熷害m/min
+ */
+ private Float xSpeed;
+
+ /**
+ * Y琛岃蛋绾块�熷害m/min
+ */
+ private Float ySpeed;
+
+ /**
+ * Z琛岃蛋绾块�熷害m/min
+ */
+ private Float zSpeed;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
+ */
+ public Float xDistance;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m
+ */
+ public Float yDistance;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
+ */
+ public Float xDuration;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣
+ */
+ public Float yDuration;
public void setMode(Short mode) {
this.mode = mode;
@@ -166,4 +201,53 @@
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:鍏ュ簱
+ * O:鍑哄簱
+ */
+ private String lastIo = "I";
+
}
--
Gitblit v1.9.1