From 356235e230dd0f8c01f2690f5818cb6a9abcc481 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 十二月 2024 15:31:17 +0800
Subject: [PATCH] 修改升级协议中的bug，帧长度由大端模式改为小端模式
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC16.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC16.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC16.java
index 741595c..3b66baf 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC16.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC16.java
@@ -150,23 +150,23 @@
// 5D4D5D4D
// 00004000
// AAC616" ;
- String hex = "AA0024AA16015301150599800001100000014A005D4D5D4D00004000" ;
+ String hex = "AA0018AA16015301150599800001100000014A005D4D5D4D00004000" ;
byte[] bs = ByteUtil.hex2Bytes(hex) ;
-// for(int i = 0 ; i < bs.length - 2 ; i++){
-// short crc = new CRC16().CRC16_table(bs, i , bs.length - 1) ;
-// byte[] bytes = new byte[ProtocolConstantV206V1.UG_lenTail] ;
-// ByteUtil.short2Bytes_LE(bytes, crc, 0);
-// bytes[2] = ProtocolConstantV206V1.P_Tail_Byte ;
-// System.out.println(ByteUtil.bytes2Hex(bytes, true)) ;
-// }
- System.out.println("==============================") ;
- for(int i = 4 ; i < bs.length ; i++){
- short crc = new CRC16().CRC16_table(bs, 0 , i) ;
+ for(int i = 0 ; i < bs.length - 2 ; i++){
+ short crc = new CRC16().CRC16_table(bs, i , bs.length - 1) ;
byte[] bytes = new byte[ProtocolConstantV206V1.UG_lenTail] ;
ByteUtil.short2Bytes_LE(bytes, crc, 0);
bytes[2] = ProtocolConstantV206V1.P_Tail_Byte ;
System.out.println(ByteUtil.bytes2Hex(bytes, true)) ;
}
+// System.out.println("==============================") ;
+// for(int i = 4 ; i < bs.length ; i++){
+// short crc = new CRC16().CRC16_table(bs, 0 , i) ;
+// byte[] bytes = new byte[ProtocolConstantV206V1.UG_lenTail] ;
+// ByteUtil.short2Bytes_LE(bytes, crc, 0);
+// bytes[2] = ProtocolConstantV206V1.P_Tail_Byte ;
+// System.out.println(ByteUtil.bytes2Hex(bytes, true)) ;
+// }
}
}
--
Gitblit v1.8.0