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/mw/protocol/p206V1/parse/Cd_1601_Down.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_1601_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_1601_Down.java index 26549ff..5600dd7 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_1601_Down.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_1601_Down.java @@ -87,12 +87,13 @@ ByteUtil.int2Bytes_BE(bs, vo.totalByte, 0); bytes = ByteUtil.bytesMerge(bytes, bs) ; - bs = new byte[2] ; - ByteUtil.short2Bytes_BE(bs, (short)vo.softCrc, 0); - bytes = ByteUtil.bytesMerge(bytes, bs) ; - - bs = new byte[2] ; - ByteUtil.short2Bytes_BE(bs, (short)vo.softCrc, 0); + bs = new byte[4] ; + byte[] crcBs = new byte[4] ; + ByteUtil.int2Bytes_BE(crcBs, vo.softCrc, 0); + bs[0] = crcBs[2] ; + bs[1] = crcBs[3] ; + bs[2] = crcBs[2] ; + bs[3] = crcBs[3] ; bytes = ByteUtil.bytesMerge(bytes, bs) ; bs = new byte[4] ; -- Gitblit v1.8.0