Browse Source

1、可配置Waitboot是否要读等待;

Jeff 5 years ago
parent
commit
5b359f86a2

+ 2 - 0
TCL Copy Tool/TCL Copy Tool/Global.cpp

@@ -165,6 +165,7 @@ namespace Global
 		g_tConfig.mode = cJSON_GetObjectItem(pJson, _T("Mode")) ? cJSON_GetObjectItem(pJson, _T("Mode"))->valueint : 0;
 		g_tConfig.warncount = cJSON_GetObjectItem(pJson, _T("WarnCount")) ? cJSON_GetObjectItem(pJson, _T("WarnCount"))->valueint : 200;
 		g_tConfig.waitboot = cJSON_GetObjectItem(pJson, _T("WaitBoot")) ? cJSON_GetObjectItem(pJson, _T("WaitBoot"))->valueint : 5000;
+		g_tConfig.bootread = cJSON_GetObjectItem(pJson, _T("BootRead")) ? cJSON_GetObjectItem(pJson, _T("BootRead"))->valueint : 0;
 		g_tConfig.serverurl = cJSON_GetObjectItem(pJson, _T("server-url")) ? cJSON_GetObjectItem(pJson, _T("server-url"))->valuestring : "";
 		g_tConfig.chassis = cJSON_GetObjectItem(pJson, _T("Chassis")) ? cJSON_GetObjectItem(pJson, _T("Chassis"))->valuestring : "";
 
@@ -341,6 +342,7 @@ namespace Global
 		cJSON_AddNumberToObject(pJson, "Mode", g_tConfig.mode);
 		cJSON_AddNumberToObject(pJson, "WarnCount", g_tConfig.warncount);
 		cJSON_AddNumberToObject(pJson, "WaitBoot", g_tConfig.waitboot);
+		cJSON_AddBoolToObject(pJson, "BootRead", g_tConfig.bootread);
 		cJSON_AddStringToObject(pJson, "Baudrate", g_tConfig.baudrate.c_str());
 
 		// ƵµÀ;

+ 1 - 0
TCL Copy Tool/TCL Copy Tool/Global.h

@@ -237,6 +237,7 @@ namespace Global
 		int mode;
 		int warncount = 200;
 		int waitboot = 5000;
+		bool bootread = false;
 		std::string siacpcmdfile;
 		std::string serverurl;
 		std::map<std::string, std::string> channel;

+ 4 - 1
TCL Copy Tool/TCL Copy Tool/OTA.cpp

@@ -678,7 +678,10 @@ BOOL CSIACP::SendCommand2(std::string cmd_name, std::string data /* = "" */, siz
 BOOL CSIACP::SCBC_WaitTVBoot()
 {
 	byte szRecive[BUFFER_LEN] = { 0 };
-	DWORD dwBytesRead = m_pSerial->Read(szRecive, BUFFER_LEN);
+	DWORD dwBytesRead = 0;
+	// 根据配置文件,是否需要读等待;
+	if ( Global::g_tConfig.bootread )
+		dwBytesRead = m_pSerial->Read(szRecive, BUFFER_LEN);
 	if (dwBytesRead == 0)
 	{
 		if ( SCBC_EnterFactory() )