From 99bf09fbc855590e209dda4cd2b6c725101cbe9c Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 26 七月 2024 14:39:43 +0800 Subject: [PATCH] 1、完善代码,把开关阀类型编码改为BCD码; 2、制定并实现协议“定时关阀计划开阀(A1H)”和“定量关阀计划开阀(A2H)”. --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java index e53f268..625a92e 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/PrefixedDataAvailableV1_0_1.java @@ -11,6 +11,7 @@ @AnnotationPrefixedDataAvailable( + enable = true, protocolName = ProtocolConstantV206V1_0_0.protocolName, priority = ProtocolConstantV206V1_0_0.priority, onLineDataMinLength = ProtocolConstantV206V1_0_0.onLineDataMinLength, @@ -100,7 +101,7 @@ return null ; } - Integer dataLen = parseCommon.parseDataLen(preByte) ; + Integer dataLen = parseCommon.parseFrameLen(preByte) ; if(dataLen == null){ String headHex = ByteUtil.bytes2Hex(preByte, true) ; -- Gitblit v1.8.0