From e29b2f68e2062688c2d40209ba434e3e7932b92e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 十二月 2024 16:09:03 +0800
Subject: [PATCH] 修改升级数据中的CRC16验证算法，注意其是大端模块，与其他部分不一样
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_97_Up.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_97_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_97_Up.java
index 61ddfac..707f8ac 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_97_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_97_Up.java
@@ -3,7 +3,6 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1.*;
import com.dy.common.mw.protocol.p206V1.parse.global.GlParse;
-import com.dy.common.mw.protocol.p206V1.upVos.DataCd92Vo;
import com.dy.common.mw.protocol.p206V1.upVos.DataCd97Vo;
import com.dy.common.mw.protocol.rtuState.ValveStateInfo;
import org.apache.logging.log4j.LogManager;
@@ -29,7 +28,7 @@
@Override
public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception {
ParseParamsForUpV1 para = (ParseParamsForUpV1)params ;
- int bsLen = new CommonV1().parseDataLen(para.upBuffer) ;
+ int bsLen = new CommonV1().parseDataLen4P206(para.upBuffer) ;
if(bsLen > 0){
this.doParse(para.upBuffer,
bsLen,
@@ -51,7 +50,7 @@
callback.callback(midRs.reportOrResponse_trueOrFalse);
if(para.data != null && para.data.getSubData() != null){
- DataCd97Vo subData = (DataCd97Vo)para.data.getSubData() ;
+ DataCd97Vo subData = (DataCd97Vo)((DataV1)para.data.getSubData()).subData ;
callback.notify(new ValveStateInfo(subData.success));
}
return new MidResult[]{midRs} ;
--
Gitblit v1.8.0