之前的打印日志不对 修改

pom.xml

@@ -35,7 +35,7 @@
         <protocol.version>1.2.21</protocol.version>
         <iec104.version>1.4.26</iec104.version>
         <modbus.version>1.2.6</modbus.version>
-        <cdt.version>1.0.0</cdt.version>
+        <cdt.version>1.0.1</cdt.version>
     </properties>
     <distributionManagement>
         <repository>

protocol-iec104/src/main/java/wei/yigulu/iec104/asdudataframe/NoQualityNormalizedIntegerType.java

@@ -166,7 +166,7 @@ public class NoQualityNormalizedIntegerType extends AbstractDataFrameType {
 			s.append( addresses.get(0).toString() + "\n");
 			int i=0;
 			for (Integer e : datas) {
-				s.append("点位："+addresses.get(0)+(i++)+",");
+				s.append("点位："+(addresses.get(0).getAddress()+(i++))+",");
 				s.append( "值为 ：" + e + "\n");
 			}
 		} else {

protocol-iec104/src/main/java/wei/yigulu/iec104/asdudataframe/NormalizedIntegerType.java

@@ -194,7 +194,7 @@ public class NormalizedIntegerType extends AbstractDataFrameType {
 			s.append(addresses.get(0).toString() + "\n");
 			int i=0;
 			for (Map.Entry<IeMeasuredQuality, Integer> e : datas.entrySet()) {
-				s.append("点位："+addresses.get(0)+(i++)+",");
+				s.append("点位："+(addresses.get(0).getAddress()+(i++))+",");
 				s.append("值为 ：" + e.getValue() + ";" + e.getKey().toString() + "\n");
 			}
 		} else {

protocol-iec104/src/main/java/wei/yigulu/iec104/asdudataframe/ShortFloatType.java

@@ -196,7 +196,7 @@ public class ShortFloatType extends AbstractDataFrameType {
 			s.append(addresses.get(0).toString() + "\n");
 			int i=0;
 			for (Map.Entry<IeMeasuredQuality, Float> e : datas.entrySet()) {
-				s.append("点位："+addresses.get(0)+(i++)+",");
+				s.append("点位："+(addresses.get(0).getAddress()+(i++))+",");
 				s.append( "值为 ：" + e.getValue() + ";" + e.getKey().toString() + "\n");
 			}
 		} else {

protocol-iec104/src/main/java/wei/yigulu/iec104/asdudataframe/ShortIntegerType.java

@@ -195,7 +195,7 @@ public class ShortIntegerType extends AbstractDataFrameType {
 			s.append(addresses.get(0).toString() + "\n");
 			int i=0;
 			for (Map.Entry<IeMeasuredQuality, Integer> e : datas.entrySet()) {
-				s.append("点位："+addresses.get(0)+(i++)+",");
+				s.append("点位："+(addresses.get(0).getAddress()+(i++))+",");
 				s.append("值为 ：" + e.getValue() + ";" + e.getKey().toString() + "\n");
 			}
 		} else {

protocol-iec104/src/test/java/ClientTest.java

@@ -1,4 +1,5 @@
 import wei.yigulu.iec104.nettyconfig.Iec104HSMasterBuilder;
+import wei.yigulu.iec104.util.SendDataFrameHelper;
 
 
 /**
@@ -10,9 +11,15 @@ import wei.yigulu.iec104.nettyconfig.Iec104HSMasterBuilder;
  **/
 public class ClientTest {
 
-	public static void main(String[] args) {
-		new Iec104HSMasterBuilder("192.168.31.28", 2404).create();
-		System.out.println(123);
-	}
+    public static void main(String[] args) throws Exception {
+        Iec104HSMasterBuilder a = new Iec104HSMasterBuilder("127.0.0.1", 2404);
+        a.createByUnBlock();
+        Thread.sleep(5000L);
+        for (;;){
+            Thread.sleep(3000L);
+            SendDataFrameHelper.sendTotalSummonFrame(a.getFuture().channel(),1,6,a.getLog());
+        }
+
+    }
 
 }

protocol-iec104/src/test/java/TestTotalS.java

@@ -16,11 +16,11 @@ public class TestTotalS extends TotalSummonType {
 
 	@Override
 	public byte[][] handleAndAnswer(Apdu apdu) throws Exception {
-		Map<Integer,Boolean> booleans=new HashMap<>();
+		Map<Integer,Number> booleans=new HashMap<>();
 		for(int i =0 ;i<100;i++){
-			booleans.put(i,true);
+			booleans.put(16385+i,0.2);
 		}
-		SendDataFrameHelper.sendYxDataFrame(apdu.getChannel(),booleans,1,20,null);
+		SendDataFrameHelper.sendYcDataFrame(apdu.getChannel(),booleans,1,20,null);
 		return null;
 	}