From e28e76294a694bc7d37f2eb78319c089827c9796 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期五, 09 十月 2020 16:01:49 +0800
Subject: [PATCH] 将实际设定功率改成float类型
---
src/com/dev/base/data/Dynamicload_state.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/com/dev/base/data/Dynamicload_state.java b/src/com/dev/base/data/Dynamicload_state.java
index 4b8c33c..0b6d15a 100644
--- a/src/com/dev/base/data/Dynamicload_state.java
+++ b/src/com/dev/base/data/Dynamicload_state.java
@@ -256,19 +256,19 @@
batch.addLocator(2,MyModbusUtils.createBaseLocator(10 , master));
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(4,MyModbusUtils.createBaseLocator(1,DataType.FOUR_BYTE_FLOAT, 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.TWO_BYTE_INT_SIGNED, master));
- batch.addLocator(6,MyModbusUtils.createBaseLocator(8,DataType.TWO_BYTE_INT_SIGNED, 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(4,MyModbusUtils.createBaseLocator(2,DataType.FOUR_BYTE_FLOAT, master)); //实际设定功率4
+ batch.addLocator(5,MyModbusUtils.createBaseLocator(4,DataType.TWO_BYTE_INT_SIGNED, master));//已输出功率
+ batch.addLocator(6,MyModbusUtils.createBaseLocator(8,DataType.TWO_BYTE_INT_SIGNED, 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
}
@@ -306,12 +306,12 @@
this.sudden_crease = MyModbusUtils.readBooleanToInt(res.getValue(2));
this.all_open = MyModbusUtils.readBooleanToInt(res.getValue(3));
- this.actual_set_power = MyModbusUtils.readShortToFloat(res.getValue(4));
- this.output_power = MyModbusUtils.readShortToFloat(res.getValue(5));
- 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));
+ this.actual_set_power = MyModbusUtils.readFloat(res.getValue(4)); //实际设定功率
+ this.output_power = MyModbusUtils.readShortToFloat(res.getValue(5)); //已输出功率
+ 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)); //电流
this.allow_close= MyModbusUtils.readBooleanToInt(res.getValue(10));
--
Gitblit v1.9.1