From ac0906df88505ec24ee910899a036676823f9d63 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 21 十一月 2023 08:56:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld --- src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 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 2110fc1..87c0781 100644 --- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java @@ -223,22 +223,22 @@ /** * 鍫嗗灈鏈哄瀭鐩存晠闅滀唬鐮侊紙鏁板�兼樉绀猴級 */ - private Integer alarm1; + private Integer alarm1 = 0; /** * 鍫嗗灈鏈烘按骞虫晠闅滀唬鐮侊紙鏁板�兼樉绀猴級 */ - private Integer alarm2; + private Integer alarm2 = 0;; /** * 鍫嗗灈鏈鸿揣鍙夋晠闅滀唬鐮侊紙鏁板�兼樉绀猴級 */ - private Integer alarm3; + private Integer alarm3 = 0;; /** * 鍫嗗灈鏈虹姸鎬佹晠闅滀唬鐮侊紙鏁板�兼樉绀猴級 */ - private Integer alarm4; + private Integer alarm4 = 0;; /** * 寮傚父1 @@ -271,37 +271,37 @@ /** * X琛岃蛋绾块�熷害m/min */ - private Float xSpeed; + private Float xSpeed = 0F; /** * Y琛岃蛋绾块�熷害m/min */ - private Float ySpeed; + private Float ySpeed = 0F; /** * Z琛岃蛋绾块�熷害m/min */ - private Float zSpeed; + private Float zSpeed = 0F; /** * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m */ - public Float xDistance; + public Float xDistance = 0F; /** * 鍫嗗灈鏈虹疮璁″崌闄嶈窛绂籯m */ - public Float yDistance; + public Float yDistance = 0F; /** * 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣 */ - public Float xDuration; + public Float xDuration = 0F; - /** + /**w * 鍫嗗灈鏈虹疮璁″崌闄嶆椂闀縣 */ - public Float yDuration; + public Float yDuration = 0F; public void setMode(Short mode) { this.mode = mode; -- Gitblit v1.9.1