From 4730ab25065e6e472341424fa317427638e472f8 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期二, 21 七月 2020 10:47:10 +0800
Subject: [PATCH] 解析8000
---
src/com/dev/base/data/Dynamicload_inf.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/com/dev/base/data/Dynamicload_inf.java b/src/com/dev/base/data/Dynamicload_inf.java
index 1d8e2f7..846af88 100644
--- a/src/com/dev/base/data/Dynamicload_inf.java
+++ b/src/com/dev/base/data/Dynamicload_inf.java
@@ -75,20 +75,24 @@
if(datacount < 28) {
return false;
}
- button.FZ_ex1 = ComBase.changeShortToInt(bf.getShort()); //FZ输出按钮1 8000
- button.FZ_ex2 = ComBase.changeShortToInt(bf.getShort()); //FZ输出按钮2 8001
- button.FZ_ex3 = ComBase.changeShortToInt(bf.getShort()); //FZ输出按钮3 8002
- button.FZ_ex4 = ComBase.changeShortToInt(bf.getShort()); //FZ输出按钮4 8003
- button.FZ_ex5 = ComBase.changeShortToInt(bf.getShort()); //FZ输出按钮5 8004
- button.FZ_ex6 = ComBase.changeShortToInt(bf.getShort()); //FZ输出按钮6 8005
- button.FZ_ex7 = ComBase.changeShortToInt(bf.getShort()); //FZ输出按钮7 8006
- button.FZ_ex8 = ComBase.changeShortToInt(bf.getShort()); //FZ输出按钮8 8007
- button.FZ_ex9 = ComBase.changeShortToInt(bf.getShort()); //FZ输出按钮9 8008
- button.FZ_ex10 = ComBase.changeShortToInt(bf.getShort()); //FZ输出按钮10 8009
- button.FZ_ex11 = ComBase.changeShortToInt(bf.getShort()); //FZ输出按钮11 8010
- state.all_open = ComBase.changeShortToInt(bf.getShort()); //允许合闸 8011
- int backup1 = ComBase.changeShortToInt(bf.getShort()); //备用 8012
- state.fan_output = ComBase.changeShortToInt(bf.getShort()); //风机输出 8013
+ int code = ComBase.changeShortToInt(bf.get());
+ button.FZ_ex1 = ((code & ComBase.my_power_2(0))>0)?1:0;
+ button.FZ_ex2 = (code & ComBase.my_power_2(1))>0?1:0;
+ button.FZ_ex3 = (code & ComBase.my_power_2(2))>0?1:0;
+ button.FZ_ex4 = (code & ComBase.my_power_2(3))>0?1:0;
+ button.FZ_ex5 = (code & ComBase.my_power_2(4))>0?1:0;
+ button.FZ_ex6 = (code & ComBase.my_power_2(5))>0?1:0;
+ button.FZ_ex7 = (code & ComBase.my_power_2(6))>0?1:0;
+ button.FZ_ex8 = (code & ComBase.my_power_2(7))>0?1:0;
+
+ code = ComBase.changeShortToInt(bf.get());
+ button.FZ_ex9 = (code & ComBase.my_power_2(0))>0?1:0;
+ button.FZ_ex10 = (code & ComBase.my_power_2(1))>0?1:0;
+ button.FZ_ex11 = (code & ComBase.my_power_2(2))>0?1:0;
+ state.all_open = (code & ComBase.my_power_2(3))>0?1:0;
+ int backup1 = (code & ComBase.my_power_2(4))>0?1:0;
+ state.fan_output = (code & ComBase.my_power_2(5))>0?1:0;
+ //state.fan_output = ComBase.changeShortToInt(bf.getShort()); //风机输出 8013
return true;
}
--
Gitblit v1.9.1