From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java
index b9a916e..634534a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java
@@ -52,6 +52,17 @@
bsNoTail[ProtocolConstantV206V1.dataLenIndex] = (byte)len ;
}
+ public static void createLen4PUg(byte[] bytes) throws Exception {
+ int len = bytes.length - 4;
+ byte[] bs = ByteUtil.int2BCD_LE(len) ;
+ if(bs != null && bs.length == 1){
+ bytes[1] = bs[0] ;
+ }else if(bs != null && bs.length > 1){
+ bytes[1] = bs[0] ;
+ bytes[2] = bs[1] ;
+ }
+ }
+
/**
* 鐢熸垚IC鍗＄紪鐮�
@@ -81,9 +92,9 @@
}
public static byte[] createCrcTail4Ug(byte[] bsNoTail) throws Exception {
- int crc = new CRC16().CRC(bsNoTail, 0, bsNoTail.length -1) ;
+ short crc = new CRC16().CRC(bsNoTail, 0, bsNoTail.length -1) ;
byte[] bytes = new byte[ProtocolConstantV206V1.UG_lenTail] ;
- ByteUtilUnsigned.short2Bytes_BE(bytes, crc, 0);
+ ByteUtil.short2Bytes_BE(bytes, crc, 0);
bytes[2] = ProtocolConstantV206V1.P_Tail_Byte ;
return bytes ;
}
--
Gitblit v1.8.0