From c40d049233f2706dd23aadf327dbf86ba0008a12 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十二月 2023 15:04:16 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java
index 4f13733..2567d99 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java
@@ -12,7 +12,6 @@
String rtuAddr1 = rtuAddr.substring(0, 6) ;
String rtuAddr2 = rtuAddr.substring(6) ;
- index++ ;
ByteUtil.string2BCD_BE(bs, rtuAddr1, index) ;
index += 3 ;
@@ -21,19 +20,19 @@
}
public static void createTp(byte[] bs, int index) throws Exception {
- ByteUtil.string2BCD_BE(bs, DateTime.yyMMddhhmmss(), index) ;
+ ByteUtil.string2BCD_LE(bs, DateTime.yyMMddhhmmss(), index) ;
}
- public static void createLen(byte[] bs) throws Exception {
- int len = bs.length + ProtocolConstantV206V1_0_0.lenTail;
- bs[ProtocolConstantV206V1_0_0.dataLenIndex] = (byte)len ;
+ public static void createLen(byte[] bsNoTail) throws Exception {
+ int len = bsNoTail.length - ProtocolConstantV206V1_0_0.lenHead2ctrl;
+ bsNoTail[ProtocolConstantV206V1_0_0.dataLenIndex] = (byte)len ;
}
- public static byte[] createCrcTail(byte[] bs) throws Exception {
- int crc = new CRC8_for_2_0().CRC8(bs, ProtocolConstantV206V1_0_0.ctrlIndex, bs.length -1) ;
- bs = new byte[ProtocolConstantV206V1_0_0.lenTail] ;
- bs[0] = (byte)crc ;
- bs[1] = ProtocolConstantV206V1_0_0.P_Tail_Byte ;
- return ByteUtil.bytesMerge(bs, bs) ;
+ public static byte[] createCrcTail(byte[] bsNoTail) throws Exception {
+ int crc = new CRC8_for_2_0().CRC8(bsNoTail, ProtocolConstantV206V1_0_0.ctrlIndex, bsNoTail.length -1) ;
+ byte[] bytes = new byte[ProtocolConstantV206V1_0_0.lenTail] ;
+ bytes[0] = (byte)crc ;
+ bytes[1] = ProtocolConstantV206V1_0_0.P_Tail_Byte ;
+ return bytes ;
}
}
--
Gitblit v1.8.0