From 8461637e95df93dca243c3b81209a73814f0673c Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 14 十月 2020 17:30:04 +0800
Subject: [PATCH] 水冷系统添加部分有符号数
---
WaterSystem_MonitorServer/src/com/watersystem/monitor/Water_rt.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/WaterSystem_MonitorServer/src/com/watersystem/monitor/Water_rt.java b/WaterSystem_MonitorServer/src/com/watersystem/monitor/Water_rt.java
index 4db119c..089c52e 100644
--- a/WaterSystem_MonitorServer/src/com/watersystem/monitor/Water_rt.java
+++ b/WaterSystem_MonitorServer/src/com/watersystem/monitor/Water_rt.java
@@ -155,18 +155,18 @@
*/
public void putBatchResult(BatchResults<Integer> res) {
if(res != null) {
- this.cooling_flow = MyModbusUtils.readShortToFloat(res.getValue(0))/10;
- this.supply_tmp = MyModbusUtils.readShortToFloat(res.getValue(1))/10;
- this.Supply_pre = MyModbusUtils.readShortToFloat(res.getValue(2))/100;
- this.back_tem = MyModbusUtils.readShortToFloat(res.getValue(3))/10;
- this.back_pre = MyModbusUtils.readShortToFloat(res.getValue(4))/100;
+ this.cooling_flow = MyModbusUtils.readShortToFloat(res.getValue(0),true);
+ this.supply_tmp = MyModbusUtils.readShortToFloat(res.getValue(1),true)/10;
+ this.Supply_pre = MyModbusUtils.readShortToFloat(res.getValue(2),true)/100;
+ this.back_tem = MyModbusUtils.readShortToFloat(res.getValue(3),true)/10;
+ this.back_pre = MyModbusUtils.readShortToFloat(res.getValue(4),true)/100;
this.Cooling_ser = MyModbusUtils.readShortToFloat(res.getValue(5))/100;
this.Buffer_tank_level = MyModbusUtils.readShortToFloat(res.getValue(6));
- this.Buffer_tank_pre = MyModbusUtils.readShortToFloat(res.getValue(7))/100;
+ this.Buffer_tank_pre = MyModbusUtils.readShortToFloat(res.getValue(7),true)/100;
this.Humidity_chamber = MyModbusUtils.readShortToFloat(res.getValue(8))/10;
- this.Tem_chamber= MyModbusUtils.readShortToFloat(res.getValue(9))/10;
- this.External_tmp= MyModbusUtils.readShortToFloat(res.getValue(10))/10;
- this.External_pre = MyModbusUtils.readShortToFloat(res.getValue(11))/100;
+ this.Tem_chamber= MyModbusUtils.readShortToFloat(res.getValue(9),true)/10;
+ this.External_tmp= MyModbusUtils.readShortToFloat(res.getValue(10),true)/10;
+ this.External_pre = MyModbusUtils.readShortToFloat(res.getValue(11),true)/100;
}
}
--
Gitblit v1.9.1