From 54a42225ae5156dbd47c5aada2b960af35328774 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 28 五月 2025 09:27:45 +0800
Subject: [PATCH] #ZH
---
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 68 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
index 43d9bfb..e69ba54 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -97,6 +97,27 @@
*/
public boolean statusEnable;//0\1\2
+
+
+ // 鎬ュ仠
+ private boolean err1;
+
+ // 鏈夌墿鏃犺祫鏂�
+ private boolean err2;
+
+ // 鍛戒护閿欒璧拌閾炬潯鍐茬獊
+ private boolean err3;
+
+ // 鐩爣涓鸿秴杩囪蛋琛屾瀬闄�
+ private boolean err4;
+
+ // 鍙橀鍣ㄥ紓甯�
+ private boolean err5;
+
+ // 鍏夌數寮傚父
+ private boolean err6;
+ private String errorRgv;
+
public void setMode(Short mode) {
this.mode = mode;
this.modeType = RgvModeType.get(mode);
@@ -125,6 +146,14 @@
return basRgv;
}
+ public long getRgvPosDestinationOrPos(boolean sign){
+ if (!sign){
+ return RgvPosDestination>RgvPos? RgvPosDestination:RgvPos;
+ } else {
+ return RgvPosDestination<RgvPos? RgvPosDestination:RgvPos;
+ }
+ }
+
public void setxSpeed(Short xSpeed) {
this.xSpeed = Float.valueOf(xSpeed);
}
@@ -137,4 +166,43 @@
this.xDuration = Float.valueOf(xDuration);
}
+ public int getAlarm$(){
+ if (err1){
+ return 1;
+ }
+ if (err2){
+ return 2;
+ }
+ if (err3){
+ return 3;
+ }
+ if (err4){
+ return 4;
+ }
+ if (err5){
+ return 5;
+ }
+ if (err6){
+ return 6;
+ }
+ return 0;
+ }
+ public String getAlarmM(){
+ switch (getAlarm$()){
+ case 1:
+ return "鎬ュ仠";
+ case 2:
+ return "鏈夌墿鏃犺祫鏂�";
+ case 3:
+ return "鍛戒护閿欒璧拌閾炬潯鍐茬獊";
+ case 4:
+ return "鐩爣涓鸿秴杩囪蛋琛屾瀬闄�";
+ case 5:
+ return "鍙橀鍣ㄥ紓甯�";
+ case 6:
+ return "鍏夌數寮傚父";
+ }
+ return "姝ｅ父";
+ }
+
}
--
Gitblit v1.9.1