Ver código fonte

20220114, add label id

huli 3 anos atrás
pai
commit
3f34c0a173

+ 13 - 12
setting/communication.prototxt

@@ -32,21 +32,22 @@ communication_parameters
 #    connect_string_vector:"tcp://192.168.2.174:30002"
 
 
-    connect_string_vector:"tcp://192.168.1.233:30000"
-    connect_string_vector:"tcp://192.168.1.233:30010"
 
-    connect_string_vector:"tcp://192.168.1.180:30009"
-    connect_string_vector:"tcp://192.168.1.181:30009"
-    connect_string_vector:"tcp://192.168.1.182:30009"
-    connect_string_vector:"tcp://192.168.1.183:30009"
-    connect_string_vector:"tcp://192.168.1.184:30009"
-    connect_string_vector:"tcp://192.168.1.185:30009"
+    connect_string_vector:"tcp://192.168.2.233:30000"
+    connect_string_vector:"tcp://192.168.2.233:30010"
 
-    connect_string_vector:"tcp://192.168.1.186:30009"
-    connect_string_vector:"tcp://192.168.1.187:30009"
+    connect_string_vector:"tcp://192.168.2.180:30009"
+    connect_string_vector:"tcp://192.168.2.181:30009"
+    connect_string_vector:"tcp://192.168.2.182:30009"
+    connect_string_vector:"tcp://192.168.2.183:30009"
+    connect_string_vector:"tcp://192.168.2.184:30009"
+    connect_string_vector:"tcp://192.168.2.185:30009"
 
-    connect_string_vector:"tcp://192.168.1.245:30009"
-    connect_string_vector:"tcp://192.168.1.233:30009"
+    connect_string_vector:"tcp://192.168.2.186:30009"
+    connect_string_vector:"tcp://192.168.2.187:30009"
+
+    connect_string_vector:"tcp://192.168.2.245:30009"
+    connect_string_vector:"tcp://192.168.2.233:30009"
 
 
 }

+ 1 - 1
setting/communication_a.prototxt

@@ -32,7 +32,7 @@ communication_parameters
 #    connect_string_vector:"tcp://192.168.2.174:30002"
 
 
-bind_string:"tcp://192.168.1.233:30030"
+    bind_string:"tcp://192.168.1.233:30030"
     connect_string_vector:"tcp://192.168.1.233:30000"
     connect_string_vector:"tcp://192.168.1.233:30010"
 

+ 2 - 1
setting/communication_b.prototxt

@@ -31,7 +31,8 @@ communication_parameters
 
 #    connect_string_vector:"tcp://192.168.2.174:30002"
 
-bind_string:"tcp://192.168.1.233:30031"
+
+    bind_string:"tcp://192.168.1.233:30031"
     connect_string_vector:"tcp://192.168.1.233:30000"
     connect_string_vector:"tcp://192.168.1.233:30010"
 

+ 2 - 1
setting/communication_c.prototxt

@@ -31,7 +31,8 @@ communication_parameters
 
 #    connect_string_vector:"tcp://192.168.2.174:30002"
 
-bind_string:"tcp://192.168.1.233:30032"
+
+    bind_string:"tcp://192.168.2.233:30032"
     connect_string_vector:"tcp://192.168.1.233:30000"
     connect_string_vector:"tcp://192.168.1.233:30010"
 

+ 7 - 0
snap7_communication/snap7_communication_base.cpp

@@ -117,6 +117,13 @@ Snap7_communication_base::Snap7_communication_statu Snap7_communication_base::ge
 	return m_communication_status;
 }
 
+//修改通信延时, 单位ms
+Error_manager Snap7_communication_base::set_communication_delay_time_ms(int time)
+{
+	m_communication_delay_time_ms = time;
+	return Error_code::SUCCESS;
+}
+
 //通信连接
 Error_manager Snap7_communication_base::communication_connect(std::string ip_string)
 {

+ 4 - 0
snap7_communication/snap7_communication_base.h

@@ -57,6 +57,10 @@ public://API functions
 
 public://get or set member variable
 	Snap7_communication_statu get_status();
+
+	//修改通信延时, 单位ms
+	Error_manager set_communication_delay_time_ms(int time);
+
 protected://member functions
 	//通信连接
 	Error_manager communication_connect(std::string ip_string);