|
@@ -33,34 +33,34 @@ public class UnpackingMachineClient {
|
|
|
* 拆包机命令
|
|
|
*/
|
|
|
public enum REGISTER_CODE {
|
|
|
- //寄存器VB128
|
|
|
- REGISTER_CODE_128(1, 127, 1, 0),
|
|
|
- //寄存器VB129
|
|
|
- REGISTER_CODE_129(1, 128, 1, 0),
|
|
|
- //寄存器VB130
|
|
|
- REGISTER_CODE_130(1, 129, 1, 0),
|
|
|
- //寄存器VB131
|
|
|
- REGISTER_CODE_131(1, 130, 1, 0),
|
|
|
- //寄存器VB132
|
|
|
- REGISTER_CODE_132(1, 131, 1, 0),
|
|
|
- //寄存器VB133 皮带运行状态
|
|
|
- REGISTER_CODE_133(1, 132, 1, 0),
|
|
|
- //寄存器VB134
|
|
|
- REGISTER_CODE_134(1, 133, 1, 0),
|
|
|
- //寄存器VB135
|
|
|
- REGISTER_CODE_135(1, 134, 1, 0),
|
|
|
- //寄存器VB136
|
|
|
- REGISTER_CODE_136(1, 135, 1, 0),
|
|
|
- //寄存器VB137
|
|
|
- REGISTER_CODE_137(1, 136, 1, 0),
|
|
|
- //寄存器VB138
|
|
|
- REGISTER_CODE_138(1, 137, 1, 0),
|
|
|
- //寄存器VB139
|
|
|
- REGISTER_CODE_139(1, 138, 1, 0),
|
|
|
- //寄存器VB140
|
|
|
- REGISTER_CODE_140(1, 139, 1, 0),
|
|
|
- //寄存器VB141
|
|
|
- REGISTER_CODE_141(1, 140, 1, 0);
|
|
|
+ //寄存器VB128 VB129
|
|
|
+ REGISTER_CODE_1(1, 0, 1, 0),
|
|
|
+ //寄存器VB130 VB131
|
|
|
+ REGISTER_CODE_2(1, 1, 1, 0),
|
|
|
+ //寄存器VB132 VB133
|
|
|
+ REGISTER_CODE_3(1, 2, 1, 0),
|
|
|
+ //寄存器VB134 VB135
|
|
|
+ REGISTER_CODE_4(1, 3, 1, 0),
|
|
|
+ //寄存器VB136 VB137
|
|
|
+ REGISTER_CODE_5(1, 4, 1, 0),
|
|
|
+ //寄存器VB138 VB139
|
|
|
+ REGISTER_CODE_6(1, 5, 1, 0),
|
|
|
+ //寄存器VB140 VB141
|
|
|
+ REGISTER_CODE_7(1, 6, 1, 0);
|
|
|
+// //寄存器VB135
|
|
|
+// REGISTER_CODE_135(1, 134, 1, 0),
|
|
|
+// //寄存器VB136
|
|
|
+// REGISTER_CODE_136(1, 135, 1, 0),
|
|
|
+// //寄存器VB137
|
|
|
+// REGISTER_CODE_137(1, 136, 1, 0),
|
|
|
+// //寄存器VB138
|
|
|
+// REGISTER_CODE_138(1, 137, 1, 0),
|
|
|
+// //寄存器VB139
|
|
|
+// REGISTER_CODE_139(1, 138, 1, 0),
|
|
|
+// //寄存器VB140
|
|
|
+// REGISTER_CODE_140(1, 139, 1, 0),
|
|
|
+// //寄存器VB141
|
|
|
+// REGISTER_CODE_141(1, 140, 1, 0);
|
|
|
/**
|
|
|
* 从节点id
|
|
|
*/
|
|
@@ -106,67 +106,67 @@ public class UnpackingMachineClient {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 读拆包机1#各部件状态
|
|
|
+ * 读拆包机1# 2#各部件状态
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
public boolean[] readUnpacking01() {
|
|
|
- Number number = read(REGISTER_CODE_128.getSlaveId(), REGISTER_CODE_128.getOffset());
|
|
|
+ Number number = read(REGISTER_CODE_1.getSlaveId(), REGISTER_CODE_1.getOffset());
|
|
|
boolean[] booleans = ConvertUtil.convertToBooleans(number);
|
|
|
return booleans;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 读拆包机2#各部件状态
|
|
|
+ * 读拆包机3# 4#各部件状态
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
public boolean[] readUnpacking02() {
|
|
|
- Number number = read(REGISTER_CODE_129.getSlaveId(), REGISTER_CODE_129.getOffset());
|
|
|
+ Number number = read(REGISTER_CODE_2.getSlaveId(), REGISTER_CODE_2.getOffset());
|
|
|
boolean[] booleans = ConvertUtil.convertToBooleans(number);
|
|
|
return booleans;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 读拆包机3#各部件状态
|
|
|
+ * 读拆包机5# 皮带各部件状态
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
public boolean[] readUnpacking03() {
|
|
|
- Number number = read(REGISTER_CODE_130.getSlaveId(), REGISTER_CODE_130.getOffset());
|
|
|
+ Number number = read(REGISTER_CODE_3.getSlaveId(), REGISTER_CODE_3.getOffset());
|
|
|
boolean[] booleans = ConvertUtil.convertToBooleans(number);
|
|
|
return booleans;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 读拆包机4#各部件状态
|
|
|
+ * 读拆包机1# 2#各部件电机状态
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
public boolean[] readUnpacking04() {
|
|
|
- Number number = read(REGISTER_CODE_131.getSlaveId(), REGISTER_CODE_131.getOffset());
|
|
|
+ Number number = read(REGISTER_CODE_4.getSlaveId(), REGISTER_CODE_4.getOffset());
|
|
|
boolean[] booleans = ConvertUtil.convertToBooleans(number);
|
|
|
return booleans;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 读拆包机5#各部件状态
|
|
|
+ * 读拆包机3# 4#各部件电机状态
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
public boolean[] readUnpacking05() {
|
|
|
- Number number = read(REGISTER_CODE_132.getSlaveId(), REGISTER_CODE_132.getOffset());
|
|
|
+ Number number = read(REGISTER_CODE_5.getSlaveId(), REGISTER_CODE_5.getOffset());
|
|
|
boolean[] booleans = ConvertUtil.convertToBooleans(number);
|
|
|
return booleans;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 读皮带运行状态
|
|
|
+ * 读5# 拆包机皮带电机运行状态
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
public boolean[] readBelt() {
|
|
|
- Number number = read(REGISTER_CODE_133.getSlaveId(), REGISTER_CODE_133.getOffset());
|
|
|
+ Number number = read(REGISTER_CODE_6.getSlaveId(), REGISTER_CODE_6.getOffset());
|
|
|
boolean[] booleans = ConvertUtil.convertToBooleans(number);
|
|
|
return booleans;
|
|
|
}
|
|
@@ -222,45 +222,53 @@ public class UnpackingMachineClient {
|
|
|
// }
|
|
|
|
|
|
/**
|
|
|
- * 读拆包机就地/远程 1# 2# 3#拆包机启动
|
|
|
+ * 读拆包机就地/远程 1# 2# 3# 4# 5#拆包机启动/停止
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
public boolean[] readUnpackingRemoteInPlace01() {
|
|
|
- Number number = read(REGISTER_CODE_140.getSlaveId(), REGISTER_CODE_140.getOffset());
|
|
|
+ Number number = read(REGISTER_CODE_7.getSlaveId(), REGISTER_CODE_7.getOffset());
|
|
|
boolean[] booleans = ConvertUtil.convertToBooleans(number);
|
|
|
return booleans;
|
|
|
}
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * 写拆包机就地/远程 1# 2# 3#拆包机启动
|
|
|
+ * 写拆包机就地/远程 1# 2# 3# 4# 5#拆包机启动/停止
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
public Boolean writeUnpackingRemoteInPlace01(int value) {
|
|
|
- return write(REGISTER_CODE_140.getSlaveId(), REGISTER_CODE_140.getOffset(), value);
|
|
|
+ return write(REGISTER_CODE_7.getSlaveId(), REGISTER_CODE_7.getOffset(), value);
|
|
|
}
|
|
|
-
|
|
|
- /**
|
|
|
- * 读4# 5#拆包机启动 1# 2# 3# 4# 5#拆包机停止
|
|
|
- *
|
|
|
- * @return
|
|
|
- */
|
|
|
- public boolean[] readUnpackingRemoteInPlace02() {
|
|
|
- Number number = read(REGISTER_CODE_141.getSlaveId(), REGISTER_CODE_141.getOffset());
|
|
|
- boolean[] booleans = ConvertUtil.convertToBooleans(number);
|
|
|
- return booleans;
|
|
|
- }
|
|
|
-
|
|
|
+//
|
|
|
/**
|
|
|
- * 写 4# 5#拆包机启动 1# 2# 3# 4# 5#拆包机停止
|
|
|
+ *联锁VB128 VB129
|
|
|
*
|
|
|
- * @return
|
|
|
+ *@return
|
|
|
*/
|
|
|
- public Boolean writeUnpackingRemoteInPlace02(int value) {
|
|
|
- return write(REGISTER_CODE_141.getSlaveId(), REGISTER_CODE_141.getOffset(), value);
|
|
|
+ public boolean writeUnpacking01(int value){
|
|
|
+ return write(REGISTER_CODE_1.getSlaveId(),REGISTER_CODE_1.getOffset(),value);
|
|
|
}
|
|
|
+// /**
|
|
|
+// * 读4# 5#拆包机启动 1# 2# 3# 4# 5#拆包机停止
|
|
|
+// *
|
|
|
+// * @return
|
|
|
+// */
|
|
|
+// public boolean[] readUnpackingRemoteInPlace02() {
|
|
|
+// Number number = read(REGISTER_CODE_141.getSlaveId(), REGISTER_CODE_141.getOffset());
|
|
|
+// boolean[] booleans = ConvertUtil.convertToBooleans(number);
|
|
|
+// return booleans;
|
|
|
+// }
|
|
|
+//
|
|
|
+// /**
|
|
|
+// * 写 4# 5#拆包机启动 1# 2# 3# 4# 5#拆包机停止
|
|
|
+// *
|
|
|
+// * @return
|
|
|
+// */
|
|
|
+// public Boolean writeUnpackingRemoteInPlace02(int value) {
|
|
|
+// return write(REGISTER_CODE_141.getSlaveId(), REGISTER_CODE_141.getOffset(), value);
|
|
|
+// }
|
|
|
// public boolean[] read1(){
|
|
|
// return read(1, 128, 1);
|
|
|
// }
|
|
@@ -277,7 +285,7 @@ public class UnpackingMachineClient {
|
|
|
*/
|
|
|
public Number read(int slaveId, int offset) {
|
|
|
ModbusMasterUtil modbusMasterUtil = modbusTcpMasterTemplateSecond.getModbusMasterUtil();
|
|
|
- return modbusMasterUtil.readHoldingRegister(slaveId, offset, DATA_TYPE_WRAPPER.ONE_BYTE_INT_UNSIGNED_LOWER);
|
|
|
+ return modbusMasterUtil.readHoldingRegister(slaveId, offset, DATA_TYPE_WRAPPER.TWO_BYTE_INT_UNSIGNED);
|
|
|
}
|
|
|
|
|
|
/**
|