From 8910275656c9bf398832dc14957a03684a593e96 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 30 八月 2024 15:16:58 +0800
Subject: [PATCH] 2024-08-30 朱宝民 修改配置文件bug
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 42c9190..9918155 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 ;
}
@@ -172,9 +180,9 @@
public byte createCtrl(byte dir, byte funcCode){
byte b = dir;//DIR = 1(0x80)锛岃〃绀烘甯ф姤鏂囨槸鐢辩粓绔彂鍑虹殑涓婅鎶ユ枃锛�
b = (byte)(b | funcCode) ;
- //DIV = 1(0x40)锛岃〃绀烘鎶ユ枃宸茶鎷嗗垎涓鸿嫢骞插抚
- //FCB = 1(0x08)锛岃〃绀哄彧鍙戜竴娆�
- b = (byte)(b |0x08) ;
+ //DIV = 1(0x20)锛岃〃绀烘鎶ユ枃宸茶鎷嗗垎涓鸿嫢骞插抚
+ //FCB = 1(0x10)锛岃〃绀哄彧鍙戜竴娆�
+ b = (byte)(b |0x10) ;
//DIR = 0 涓嬭锛屽垯鍔熻兘鐮侀噰鐢�0
return b ;
}
--
Gitblit v1.8.0