From 67c9b8c40d8b89408e522bc6df7347992dcdd245 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 十二月 2024 15:30:01 +0800
Subject: [PATCH] 修改升级协议中的bug，帧长度编码由BCD改为bin
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 432a0bf..7468ba0 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
@@ -146,6 +146,18 @@
bsNoTail[ProtocolConstantV206V1.dataLenIndex] = (byte)len ;
}
+ public static void createLen4PUg(byte[] bytes) throws Exception {
+ int len = bytes.length - 4;
+ byte[] bs = ByteUtil.short2Bytes_LE((short)len) ;
+ if(bs != null && bs.length == 1){
+ bytes[1] = 0 ;
+ bytes[2] = bs[0] ;
+ }else if(bs != null && bs.length > 1){
+ bytes[1] = bs[1] ;
+ bytes[2] = bs[0] ;
+ }
+ }
+
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] ;
@@ -155,9 +167,9 @@
}
public static byte[] createCrcTail4Ug(byte[] bsNoTail) throws Exception {
- int crc = new CRC16().CRC(bsNoTail, 0, bsNoTail.length -1) ;
+ int crc = new CRC16().CRC16_table(bsNoTail, 0, bsNoTail.length -1) ;
byte[] bytes = new byte[ProtocolConstantV206V2.UG_lenTail] ;
- ByteUtilUnsigned.short2Bytes_BE(bytes, crc, 0);
+ ByteUtilUnsigned.short2Bytes_LE(bytes, crc, 0);
bytes[2] = ProtocolConstantV206V2.P_Tail_Byte ;
return bytes ;
}
--
Gitblit v1.8.0