Browse Source

该版本

xiuwei 3 years ago
parent
commit
63e4b16edc

+ 1 - 0
protocol-all/pom.xml

@@ -13,6 +13,7 @@
 
     <packaging>jar</packaging>
     <artifactId>protocol-all</artifactId>
+    <version>1.2.10</version>
 
     <dependencies>
         <dependency>

+ 2 - 1
protocol-modbus/src/main/java/wei/yigulu/modbus/netty/ModbusMasterBuilderInterface.java

@@ -2,6 +2,7 @@ package wei.yigulu.modbus.netty;
 
 import wei.yigulu.modbus.domain.synchronouswaitingroom.SynchronousWaitingRoom;
 import wei.yigulu.modbus.exceptiom.ModbusException;
+import wei.yigulu.netty.MasterInterface;
 
 /**
  * modbus  master的构建器
@@ -9,7 +10,7 @@ import wei.yigulu.modbus.exceptiom.ModbusException;
  * @author: xiuwei
  * @version:
  */
-public interface ModbusMasterBuilderInterface {
+public interface ModbusMasterBuilderInterface extends MasterInterface {
 
 
 	/**

+ 0 - 1
protocol-modbus/src/test/java/TestModbusRtuMasterWithTcpServer.java

@@ -26,7 +26,6 @@ public class TestModbusRtuMasterWithTcpServer {
 				map.put(i, ModbusDataTypeEnum.CDAB);
 			}
 			List<Obj4RequestRegister> ll = ModbusRequestDataUtils.splitModbusRequest(map, 1, FunctionCode.READ_HOLDING_REGISTERS);
-
 			for (; ; ) {
 				try {
 					Map<Integer, IModbusDataType> map1 = ModbusRequestDataUtils.getRegisterData(ss, ll);