From 1f73540edbda5eca9da22ecd84bf134bd5523203 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq,com>
Date: 星期二, 29 十二月 2020 15:30:39 +0800
Subject: [PATCH] 修改
---
Rectifier_power_4MW/src/com/data/Rectifier_power.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Rectifier_power_4MW/src/com/data/Rectifier_power.java b/Rectifier_power_4MW/src/com/data/Rectifier_power.java
index 6ca2b8a..064769c 100644
--- a/Rectifier_power_4MW/src/com/data/Rectifier_power.java
+++ b/Rectifier_power_4MW/src/com/data/Rectifier_power.java
@@ -132,17 +132,17 @@
public BatchRead<Integer> createBatchRead(MyModbusMaster master) {
BatchRead<Integer> batch = new BatchRead<Integer>();
- batch.addLocator(0,MyModbusUtils.createInputLocator(1,master)); //'10kv开关合闸信号',
- batch.addLocator(1,MyModbusUtils.createInputLocator(2,master)); //'10kv开关分闸信号'
- batch.addLocator(2,MyModbusUtils.createInputLocator(3, master)); //'10KV高压开关允许合闸信号',
- batch.addLocator(3,MyModbusUtils.createInputLocator(4,master)); //'整流器故障跳闸信号',
- batch.addLocator(4,MyModbusUtils.createInputLocator(5,master)); //'大功率整流电源运行/停止状态信号',
- batch.addLocator(5,MyModbusUtils.createInputLocator(6,master)); //'大功率整流电源故障状态信号',
+ batch.addLocator(0,MyModbusUtils.createBaseLocator(1,master)); //'10kv开关合闸信号',
+ batch.addLocator(1,MyModbusUtils.createBaseLocator(2,master)); //'10kv开关分闸信号'
+ batch.addLocator(2,MyModbusUtils.createBaseLocator(3, master)); //'10KV高压开关允许合闸信号',
+ batch.addLocator(3,MyModbusUtils.createBaseLocator(4,master)); //'整流器故障跳闸信号',
+ batch.addLocator(4,MyModbusUtils.createBaseLocator(5,master)); //'大功率整流电源运行/停止状态信号',
+ batch.addLocator(5,MyModbusUtils.createBaseLocator(6,master)); //'大功率整流电源故障状态信号',
batch.addLocator(6,MyModbusUtils.createBaseLocator(7,DataType.TWO_BYTE_INT_SIGNED,master)); //'大功率整流电源电压信号',
batch.addLocator(7,MyModbusUtils.createBaseLocator(8,DataType.TWO_BYTE_INT_SIGNED,master)); //'大功率整流电源电流信号',
- batch.addLocator(8,MyModbusUtils.createInputLocator(9, master)); //'工艺、综控远方停止大功率整流器',
- batch.addLocator(9,MyModbusUtils.createInputLocator(10,master)); //'工艺、综控远方紧急停止大功率整流器',
- batch.addLocator(10,MyModbusUtils.createInputLocator(11,master)); //'通讯信号',
+ batch.addLocator(8,MyModbusUtils.createBaseLocator(9, master)); //'工艺、综控远方停止大功率整流器',
+ batch.addLocator(9,MyModbusUtils.createBaseLocator(10,master)); //'工艺、综控远方紧急停止大功率整流器',
+ batch.addLocator(10,MyModbusUtils.createBaseLocator(11,master)); //'通讯信号',
@@ -157,8 +157,8 @@
rectifier_falut = MyModbusUtils.readBooleanToInt(res.getValue(3)); //'整流器故障跳闸信号',
rectifier_power_state = MyModbusUtils.readBooleanToInt(res.getValue(4)); //'大功率整流电源运行/停止状态信号',
rectifier_alarm = MyModbusUtils.readBooleanToInt(res.getValue(5)); //'大功率整流电源故障状态信号',
- rectifier_vol = MyModbusUtils.readBooleanToInt(res.getValue(6)); //'大功率整流电源电压信号',
- rectifier_curr = MyModbusUtils.readBooleanToInt(res.getValue(7)); //'大功率整流电源电流信号',
+ rectifier_vol = MyModbusUtils.readShortToFloat(res.getValue(6)); //'大功率整流电源电压信号',
+ rectifier_curr = MyModbusUtils.readShortToFloat(res.getValue(7)); //'大功率整流电源电流信号',
remote_stop = MyModbusUtils.readBooleanToInt(res.getValue(8)); //'工艺、综控远方停止大功率整流器',
emergency_stop = MyModbusUtils.readBooleanToInt(res.getValue(9)); //'工艺、综控远方紧急停止大功率整流器',
com_signal = MyModbusUtils.readBooleanToInt(res.getValue(10)); //'通讯信号',
--
Gitblit v1.9.1