From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 21 二月 2025 09:52:14 +0800
Subject: [PATCH] 针对王江海制定的协议： 1、优化相关注释； 2、优化代码； 3、协议中报警信息有变化：外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
index 7468ba0..60e7d69 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
@@ -1,7 +1,5 @@
package com.dy.common.mw.protocol.p206V202404.parse.global;
-import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
-import com.dy.common.mw.protocol.p206V2.ProtocolConstantV206V2;
import com.dy.common.mw.protocol.p206V202404.CommonV202404;
import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404;
import com.dy.common.util.*;
@@ -142,8 +140,8 @@
}
public static void createLen(byte[] bsNoTail) throws Exception {
- int len = bsNoTail.length - ProtocolConstantV206V1.lenHead2ctrl;
- bsNoTail[ProtocolConstantV206V1.dataLenIndex] = (byte)len ;
+ int len = bsNoTail.length - ProtocolConstantV206V202404.lenHead2ctrl;
+ bsNoTail[ProtocolConstantV206V202404.dataLenIndex] = (byte)len ;
}
public static void createLen4PUg(byte[] bytes) throws Exception {
@@ -159,18 +157,21 @@
}
public static byte[] createCrcTail(byte[] bsNoTail) throws Exception {
- int crc = new CRC8_for_2_0().CRC8(bsNoTail, ProtocolConstantV206V1.ctrlIndex, bsNoTail.length -1) ;
- byte[] bytes = new byte[ProtocolConstantV206V1.lenTail] ;
+ int crc = new CRC8_for_2_0().CRC8(bsNoTail, ProtocolConstantV206V202404.ctrlIndex, bsNoTail.length -1) ;
+ byte[] bytes = new byte[ProtocolConstantV206V202404.lenTail] ;
bytes[0] = (byte)crc ;
- bytes[1] = ProtocolConstantV206V1.P_Tail_Byte ;
+ bytes[1] = ProtocolConstantV206V202404.P_Tail_Byte ;
return bytes ;
}
public static byte[] createCrcTail4Ug(byte[] bsNoTail) throws Exception {
int crc = new CRC16().CRC16_table(bsNoTail, 0, bsNoTail.length -1) ;
- byte[] bytes = new byte[ProtocolConstantV206V2.UG_lenTail] ;
- ByteUtilUnsigned.short2Bytes_LE(bytes, crc, 0);
- bytes[2] = ProtocolConstantV206V2.P_Tail_Byte ;
+ byte[] crcBs = new byte[4] ;
+ ByteUtil.int2Bytes_BE(crcBs, crc, 0);
+ byte[] bytes = new byte[ProtocolConstantV206V202404.UG_lenTail] ;
+ bytes[0] = crcBs[2] ;
+ bytes[1] = crcBs[3] ;
+ bytes[2] = ProtocolConstantV206V202404.P_Tail_Byte ;
return bytes ;
}
--
Gitblit v1.8.0