From 6cf345bc8fe98d393320b89182f9293171aa19ff Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 22 四月 2025 16:39:55 +0800
Subject: [PATCH] 1、根据江海协议中开阀类型变化，修改相应代码； 2、江海协议RTU模拟器启动参数注释。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC8_for_2_0.java | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC8_for_2_0.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC8_for_2_0.java
index 047c0d7..1e8ba6b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC8_for_2_0.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC8_for_2_0.java
@@ -4,18 +4,34 @@
public class CRC8_for_2_0 {
@SuppressWarnings("unused")
+// public int CRC8(byte[] b, int from , int end){
+// int crc = 0;
+// for(int i = from ; i <= end ; i++){
+// crc = crc ^ (b[i]);
+// for(int j = 0; j < 8; j++) {
+// if((crc & 0x80)!=0) {
+// crc ^= 0xe5;
+// }
+// crc *= 2;
+// }
+// }
+// return crc;
+// }
+
public int CRC8(byte[] b, int from , int end){
- int crc = 0;
- for(int i = from ; i <= end ; i++){
- crc = crc ^ (b[i]);
- for(int j = 0; j < 8; j++) {
- if((crc & 0x80)!=0) {
- crc ^= 0xe5;
- }
- crc *= 2;
+ int crc = 0;
+ for(int i = from ; i <= end ; i++){
+ crc = crc ^ (b[i]);
+ for(int j = 0; j < 8; j++) {
+ if((crc & 0x80)!=0) {
+ crc *= 2;
+ crc ^= 0xe5;
+ }else{
+ crc *= 2;
+ }
}
- }
- return crc;
- }
+ }
+ return crc;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0