版本升级 + bug修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>wei.yigulu</groupId>
     <artifactId>protocol</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <packaging>pom</packaging>
     <modules>
         <module>protocol-core</module>
@@ -32,8 +32,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <protocol.version>1.1.1</protocol.version>
-        <iec104.version>1.4.8</iec104.version>
+        <protocol.version>1.1.2</protocol.version>
+        <iec104.version>1.4.9</iec104.version>
         <modbus.version>1.2.3</modbus.version>
         <cdt.version>1.0.0</cdt.version>
     </properties>

protocol-all/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
     </parent>
 
 

protocol-cdt/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

protocol-cdt/src/main/java/wei/yigulu/cdt/netty/CDTMaster.java

@@ -4,6 +4,7 @@ package wei.yigulu.cdt.netty;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.DelimiterBasedFrameDecoder;
 import lombok.Getter;
+import lombok.Setter;
 import wei.yigulu.cdt.cdtframe.AbstractCDTDataHandler;
 import wei.yigulu.netty.AbstractRtuModeBuilder;
 import wei.yigulu.netty.ProtocolChannelInitializer;
@@ -19,7 +20,7 @@ public class CDTMaster extends AbstractRtuModeBuilder {
 
 	private static final int MAXLEN = 10240;
 
-	private static final byte[] HEAD = new byte[]{(byte) 0xEB, (byte) 0x90, (byte) 0xEB, (byte) 0x90, (byte) 0xEB, (byte) 0x90};
+	private  final byte[] HEAD = new byte[]{(byte) 0xEB, (byte) 0x90, (byte) 0xEB, (byte) 0x90, (byte) 0xEB, (byte) 0x90};
 
 	@Getter
 	private final AbstractCDTDataHandler dataHandler;

protocol-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

protocol-iec104/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

protocol-iec104/src/main/java/wei/yigulu/iec104/apdumodel/Apdu.java

@@ -281,8 +281,8 @@ public class Apdu {
 			bb = new byte[1][];
 			bb[0] = TechnicalTerm.STARTBACK;
 		} else if (this.apciType == ApciType.STARTDT_CON) {
-			bb = new byte[1][];
-			bb[0] = TechnicalTerm.GENERALINTERROGATION;
+			//bb = new byte[1][];
+			//bb[0] = TechnicalTerm.GENERALINTERROGATION;
 		} else if (this.apciType == ApciType.STOPDT_ACT) {
 			bb = new byte[1][];
 			bb[0] = TechnicalTerm.STOPBACK;

protocol-iec104/src/main/java/wei/yigulu/iec104/nettyconfig/AllCustomDelimiterHandler.java

@@ -25,8 +25,8 @@ public class AllCustomDelimiterHandler extends AbstractDelimiterHandler {
 
 
 	public AllCustomDelimiterHandler(){
-		maxTimeSpace=100;
-		maxLength=10240;
+		super.maxTimeSpace=100;
+		super.maxLength=10240;
 	}
 
 

protocol-modbus/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocol</artifactId>
         <groupId>wei.yigulu</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <version>${modbus.version}</version>

protocol-modbus/src/main/java/wei/yigulu/modbus/netty/ModbusRtuMasterDelimiterHandler.java

@@ -27,7 +27,7 @@ public class ModbusRtuMasterDelimiterHandler extends AbstractDelimiterHandler {
 	/**
 	 * 是否进行CRC校验判断
 	 */
-	private boolean doCrcCheck = true;
+	private boolean doCrcCheck = false;
 
 
 	@Override

protocol-modbus/src/test/java/TestRtuMaster.java

@@ -31,8 +31,8 @@ public class TestRtuMaster {
 		master3.createByUnBlock();*/
 		Thread.sleep(5000L);
 		Map<Integer, ModbusDataTypeEnum> map = new HashMap<>();
-		for (int i = 18; i < 100; i+=10) {
-			map.put(i , ModbusDataTypeEnum.CDAB);
+		for (int i = 0; i < 23; i+=1) {
+			map.put(2*i , ModbusDataTypeEnum.CDAB);
 		}
 		List<Obj4RequestRegister> ll = ModbusRequestDataUtils.splitModbusRequest(map, 1, FunctionCode.READ_HOLDING_REGISTERS);