From 658b3d9b66b11001935317c04521c7a37ce97db1 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期一, 15 七月 2024 10:11:34 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/RgvProtocol.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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 1591bfc..172a5a5 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -57,7 +57,7 @@
     /**
      * 宸ヤ綅1鏈夌墿
      */
-    public Short loaded1;
+    public Short loaded1;//0 鏃犵墿锛�1 鏈夌墿
 
     /**
      * RGV褰撳墠浣嶇疆
@@ -94,13 +94,18 @@
     /**
      * 宸ヤ綅2鏈夌墿
      */
-    public Short loaded2;
+    public Short loaded2;  //0 鏃犵墿锛�1 涓�灞傛棤鐗╀簩灞傛湁鐗╋紙鍙兘鎷嗗彔锛�  锛�2涓�灞傛湁鐗╀簩灞傛棤鐗� 锛堝彧鑳芥弧鏀撅級锛�3  1銆�2灞傞兘鏈夌墿  4锛氾紙锛夊彧鍏佽鎷嗙洏
     ///////////////////////////////////////////////////////////////////////////////////////
 
     /**
      * 寮傚父鐮�
      */
     public Short alarm;
+
+    /**
+     * 蹇冭烦鎸囦护 1-2姣忕鍒囨崲涓�娆�
+     */
+    public Short heart;
 
     private Short temp1;
 
@@ -109,6 +114,8 @@
     private Short temp3;
 
     private Short temp4;
+
+    private Short temp5;
 
     /**
      * X琛岃蛋琛岄�熷害m/min
@@ -194,4 +201,10 @@
         this.xDuration = Float.valueOf(xDuration);
     }
 
+    public Integer getRgvPosI(){
+        //闇�瑕佹牴鎹幇鍦烘敼閫�  鏍规嵁璇诲埌鐨勫�艰幏鍙栧搴旂珯鐐逛綅缃�
+        if (RgvPos==null) return 0;
+        return RgvPos.intValue();
+    }
+
 }

--
Gitblit v1.9.1