From 9247dcffd28f79e631c6bd7e402b7983d2de69e8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 20 八月 2020 15:48:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 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 5383a34..3fbc73c 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -122,24 +122,47 @@
private CrnError2 crnError2;
/**
- * 淇濈暀
+ * 寮傚父3
*/
- private Short temp1;
+ private boolean[] error3;
+
+ private CrnError3 crnError3;
+
+ /**
+ * 寮傚父4
+ */
+ private boolean[] error4;
+
+ private CrnError4 crnError4;
+
+ /**
+ * 寮傚父5
+ */
+ private boolean[] error5;
+
+ private CrnError5 crnError5;
+
+ /**
+ * 寮傚父6
+ */
+ private boolean[] error6;
+
+ private CrnError6 crnError6;
/**
* X琛岃蛋绾块�熷害m/min
*/
- private Short xSpeed;
+ private Float xSpeed;
/**
* Y琛岃蛋绾块�熷害m/min
*/
- private Short ySpeed;
+ private Float ySpeed;
/**
* Z琛岃蛋绾块�熷害m/min
*/
- private Short zSpeed;
+ private Float zSpeed;
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
@@ -243,6 +266,26 @@
this.crnError2.none = error2[15];
}
+ public void setError3(boolean[] error3) {
+ this.error3 = error3;
+ this.crnError3 = new CrnError3();
+ }
+
+ public void setError4(boolean[] error4) {
+ this.error4 = error4;
+ this.crnError4 = new CrnError4();
+ }
+
+ public void setError5(boolean[] error5) {
+ this.error5 = error5;
+ this.crnError5 = new CrnError5();
+ }
+
+ public void setError6(boolean[] error6) {
+ this.error6 = error6;
+ this.crnError6 = new CrnError6();
+ }
+
/**
* 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
* I:鍏ュ簱
--
Gitblit v1.9.1