From 5b89937212db0c507145187313eb5b326220f47b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 21 一月 2025 10:18:43 +0800
Subject: [PATCH] 修改RTU升级文件CRC16计算的bug
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC16.java | 79 ++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 38 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 3b66baf..157257f 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
@@ -5,7 +5,7 @@
@SuppressWarnings("unused")
public final class CRC16 {
-
+
/*
* 16浣嶇殑CRC鍊兼槸鏃犵鍙蜂袱瀛楄妭鏁存暟锛�
* @param b 瀛楄妭鏁扮粍
@@ -94,30 +94,31 @@
* @param endIndex 鎴涓嬫爣
* @return CRC
*/
- @SuppressWarnings("unused")
- public short CRC16_table(byte[] bs, int startIndex, int endIndex) {
- short x ;
- short crc = (short)0xffff;
+ public int CRC16_table(byte[] bs, int startIndex, int endIndex) {
+ int x ;
+ int crc = 0xffff;
if(bs != null && bs.length >= endIndex + 1){
for (int i = startIndex ; i <= endIndex; i++){
- x = (short)(crc ^ bs[i]) ;
- crc = (short)((crc >> 8) ^ crc16_rev_table[x & 0x00FF]) ;
+ x = (crc ^ bs[i]) ;
+ crc = ((crc >> 8) ^ crc16_rev_table[x & 0x00FF]) ;
}
}
return crc ;
}
+
/**
- * 16浣嶇殑CRC鍊� 锛屾煡琛ㄦ硶
+ * 16浣嶇殑CRC鍊兼槸鏃犵鍙蜂袱瀛楄妭鏁存暟锛�
+ * @param len 鏁扮粍闀垮害
* @param bs 瀛楄妭鏁扮粍
+ * @param crc 鍘熷crc鍊�
* @return CRC
*/
- public short CRC16_table(byte[] bs) {
- short x ;
- short crc = (short)0xffff;
- if(bs != null && bs.length > 0){
- for(byte b : bs){
- x = (short)(crc ^ b) ;
- crc = (short)((crc >> 8) ^ crc16_rev_table[x & 0x00FF]) ;
+ public int CRC16_table(int len, byte[] bs, int crc) {
+ int x ;
+ if(bs != null){
+ for (int i = 0 ; i < len; i++){
+ x = (crc ^ bs[i]) ;
+ crc = ((crc >> 8) ^ crc16_rev_table[x & 0x00FF]) ;
}
}
return crc ;
@@ -142,31 +143,33 @@
}
public static void main(String[] args) throws Exception {
- //String hex = "AA0024AA
- // 16015301
- // 15059980
- // 00011000
- // 00014A00
- // 5D4D5D4D
- // 00004000
- // AAC616" ;
+ int s = 62430 ;
+ //String hex = "AA0018AA16015301150599800001100000014A005D4D5D4D00004000AA7E16" ;
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) ;
-// 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)) ;
-// }
+ int crc = new CRC16().CRC16_table(bs, 0 , bs.length - 1) ;
+ byte[] crcBs = new byte[4] ;
+ ByteUtil.int2Bytes_BE(crcBs, crc, 0);
+ System.out.println(ByteUtil.bytes2Hex(crcBs, true)) ;
+
+ // F4 8C 16
+ String hex1 = "AA 02 0C AA 16 02 53 01 15 05 99 80 00 00 00 00 10 40 00 20 81 41 00 00 F1 F6 00 00 8B 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 8D 41 00 00 00 00 00 00 00 00 00 00 8F 41 00 00 91 41 00 00 93 41 00 00 93 41 00 00 69 23 01 00 93 41 00 00 93 41 00 00 93 41 00 00 93 41 00 00 93 41 00 00 93 41 00 00 93 41 00 00 93 41 00 00 FD 38 01 00 93 41 00 00 6D 39 01 00 DD 39 01 00 93 41 00 00 55 E0 00 00 93 41 00 00 93 41 00 00 93 41 00 00 29 DC 00 00 93 41 00 00 93 41 00 00 93 41 00 00 93 41 00 00 93 41 00 00 93 41 00 00 93 41 00 00 93 41 00 00 93 41 00 00 05 A7 00 00 93 41 00 00 00 F0 02 F8 00 F0 30 F8 0C A0 30 C8 08 38 24 18 2D 18 A2 46 67 1E AB 46 54 46 5D 46 AC 42 01 D1 00 F0 22 F8 7E 46 0F 3E 0F CC B6 46 01 26 33 42 00 D0 FB 1A A2 46 AB 46 33 43 18 47 F8 48 01 00 18 49 01 00 00 23 00 24 00 25 00 26 10 3A 01 D3 78 C1 FB D8 52 07 00 D3 30 C1 00 D5 0B 60 70 47 1F B5 1F BD 10 B5 10 BD 01 F0 44 F9 11 46 FF F7 F7 FF 12 F0 1B F8 01 F0 5C F9 03 B4 FF F7 F2 FF 03 BC 01 F0 91 F9 00 00 70 B5 05 46 0C 46 16 46 02 E0 0F CC 0F C5 10 3E 10 2E FA D2 08 2E 02 D3 03 CC 03 C5 08 3E 04 2E 07 D3 01 CC 01 C5 36 1F 03 E0 21 78 29 70 64 1C 6D 1C 76 1E F9 D2 70 BD 07 48 80 47 07 48 00 47 FE E7 FE E7 FE E7 FE E7 FE E7 FE E7 04 48 05 49 05 4A 06 4B 70 47 00 00 01 37 01 00 C1 40 00 00 10 28 00 20 10 40 00 20 10 30 00 20 10 30 00 20 43 43 51 43 30 B5 5C 18 01 0C 13 0C 0D 46 92 B2 5D 43 80 B2 51 43 2C 19 05 46 55 43 0A 0C 09 04 4D 19 62 41 58 43 01 0C 00 04 40 19 51 41 30 BD FE B5 05 46 10 46 0C 46 18 43 73 D0 AE 46 8C 46 00 20 AD 1A 01 46 9C 41" ;
+ hex1 = hex1.replaceAll(" ", "") ;
+ bs = ByteUtil.hex2Bytes(hex1) ;
+ crc = new CRC16().CRC16_table(bs, 0 , bs.length - 1) ;
+ crcBs = new byte[4] ;
+ ByteUtil.int2Bytes_BE(crcBs, crc, 0);
+ System.out.println(ByteUtil.bytes2Hex(crcBs, true)) ;
+
+
+ // 98 D1 16
+ String hex2 = "AA 02 0C AA 16 02 53 01 15 05 99 80 00 00 02 00 67 D3 66 46 00 27 01 24 3D 46 B6 1A 9D 41 02 D3 13 46 3A 46 21 24 65 46 76 46 2F 04 36 0C 3E 43 2D 0C B6 1A 9D 41 04 D3 15 0C 1B 04 2B 43 12 04 10 34 65 46 76 46 2F 06 36 0A 3E 43 2D 0A B6 1A 9D 41 04 D3 15 0E 1B 02 2B 43 12 02 08 34 65 46 76 46 2F 07 36 09 3E 43 2D 09 B6 1A 9D 41 04 D3 15 0F 1B 01 2B 43 12 01 24 1D 65 46 76 46 AF 07 B6 08 3E 43 AD 08 B6 1A 9D 41 04 D3 95 0F 9B 00 2B 43 92 00 A4 1C 65 46 76 46 EF 07 76 08 3E 43 6D 08 B6 1A 9D 41 1A D3 92 18 5B 41 64 1C 16 E0 00 18 76 46 65 46 49 41 B7 1A 9D 41 01 91 00 90 09 D3 60 46 B1 1A 98 41 8E 46 84 46 00 98 01 99 00 25 40 1C 69 41 DD 07 52 08 2A 43 5B 08 64 1E E6 D5 72 46 63 46 03 B0 F0 BD FF E7 00 20 01 46 C0 46 C0 46 2A 46 23 46 F5 E7 30 B5 05 46 0B 46 2A 46 1C 78 10 78 52 1C 5B 1C 00 28 01 D0 A0 42 F7 D0 00 2C 03 D0 00 28 02 D0 6D 1C EF E7 28 46 30 BD 00 00 30 B5 44 1C 03 E0 01 78 40 1C 00 29 0D D0 81 07 F9 D1 0B 4B DD 01 04 C8 D1 1A 91 43 29 40 FA D0 00 1B 0A 06 03 D0 C0 1E 30 BD 00 1B 30 BD 0A 04 01 D0 80 1E 30 BD 09 02 FC D0 40 1E 30 BD 00 00 01 01 01 01 F8 B5 04 2A 2C D3 83 07 12 D0 0B 78 49 1C 03 70 40 1C 52 1E 83 07 0B D0 0B 78 49 1C 03 70 40 1C 52 1E 83 07 04 D0 0B 78 49 1C 03 70 40 1C 52 1E 8B 07 9B 0F 05 D0 C9 1A DF 00 20 23 DE 1B 08 C9 0A E0 FF F7 D5 FE F8 BD 1D 46 08 C9 FD 40 1C 46 B4 40 2C 43 10 C0 12 1F 04 2A F5 D2 F3 08 C9 1A 52 1E F0 D4 0B 78 49 1C 03 70 40 1C 52 1E EA D4 0B 78 49 1C 03 70 40 1C 01 2A E4 D4 09 78 01 70 F8 BD 01 E0 04 C0 09 1F 04 29 FB D2 8B 07 01 D5 02 80 80 1C C9 07 00 D0 02 70 70 47 00 29 0B D0 C3 07 02 D0 02 70 40 1C" ;
+ hex2 = hex2.replaceAll(" ", "") ;
+ bs = ByteUtil.hex2Bytes(hex2) ;
+ crc = new CRC16().CRC16_table(bs, 0 , bs.length - 1) ;
+ crcBs = new byte[4] ;
+ ByteUtil.int2Bytes_BE(crcBs, crc, 0);
+ System.out.println(ByteUtil.bytes2Hex(crcBs, true)) ;
}
}
--
Gitblit v1.8.0