From e98a7d02128e745fbbdd1e114878a1762a5e5849 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 22 七月 2020 12:54:39 +0800
Subject: [PATCH] 修改通讯
---
src/com/data/PowerArk_SocketCliet_Thread.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/com/data/PowerArk_SocketCliet_Thread.java b/src/com/data/PowerArk_SocketCliet_Thread.java
index ed72d44..9edf19a 100644
--- a/src/com/data/PowerArk_SocketCliet_Thread.java
+++ b/src/com/data/PowerArk_SocketCliet_Thread.java
@@ -100,7 +100,7 @@
if(run_count % 2 ==0 ) {
//读取V区各个按钮状态 02-18
- basedata = new BaseData(Modbus_ComBase.READ_HOLDING_REGISTER, Modbus_ComBase.LocalControl_Start_Addr, 17);
+ basedata = new BaseData(Modbus_ComBase.READ_HOLDING_REGISTER, Modbus_ComBase.ActualSetPower_Start_Addr, 17);
if(SocketComm(basedata.createReadData(), socket)) {
//读取V区状态成功
}
@@ -441,9 +441,19 @@
if(control.set_power >= CMD_Start) {
//设定功率
- basedata = new BaseData(Modbus_ComBase.WRITE_MULTIPLE_REGISTER, Modbus_ComBase.SetPower_Start_Addr, 1);
+ basedata = new BaseData(Modbus_ComBase.WRITE_MULTIPLE_REGISTER, Modbus_ComBase.SetPower_Start_Addr, 2);
+ if(SocketComm(basedata.createWiriteData(BaseData.createFloatByte(control.set_power)), socket)) {
+ control.set_power = CMD_SUCCESS;
+ }
control.set_power = CMD_FAIL;
- SocketComm(basedata.createWiriteData(BaseData.createFloatByte(control.set_power)), socket);
+ }
+ if(control.interval_time >= CMD_Start) {
+ //间隔时间
+ basedata = new BaseData(Modbus_ComBase.WRITE_MULTIPLE_REGISTER, Modbus_ComBase.InterTime_Start_Addr, 1);
+ if(SocketComm(basedata.createWiriteData(BaseData.createIntByte(control.interval_time)), socket)) {
+ control.interval_time = CMD_SUCCESS;
+ }
+ control.interval_time = CMD_FAIL;
}
//System.out.println(control);
PowerArk_ServerSocket_Thread_SQL.updateDynamicload_ControlTable(conn_pool, control);
@@ -575,7 +585,7 @@
//读取线圈数据成功[4013-4030]
if(baseData.addrstart == Modbus_ComBase.OverTmp_Start_Addr) {
if(dyna_inf.putReadIBackByteBuffer(bf)) {
- System.out.println("读取I区数据成功4013-4030");
+ //System.out.println("读取I区数据成功4013-4030");
issuccess = true;
}
}
@@ -583,7 +593,7 @@
//读取M区状态成功[01 - 12]
if(baseData.addrstart == Modbus_ComBase.AutoProcess1_Start_Addr) {
if(dyna_inf.putReadMBackByteBuffer(bf)) {
- System.out.println("读取M区数据成功01-12");
+ //System.out.println("读取M区数据成功01-12");
issuccess = true;
}
}
@@ -592,7 +602,7 @@
if(baseData.addrstart == Modbus_ComBase.ButtonOutPut_Start_Addr) {
//System.out.println("%%%%%%%%%%%%%%%%%%%%");
if(dyna_inf.putReadQBackByteBuffer(bf)) {
- System.out.println("读取Q区数据成功8000-8013");
+ //System.out.println("读取Q区数据成功8000-8013");
issuccess = true;
}
}
@@ -600,7 +610,7 @@
//读取M区各个控制的状态[0040-0160]
if(baseData.addrstart == Modbus_ComBase.LocalControl_Start_Addr) {
if(dyna_inf.putReadMControlStateByteBuffer(bf)) {
- System.out.println("读取M区数据成功0040-0160");
+ //System.out.println("读取M区数据成功0040-0160");
issuccess = true;
}
}
--
Gitblit v1.9.1