From ea9b2ddb6c523088b4800337478ffa0bac880766 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 26 十月 2023 15:50:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/SteProtocol.java | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 151 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/SteProtocol.java b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
index 10e9009..5ed0d12 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -206,136 +206,253 @@
// 绌挎杞﹀紓甯� ------------------------------------------------------------------------
/**
- * 1.鍗囬檷瓒呮椂鎶ヨ
+ * 0.鍗囬檷瓒呮椂鎶ヨ
*/
private boolean liftErr;
/**
- * 3.鍏ュ簱鍙栫┖鎶ヨ
+ * 2.鍏ュ簱鍙栫┖鎶ヨ
*/
private boolean inFetchErr;
/**
- * 4.鍑哄簱鍙栫┖鎶ヨ
+ * 3.鍑哄簱鍙栫┖鎶ヨ
*/
private boolean outFetchErr;
/**
- * 5.闃叉挒淇濇姢
+ * 4.闃叉挒淇濇姢
*/
private boolean antiErr;
/**
- * 6.鍗囬檷鎺ヨ繎寮�鍏虫晠闅�
+ * 5.鍗囬檷鎺ヨ繎寮�鍏虫晠闅�
*/
private boolean liftSwitchErr;
/**
- * 7.杞ㄩ亾妫�娴嬫姤璀�
+ * 6.杞ㄩ亾妫�娴嬫姤璀�
*/
private boolean trackErr;
/**
- * 8.璁惧杩愯瓒呮椂鎶ヨ
+ * 7.璁惧杩愯瓒呮椂鎶ヨ
*/
private boolean timeoutErr;
/**
- * 9.閫氫俊閿欒鎶ヨ
+ * 8.閫氫俊閿欒鎶ヨ
*/
private boolean connectErr;
/**
- * 10.璁惧鎬ュ仠
+ * 9.璁惧鎬ュ仠
*/
private boolean emergencyErr;
/**
- * 11.浠诲姟绫诲瀷缂哄け
+ * 10.浠诲姟绫诲瀷缂哄け
*/
private boolean taskTypeErr;
/**
- * 12.浠诲姟鍙风己澶�
+ * 11.浠诲姟鍙风己澶�
*/
private boolean taskNoErr;
/**
- * 13.杩愯涓湁鏂颁换鍔�
+ * 12.杩愯涓湁鏂颁换鍔�
*/
private boolean newTaskErr;
/**
- * 14.鏁呴殰涓湁浠诲姟
+ * 13.鏁呴殰涓湁浠诲姟
*/
private boolean errTaskErr;
/**
- * 15.杩愯涓仠姝�
+ * 14.杩愯涓仠姝�
*/
private boolean stopErr;
/**
- * 16.鑴辨満妯″紡涓嬫湁浠诲姟
+ * 15.鑴辨満妯″紡涓嬫湁浠诲姟
*/
private boolean offlineTaskErr;
/**
- * 17.鏉′欢鏈弧瓒冲惎鍔ㄤ换鍔�
+ * 16.鏉′欢鏈弧瓒冲惎鍔ㄤ换鍔�
*/
private boolean startTaskErr;
/**
- * 18.浣庣數鍘嬫椂鏈変换鍔�
+ * 17.浣庣數鍘嬫椂鏈変换鍔�
*/
private boolean voltageTaskErr;
/**
- * 64.璁惧鏁呴殰鏍囧織浣�
+ * 63.璁惧鏁呴殰鏍囧織浣�
*/
private boolean devpErr;
// 绌挎杞﹀紓甯� ------------------------------------------------------------------------
// 绌挎杞︽彁绀轰俊鎭� ------------------------------------------------------------------------
/**
- * 65.鑱旀満鐘舵��
+ * 64.鑱旀満鐘舵��
*/
private boolean online;
/**
- * 66.涓嶅湪杞ㄩ亾涓�
+ * 65.涓嶅湪杞ㄩ亾涓�
*/
private boolean notOnTrack;
/**
- * 67.浣庣數閲忔彁閱�
+ * 66.浣庣數閲忔彁閱�
*/
private boolean lowVoltage;
/**
- * 68.浜忕數涓�
+ * 67.浜忕數涓�
*/
private boolean electricityLoss;
/**
- * 69.寮哄埗琛岃蛋鍚姩
+ * 68.寮哄埗琛岃蛋鍚姩
*/
private boolean forcedTravel;
/**
- * 70.婕旂ず妯″紡寮�鍚�
+ * 69.婕旂ず妯″紡寮�鍚�
*/
private boolean demoMode;
/**
- * 71.鍏呯數鍒峰凡鎺ラ��
+ * 70.鍏呯數鍒峰凡鎺ラ��
*/
private boolean brushConnect;
-// /**
-// * 71.鍏呯數鍒峰凡鎺ラ��
-// */
-// private boolean brushConnect;
+ /**
+ * 71.浠诲姟涓姝㈡墜鍔�
+ */
+ private boolean taskManualForbid;
+
+ /**
+ * 72.鑱旀満涓姝㈡墜鍔�
+ */
+ private boolean onlineManualForbid;
+
+ /**
+ * 73.璁惧鎬ュ仠涓�
+ */
+ private boolean devpEmergency;
+
+ /**
+ * 74.浠诲姟涓柇涓�
+ */
+ private boolean taskInterrupt;
+
+ /**
+ * 75.浠诲姟宸叉竻闄�
+ */
+ private boolean taskClear;
+
+ /**
+ * 76.浠诲姟纭宸茶秴鏃�
+ */
+ private boolean taskConfirmTimeout;
+
+ /**
+ * 77.鍏呯數涓湁浠诲姟
+ */
+ private boolean taskWithCharge;
+
+ // 浠诲姟淇℃伅 ---------------------------------------------------------
+ /**
+ * 96.鍏ュ簱浠诲姟涓�
+ */
+ private boolean pakInTask;
+
+ /**
+ * 97. 鍑哄簱浠诲姟涓�
+ */
+ private boolean pakOutTask;
+
+ /**
+ * 98. 绉诲簱浠诲姟涓�
+ */
+ private boolean pakMoveTask;
+
+ /**
+ * 99. 鍥炲師鐐逛换鍔′腑
+ */
+ private boolean goHpTask;
+
+ /**
+ * 100. 鍘诲弽鍘熺偣浠诲姟涓�
+ */
+ private boolean goOHpTask;
+
+ /**
+ * 101. 鍘诲師鐐归伩璁╀綅
+ */
+ private boolean goHpAvoid;
+
+ /**
+ * 102. 鍘诲弽鍘熺偣閬胯浣�
+ */
+ private boolean goOHpAvoid;
+
+ /**
+ * 104. 鍏ュ簱鍙栫┖缁撴潫
+ */
+ private boolean pakInEmpty;
+
+ /**
+ * 105. 鍏ュ簱姝ｅ父缁撴潫
+ */
+ private boolean pakInFinish;
+
+ /**
+ * 106. 鍑哄簱鍙栫┖缁撴潫
+ */
+ private boolean pakOutEmpty;
+
+ /**
+ * 107. 鍑哄簱姝ｅ父缁撴潫
+ */
+ private boolean pakOutFinish;
+
+ /**
+ * 108. 鍘诲師鐐归伩璁╁畬鎴�
+ */
+ private boolean goHpAvoidFinish;
+
+ /**
+ * 109. 鍘诲弽鍘熺偣閬胯瀹屾垚
+ */
+ private boolean goOHpAvoidFinish;
+
+ /**
+ * 110. 鍘诲師鐐归伩璁╁畬鎴�
+ */
+ private boolean goHpAvoidErr;
+
+ /**
+ * 111. 鍘诲弽鍘熺偣閬胯瀹屾垚
+ */
+ private boolean goOHpAvoidErr;
+
+ // 鐘舵�佷俊鎭� ---------------------------------------------------------
+ /**
+ * 112. 鑱旀満妯″紡
+ */
+ private boolean autoMode;
+
+ /**
+ * 113. 鐢靛帇杩囦綆
+ */
+ private boolean voltageLow;
public void setStatus(Short status){
@@ -419,6 +536,11 @@
}
}
+ // 灏忚溅鐢甸噺
+ public Float isIdle2() {
+ return this.charge;
+ }
+
// 鏄惁澶勪簬鎶ヨ鐘舵��
public Boolean isAlarm() {
return this.alarm > 1;
--
Gitblit v1.9.1