From a1ba63732991ba7e5157787a1d683f40d8b40b3c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 18 十一月 2024 14:57:27 +0800
Subject: [PATCH] 实现新软件工程模块：RTU模块器，模块RTU远程升级
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
index 86f8b00..e5a19ef 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
@@ -15,14 +15,22 @@
public Boolean isThisProtocolHead(byte[] bs) throws Exception{
if(bs == null){
return null ;
- }else if(bs.length >= (ProtocolConstantV206V202404.ctrlIndex - 1)
+ }else if(bs.length >= ProtocolConstantV206V202404.ctrlIndex
&& bs[0] == ProtocolConstantV206V202404.P_Head_Byte){
if(bs[2] == ProtocolConstantV206V202404.P_Head_Byte){
- return true ;
+ if(bs[3] == (byte)0x80 || bs[3] == (byte)0x81){
+ return true ;
+ }else{
+ return false ;
+ }
}else if((byte)(bs[2] & 0xF8) == ProtocolConstantV206V202404.P_Head_Byte){
//濡傛灉鎺у埗鍩熴�佸湴鍧�鍩熴�佺敤鎴锋暟鎹煙(搴旂敤灞�)鐨勫瓧鑺傛�绘暟澶т簬255锛屽垯閫氳繃鎵╁睍绗簩涓紑濮嬪瓧绗�0x68鐨勪綆3浣嶄綔涓洪暱L鐨勯珮浣嶆墿灞�
//0xF8浜岃繘鍒讹細 11111000
- return true ;
+ if(bs[3] == (byte)0x80 || bs[3] == (byte)0x81){
+ return true ;
+ }else{
+ return false ;
+ }
}else{
return false ;
}
@@ -31,26 +39,6 @@
}
}
- /**
- * 妫�鏌ュご
- * @param bs 涓婅瀛楄妭鏁扮粍
- * @throws Exception 寮傚父
- */
- public void checkHead(byte[] bs) throws Exception{
- if(bs.length < ProtocolConstantV206V202404.lenHead2Code
- || bs[0] != ProtocolConstantV206V202404.P_Head_Byte){
- throw new Exception("涓婅鏁版嵁甯уご涓嶆纭紒") ;
- }else{
- if(bs.length >= ProtocolConstantV206V202404.lenHead2Code){
- if(bs[2] != ProtocolConstantV206V202404.P_Head_Byte
- && (byte)(bs[2] & 0xF8) != ProtocolConstantV206V202404.P_Head_Byte){
- throw new Exception("涓婅鏁版嵁甯уご涓嶆纭紒") ;
- }
- }else{
- throw new Exception("涓婅鏁版嵁甯уご涓嶆纭紒") ;
- }
- }
- }
/**
* 妫�鏌ュ熬
--
Gitblit v1.8.0