From 352671be91b3798192be681282d778634a8de9ff Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq,com>
Date: 星期二, 15 九月 2020 16:12:30 +0800
Subject: [PATCH] 修改
---
Motor_MonitorServer/src/com/motor/conn/Motor_SocketClient_Thread.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Motor_MonitorServer/src/com/motor/conn/Motor_SocketClient_Thread.java b/Motor_MonitorServer/src/com/motor/conn/Motor_SocketClient_Thread.java
index 9b45d88..ee56ec0 100644
--- a/Motor_MonitorServer/src/com/motor/conn/Motor_SocketClient_Thread.java
+++ b/Motor_MonitorServer/src/com/motor/conn/Motor_SocketClient_Thread.java
@@ -127,8 +127,8 @@
* @param motor2
*/
private void readMutilMotorAlarmData(MyModbusMaster master2, Motor_inf motor2) {
- BatchRead<Integer> batch = motor2.createBatchRead(master);
- BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master);
+ BatchRead<Integer> batch = motor2.createBatchRead(master2);
+ BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master2);
motor2.putBatchResult(res);
}
@@ -182,8 +182,8 @@
* @param subject_state2
*/
private void readMutilSubjectMotorSingnal(MyModbusMaster master2, Subject_motor_state subject_state2) {
- BatchRead<Integer> batch = subject_state2.createBatchRead(master);
- BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master);
+ BatchRead<Integer> batch = subject_state2.createBatchRead(master2);
+ BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master2);
subject_state2.putBatchResult(res);
}
@@ -228,8 +228,8 @@
* @param load_state2
*/
private void readMutilLoadMotorSingnal(MyModbusMaster master2, Load_motor_state load_state2) {
- BatchRead<Integer> batch = load_state2.createBatchRead(master);
- BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master);
+ BatchRead<Integer> batch = load_state2.createBatchRead(master2);
+ BatchResults<Integer> res = MyModbusUtils.readMutilRegisters(batch, master2);
load_state2.putBatchResult(res);
--
Gitblit v1.9.1