Bläddra i källkod

104 删除输出

xiuwei 3 år sedan
förälder
incheckning
3e01a3a918

+ 3 - 3
pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>wei.yigulu</groupId>
     <artifactId>protocol</artifactId>
-    <version>2.3.13</version>
+    <version>2.3.14</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>2.3.13</protocol.version>
-        <iec104.version>2.4.20</iec104.version>
+        <protocol.version>2.3.14</protocol.version>
+        <iec104.version>2.4.21</iec104.version>
         <modbus.version>2.2.7</modbus.version>
         <cdt.version>2.0.1</cdt.version>
     </properties>

+ 1 - 1
protocol-all/pom.xml

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

+ 1 - 1
protocol-cdt/pom.xml

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

+ 1 - 1
protocol-core/pom.xml

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

+ 1 - 1
protocol-iec104/pom.xml

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

+ 0 - 3
protocol-iec104/src/main/java/wei/yigulu/iec104/apdumodel/Cot.java

@@ -31,9 +31,6 @@ public class Cot {
 		test=(original&0xff)>>7==1;
 		negativeConfirm=(original&0x40)>>6==1;
 		not=value&0x3f;
-		System.out.println(test);
-		System.out.println(negativeConfirm);
-		System.out.println(not);
 		return this;
 	}
 

+ 0 - 1
protocol-iec104/src/main/java/wei/yigulu/iec104/util/SendCommandHelper.java

@@ -25,7 +25,6 @@ public class SendCommandHelper {
 
 	public static boolean sendShortCommand(AbstractMasterBuilder masterBuilder, Integer sourceAddress, Integer commonAddress, Integer dataAddress, Float value) throws Exception {
 		ShortFloatCommand command = new ShortFloatCommand(dataAddress, value);
-		System.out.println(command.toString());
 		Apdu apdu = new Apdu();
 		Asdu asdu = command.generateBack();
 		asdu.setCommonAddress(commonAddress);

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

@@ -13,7 +13,7 @@ import wei.yigulu.iec104.util.SendDataFrameHelper;
 public class ClientTest {
 
 	public static void main(String[] args) throws Exception {
-		Iec104HSMasterBuilder iec104HSMasterBuilder = new Iec104HSMasterBuilder("127.0.0.1", 2404);
+		Iec104HSMasterBuilder iec104HSMasterBuilder = new Iec104HSMasterBuilder("192.168.1.161", 2434);
 				iec104HSMasterBuilder.createByUnBlock();
 		/*Apdu apdu=new Apdu();
 		iec104HSMasterBuilder.sendFrameToOpposite(apdu.encode());

+ 1 - 1
protocol-modbus/pom.xml

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