Ver Fonte

20210922,test s7 123456

huli há 3 anos atrás
pai
commit
ed51973d69

+ 4 - 1
dispatch/dispatch_plc.cpp

@@ -422,18 +422,21 @@ Error_manager Dispatch_plc::check_response_from_plc()
 	std::unique_lock<std::mutex> t_lock(m_lock);
 
 
+
 	//need, 调试代码, 延时10s, 直接返回成功
 	if ( std::chrono::system_clock::now() - m_start_time > std::chrono::seconds(10) )
 	{
 		return Error_code::SUCCESS;
 	}
-	//返回没有收到数据
+		//返回没有收到数据
 	else
 	{
 		return Error_code::NODATA;
 	}
 
 
+
+
 	//检查唯一码
 	if ( m_response_key == m_request_key  )
 	{

+ 2 - 1
error_code/error_code.h

@@ -2,7 +2,8 @@
 #define MAIN_TEST 1
 //#define PROCESS_TEST 1
 //#define TIME_TEST 1
-#define S7_CLOSE 1
+
+#define S7_TEST 1
 
 
 //Error_code是错误码的底层通用模块,

+ 1 - 1
snap7_communication/snap7_communication_base.cpp

@@ -55,7 +55,7 @@ Error_manager Snap7_communication_base::communication_init_from_protobuf(Snap7_c
 		}
 	}
 
-#ifdef S7_CLOSE
+#ifdef S7_TEST
 	//启动通信, run thread
 	communication_run();
 #endif