From 95c0c2e94d390650d3954c30c6a7c805fe9c714c Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期四, 15 十月 2020 18:23:18 +0800
Subject: [PATCH] 负载添加历史实时数据记录功能
---
src/com/dev/base/data/Dynamicload_inf.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/src/com/dev/base/data/Dynamicload_inf.java b/src/com/dev/base/data/Dynamicload_inf.java
index 4a29bc1..d6be822 100644
--- a/src/com/dev/base/data/Dynamicload_inf.java
+++ b/src/com/dev/base/data/Dynamicload_inf.java
@@ -13,6 +13,7 @@
public int FZ_button_num; //负载柜按钮数量
public String note;
+ public int conn_state = 0;
public Dynamicload_button button;
public Dynamicload_control control;
public Dynamicload_state state;
@@ -155,11 +156,12 @@
public boolean putReadVBackByteBuffer(ByteBuffer bf) {
ByteBuffer tmpbf = bf;
int datacount = ComBase.changeByteToInt(bf.get());
- System.out.println("读取功率"+datacount);
+ //System.out.println("读取功率"+datacount);
if(datacount < 34) {
return false;
}
state.actual_set_power = bf.getFloat(); //设定功率 0002
+ //System.out.println("设定功率:"+state.actual_set_power);
state.output_power = bf.getFloat(); //已输出功率 0004
float value = bf.getFloat(); //备用 0006
state.set_power = bf.getFloat(); //设定功率 0008
@@ -167,6 +169,35 @@
int backup1 = ComBase.changeShortToInt(bf.getShort()); //备用 0012
int backup2 = ComBase.changeShortToInt(bf.getShort()); //备用 0013
value = bf.getFloat(); //备用 0014
+ state.interval_time = ComBase.changeShortToInt(bf.getShort());//间隔时间 0016
+ state.actual_curr = ComBase.changeShortToInt(bf.getShort());//实际电流 0017
+ state.actual_mov = ComBase.changeShortToInt(bf.getShort()); //间隔电压 0018
+ return true;
+ }
+
+ public boolean putReadVLongBackByteBuffer(ByteBuffer bf) {
+ ByteBuffer tmpbf = bf;
+ int datacount = ComBase.changeByteToInt(bf.get());
+ //System.out.println("读取功率"+datacount);
+ if(datacount < 34) {
+ return false;
+ }
+ bf.getShort();
+ state.actual_set_power = ComBase.changeShortToInt(bf.getShort()); //设定功率 0001
+ state.output_power = ComBase.changeShortToInt(bf.getShort()); //设定功率 0001
+ bf.getShort();
+ state.set_power = ComBase.changeShortToInt(bf.getShort()); //设定功率 0001
+ bf.getShort();
+
+ //state.actual_set_power = bf.getFloat(); //设定功率 0001
+ //System.out.println("设定功率:"+state.actual_set_power);
+ //state.output_power = bf.getFloat(); //已输出功率 0004
+ //float value = bf.getFloat(); //备用 0006
+ //state.set_power = bf.getFloat(); //设定功率 0008
+ //value = bf.getFloat(); //备用 0010
+ //int backup1 = ComBase.changeShortToInt(bf.getShort()); //备用 0012
+ //int backup2 = ComBase.changeShortToInt(bf.getShort()); //备用 0013
+ //value = bf.getFloat(); //备用 0014
state.interval_time = ComBase.changeShortToInt(bf.getShort());//间隔时间 0016
state.actual_curr = ComBase.changeShortToInt(bf.getShort());//实际电流 0017
state.actual_mov = ComBase.changeShortToInt(bf.getShort()); //间隔电压 0018
@@ -217,4 +248,6 @@
}
+
+
}
--
Gitblit v1.9.1