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_state.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/com/dev/base/data/Dynamicload_state.java b/src/com/dev/base/data/Dynamicload_state.java
index f2d354d..ff99a17 100644
--- a/src/com/dev/base/data/Dynamicload_state.java
+++ b/src/com/dev/base/data/Dynamicload_state.java
@@ -257,16 +257,16 @@
batch.addLocator(3,MyModbusUtils.createBaseLocator(11, master));//全部分闸
if(fz_button_num==11){
batch.addLocator(4,MyModbusUtils.createBaseLocator(1,DataType.TWO_BYTE_INT_SIGNED, master)); //实际设定功率4
- batch.addLocator(5,MyModbusUtils.createBaseLocator(2,DataType.TWO_BYTE_INT_SIGNED, master));//已输出功率
- batch.addLocator(6,MyModbusUtils.createBaseLocator(4,DataType.TWO_BYTE_INT_SIGNED, master));//设定功率
- batch.addLocator(7,MyModbusUtils.createBaseLocator(6,DataType.TWO_BYTE_INT_SIGNED,master)); //间隔时间
- batch.addLocator(8,MyModbusUtils.createBaseLocator(7,DataType.TWO_BYTE_INT_SIGNED, master));//实际电流
- batch.addLocator(9,MyModbusUtils.createBaseLocator(8,DataType.TWO_BYTE_INT_SIGNED, master));//实际电压4
+ batch.addLocator(5,MyModbusUtils.createBaseLocator(2,DataType.TWO_BYTE_INT_SIGNED, master)); //已输出功率
+ batch.addLocator(6,MyModbusUtils.createBaseLocator(4,DataType.TWO_BYTE_INT_SIGNED, master)); //设定功率
+ batch.addLocator(7,MyModbusUtils.createBaseLocator(6,DataType.TWO_BYTE_INT_SIGNED,master)); //间隔时间
+ batch.addLocator(8,MyModbusUtils.createBaseLocator(7,DataType.TWO_BYTE_INT_SIGNED, master)); //实际电流
+ batch.addLocator(9,MyModbusUtils.createBaseLocator(8,DataType.TWO_BYTE_INT_SIGNED, master)); //实际电压4
}else {
batch.addLocator(4,MyModbusUtils.createBaseLocator(2,DataType.TWO_BYTE_INT_SIGNED, master)); //实际设定功率4
batch.addLocator(5,MyModbusUtils.createBaseLocator(4,DataType.FOUR_BYTE_FLOAT, master)); //已输出功率
- batch.addLocator(6,MyModbusUtils.createBaseLocator(8,DataType.TWO_BYTE_INT_SIGNED, master));//设定功率
+ batch.addLocator(6,MyModbusUtils.createBaseLocator(8,DataType.FOUR_BYTE_FLOAT, master));//设定功率
batch.addLocator(7,MyModbusUtils.createBaseLocator(16,DataType.TWO_BYTE_INT_SIGNED,master));//间隔时间
batch.addLocator(8,MyModbusUtils.createBaseLocator(17,DataType.TWO_BYTE_INT_SIGNED, master));//实际电流
batch.addLocator(9,MyModbusUtils.createBaseLocator(18,DataType.TWO_BYTE_INT_SIGNED, master));//实际电压4
@@ -308,10 +308,11 @@
this.actual_set_power = MyModbusUtils.readShortToFloat(res.getValue(4)); //实际设定功率
if(fz_button_num == 11) {
this.output_power = MyModbusUtils.readShortToFloat(res.getValue(5)); //已输出功率
+ this.set_power = MyModbusUtils.readShortToFloat(res.getValue(6)); //设定功率
}else {
this.output_power = MyModbusUtils.readFloat(res.getValue(5)); //已输出功率
+ this.set_power = MyModbusUtils.readFloat(res.getValue(6)); //设定功率
}
- this.set_power = MyModbusUtils.readShortToFloat(res.getValue(6)); //设定功率
this.interval_time = MyModbusUtils.readShortToFloat(res.getValue(7)); //间隔时间
this.actual_curr = MyModbusUtils.readShortToFloat(res.getValue(8)); //电压
this.actual_mov= MyModbusUtils.readShortToFloat(res.getValue(9)); //电流
--
Gitblit v1.9.1