Commit d88672d2cab6e0b368e8bcaddd236a80c0fc9f77

Authored by Echo
1 parent 31051bce

1.检查、比对版本号;2.显示检查到的标志位

@@ -98,8 +98,8 @@ IniData_struct g_IniData[] = @@ -98,8 +98,8 @@ IniData_struct g_IniData[] =
98 {"Check FinalTest flag Enable", (bool*)&g_sMetaComm.bCheckFtFlag, INI_BOOLEAN}, 98 {"Check FinalTest flag Enable", (bool*)&g_sMetaComm.bCheckFtFlag, INI_BOOLEAN},
99 #ifdef __TOPWELL_QCTEST__ 99 #ifdef __TOPWELL_QCTEST__
100 {"Check QCTest flag Enable", (bool*)&g_sMetaComm.bCheckQCFlag, INI_BOOLEAN}, 100 {"Check QCTest flag Enable", (bool*)&g_sMetaComm.bCheckQCFlag, INI_BOOLEAN},
  101 + //{"QCTest_flag_index", (bool*)&g_sMetaComm.QCFlag_index, INI_INTEGER},
101 {"Check_SW_VER", (char*)&g_sMetaComm.check_sw_ver, INI_STRING}, 102 {"Check_SW_VER", (char*)&g_sMetaComm.check_sw_ver, INI_STRING},
102 -  
103 #endif 103 #endif
104 // C2K Modem 104 // C2K Modem
105 {"Write Meid", (bool*)&g_sMetaComm.sWriteOption.bWriteMeid, INI_BOOLEAN}, 105 {"Write Meid", (bool*)&g_sMetaComm.sWriteOption.bWriteMeid, INI_BOOLEAN},
@@ -277,6 +277,7 @@ typedef struct { @@ -277,6 +277,7 @@ typedef struct {
277 bool bCheckFtFlag; 277 bool bCheckFtFlag;
278 #ifdef __TOPWELL_QCTEST__ 278 #ifdef __TOPWELL_QCTEST__
279 bool bCheckQCFlag; 279 bool bCheckQCFlag;
  280 + // UINT QCFlag_index;
280 char check_sw_ver[255]; 281 char check_sw_ver[255];
281 #endif 282 #endif
282 bool bCheckBTWifi; 283 bool bCheckBTWifi;
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
@@ -181,7 +181,8 @@ void SNBase::UpdateUICountResult(WriteNvram_Status_e eWriteStatus) @@ -181,7 +181,8 @@ void SNBase::UpdateUICountResult(WriteNvram_Status_e eWriteStatus)
181 char strTotal[20] = {0}; 181 char strTotal[20] = {0};
182 char strPass[20] = {0}; 182 char strPass[20] = {0};
183 char strFail[20] = {0}; 183 char strFail[20] = {0};
184 - 184 +
  185 +
185 //For the user click 'STOP' button before USB still not insert 186 //For the user click 'STOP' button before USB still not insert
186 if (m_bStopBeforeUSBInsert == true) 187 if (m_bStopBeforeUSBInsert == true)
187 { 188 {
@@ -204,6 +205,15 @@ void SNBase::UpdateUICountResult(WriteNvram_Status_e eWriteStatus) @@ -204,6 +205,15 @@ void SNBase::UpdateUICountResult(WriteNvram_Status_e eWriteStatus)
204 g_pMainDlg->SetDlgItemText(IDC_COUNT_PASS, strPass); 205 g_pMainDlg->SetDlgItemText(IDC_COUNT_PASS, strPass);
205 g_pMainDlg->SetDlgItemText(IDC_COUNT_FAIL, strFail); 206 g_pMainDlg->SetDlgItemText(IDC_COUNT_FAIL, strFail);
206 207
  208 +#if 1
  209 +
  210 + g_pMainDlg->SetDlgItemText(IDC_RSLT_SW, g_pMainDlg->myrslt_sw);
  211 + g_pMainDlg->SetDlgItemText(IDC_RSLT_CFT, g_pMainDlg->myrslt_cft);
  212 + g_pMainDlg->SetDlgItemText(IDC_RSLT_SMT, g_pMainDlg->myrslt_smt);
  213 + g_pMainDlg->SetDlgItemText(IDC_RSLT_QC, g_pMainDlg->myrslt_qc);
  214 + g_pMainDlg->SetDlgItemText(IDC_RSLT_WRITE_IMEI, g_pMainDlg->myrslt_imei);
  215 +#endif
  216 +
207 UpdateMainDlgUI(true, eWriteStatus); 217 UpdateMainDlgUI(true, eWriteStatus);
208 } 218 }
209 219
@@ -348,29 +358,35 @@ bool SNBase::Check_some_barcode(const char* strBarcode) @@ -348,29 +358,35 @@ bool SNBase::Check_some_barcode(const char* strBarcode)
348 358
349 if (strBarcode[55] == '1') 359 if (strBarcode[55] == '1')
350 { 360 {
351 - UpdateUIMsg("ATA测试已经通过"); 361 + g_pMainDlg->myrslt_smt= _T("1");
  362 + UpdateUIMsg("ATA test has passed");
352 } 363 }
353 - else 364 + else
354 { 365 {
355 - UpdateUIMsg("ATA测试未通过"); 366 + g_pMainDlg->myrslt_smt= _T("0");
  367 + UpdateUIMsg("ATA test failed");
356 } 368 }
357 369
358 370
359 if (strBarcode[60] == '1' && strBarcode[61] == '0') //Calibration Pass 371 if (strBarcode[60] == '1' && strBarcode[61] == '0') //Calibration Pass
360 - {  
361 - UpdateUIMsg("校准已经成功"); 372 + {
  373 + g_pMainDlg->myrslt_cft= _T("10");
  374 + UpdateUIMsg("Calibration has been successful");
362 } 375 }
363 else if (strBarcode[60] == '0' && strBarcode[61] == '1')//Calibration Fail 376 else if (strBarcode[60] == '0' && strBarcode[61] == '1')//Calibration Fail
364 { 377 {
365 - UpdateUIMsg("尚未校准"); 378 + g_pMainDlg->myrslt_cft= _T("01");
  379 + UpdateUIMsg("Not yet calibrated");
366 } 380 }
  381 +
367 if (strBarcode[62] == 'P' ) //Final Test Pass 382 if (strBarcode[62] == 'P' ) //Final Test Pass
368 { 383 {
369 - UpdateUIMsg("综测通过"); 384 + g_pMainDlg->myrslt_cft = g_pMainDlg->myrslt_cft+ _T("P");
  385 + UpdateUIMsg("Comprehensive test pass");
370 } 386 }
371 else 387 else
372 { 388 {
373 - UpdateUIMsg("综测失败"); 389 + UpdateUIMsg("Comprehensive test failed");
374 } 390 }
375 391
376 392
@@ -265,13 +265,13 @@ META_RESULT SmartPhoneSN::WriteNvramLoop() @@ -265,13 +265,13 @@ META_RESULT SmartPhoneSN::WriteNvramLoop()
265 a_imei_ary2[10],a_imei_ary2[11],a_imei_ary2[12],a_imei_ary2[13],a_imei_ary2[14] 265 a_imei_ary2[10],a_imei_ary2[11],a_imei_ary2[12],a_imei_ary2[13],a_imei_ary2[14]
266 ); 266 );
267 267
268 -  
269 - UpdateUIMsg("IMEI读取成功"+str_imei); 268 + g_pMainDlg->myrslt_imei.Format(_T("%s"), str_imei);
  269 + UpdateUIMsg("IMEI read successfully "+str_imei);
270 spNextStage = SP_END_STAGE; 270 spNextStage = SP_END_STAGE;
271 } 271 }
272 else 272 else
273 { 273 {
274 - UpdateUIMsg("IMEI读取失败"); 274 + UpdateUIMsg("IMEI failed to read");
275 spNextStage = SP_END_STAGE; 275 spNextStage = SP_END_STAGE;
276 } 276 }
277 } 277 }
@@ -2542,7 +2542,7 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::REQ_ReadAP_NVRAM_Start(WriteData_Type_e da @@ -2542,7 +2542,7 @@ SPMETA_DLL::META_RESULT SmartPhoneSN::REQ_ReadAP_NVRAM_Start(WriteData_Type_e da
2542 2542
2543 2543
2544 #ifdef __TOPWELL_QCTEST__ 2544 #ifdef __TOPWELL_QCTEST__
2545 -int SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void) 2545 +byte SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void)
2546 { 2546 {
2547 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::REQ_ReadAP_NVRAM_QC()..."); 2547 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::REQ_ReadAP_NVRAM_QC()...");
2548 2548
@@ -2612,7 +2612,7 @@ int SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void) @@ -2612,7 +2612,7 @@ int SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void)
2612 } 2612 }
2613 } 2613 }
2614 2614
2615 - if(sNVRAM_ReadCnf.buf[202] == 0) 2615 + if(sNVRAM_ReadCnf.buf[1006] == 0)
2616 { 2616 {
2617 // ::AfxMessageBox("QC test fail"); 2617 // ::AfxMessageBox("QC test fail");
2618 return 0; 2618 return 0;
@@ -2624,8 +2624,6 @@ int SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void) @@ -2624,8 +2624,6 @@ int SmartPhoneSN::REQ_ReadAP_NVRAM_QC(void)
2624 } 2624 }
2625 2625
2626 2626
2627 -  
2628 -  
2629 } 2627 }
2630 2628
2631 #endif 2629 #endif
@@ -4223,7 +4221,9 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -4223,7 +4221,9 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4223 bool bNeedScanData = false; 4221 bool bNeedScanData = false;
4224 bool bNeedLoadAPDB = false; 4222 bool bNeedLoadAPDB = false;
4225 int times = 0; 4223 int times = 0;
4226 - int Ret = 0; 4224 + int Ret = 0;
  4225 + byte resultQC;
  4226 +
4227 SPMETA_DLL::VerInfo_V2_Cnf a_v2cnf; 4227 SPMETA_DLL::VerInfo_V2_Cnf a_v2cnf;
4228 short a_token; 4228 short a_token;
4229 4229
@@ -4259,7 +4259,7 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -4259,7 +4259,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4259 UpdateUIMsg("Set Fastboot Environment Variable Fail!!"); 4259 UpdateUIMsg("Set Fastboot Environment Variable Fail!!");
4260 return; 4260 return;
4261 } 4261 }
4262 - UpdateUIMsg("设置 Fastboot 环境变量成功OK!!"); 4262 + UpdateUIMsg("Set Fastboot Environment Variable OK!!");
4263 if (!Adb_Manager_Init()) 4263 if (!Adb_Manager_Init())
4264 { 4264 {
4265 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::Adb_Manager_Init() FAIL..."); 4265 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::Adb_Manager_Init() FAIL...");
@@ -4314,13 +4314,13 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -4314,13 +4314,13 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4314 4314
4315 SetupMetaModeParameters(); 4315 SetupMetaModeParameters();
4316 4316
4317 - UpdateUIMsg("开始加载AP database..."); 4317 + UpdateUIMsg("Start load and init AP database...");
4318 4318
4319 UpdateProgress(0.06); 4319 UpdateProgress(0.06);
4320 4320
4321 if (g_sMetaComm.bUsbEnable) 4321 if (g_sMetaComm.bUsbEnable)
4322 { 4322 {
4323 - UpdateUIMsg("请使用USB连接手机"); 4323 + UpdateUIMsg("Wait for usb insert...");
4324 } 4324 }
4325 4325
4326 EnableStartBTN(true); 4326 EnableStartBTN(true);
@@ -4337,7 +4337,7 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -4337,7 +4337,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4337 SPMetaResult = QueryDBFromDUT(); 4337 SPMetaResult = QueryDBFromDUT();
4338 if (SPMetaResult != 0) 4338 if (SPMetaResult != 0)
4339 { 4339 {
4340 - UpdateUIMsg("加载DB失败"); 4340 + UpdateUIMsg("Don't support load db from device.");
4341 bAnyOperationFail = true; 4341 bAnyOperationFail = true;
4342 goto End; 4342 goto End;
4343 } 4343 }
@@ -4360,7 +4360,7 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -4360,7 +4360,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4360 if (MetaResult != META_SUCCESS) 4360 if (MetaResult != META_SUCCESS)
4361 { 4361 {
4362 bAnyOperationFail = true; 4362 bAnyOperationFail = true;
4363 - UpdateUIMsg("加载 AP 失败, %s", ResultToString_SP(MetaResult)); 4363 + UpdateUIMsg("Load AP Database fail, %s", ResultToString_SP(MetaResult));
4364 goto End; 4364 goto End;
4365 } 4365 }
4366 } 4366 }
@@ -4400,7 +4400,7 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -4400,7 +4400,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4400 { 4400 {
4401 bAnyOperationFail = true; 4401 bAnyOperationFail = true;
4402 MTRACE_ERR(g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information fail, MetaResult = %s", ResultToString_SP(Ret)); 4402 MTRACE_ERR(g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information fail, MetaResult = %s", ResultToString_SP(Ret));
4403 - UpdateUIMsg("查询modem信息失败, %s", ResultToString_SP(Ret)); 4403 + UpdateUIMsg("Query modem information fail, %s", ResultToString_SP(Ret));
4404 goto End; 4404 goto End;
4405 } 4405 }
4406 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information end."); 4406 MTRACE (g_hEBOOT_DEBUG, "SmartPhoneSN::GetSPModemInfo_Ex(): Query modem information end.");
@@ -4409,17 +4409,32 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -4409,17 +4409,32 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4409 4409
4410 SPMETA_DLL::SP_META_GetTargetVerInfoV2_r(m_hSPMetaHandle, &a_v2cnf, &a_token,NULL); 4410 SPMETA_DLL::SP_META_GetTargetVerInfoV2_r(m_hSPMetaHandle, &a_v2cnf, &a_token,NULL);
4411 { 4411 {
4412 - int a_verlen = g_pMainDlg->myversion.GetLength();  
4413 - if (strcmp(a_v2cnf.BUILD_DISP_ID,g_pMainDlg->myversion.GetBuffer(a_verlen)) != 0 ) 4412 + //int a_verlen = g_pMainDlg->myversion.GetLength();
  4413 + //int a_verlen =strlen(g_sMetaComm.check_sw_ver());
  4414 + char tmp_checkSwVer[255];
  4415 + int len=strlen(g_sMetaComm.check_sw_ver);
  4416 +
  4417 + /* strcpy(tmp_checkSwVer,g_sMetaComm.check_sw_ver);
  4418 +
  4419 + tmp_checkSwVer[len]=10;
  4420 + tmp_checkSwVer[len+1]='\0';*/
  4421 +
  4422 + if (strncmp(a_v2cnf.BUILD_DISP_ID,g_sMetaComm.check_sw_ver,len) != 0 )
4414 { 4423 {
4415 - UpdateUIMsg("版本号不匹配"); 4424 + UpdateUIMsg("Version number is wrong");
4416 bAnyOperationFail = true; 4425 bAnyOperationFail = true;
4417 } 4426 }
4418 else 4427 else
4419 { 4428 {
4420 - UpdateUIMsg("版本号匹配!"); 4429 + UpdateUIMsg("Version number OK!");
4421 } 4430 }
4422 4431
  4432 + int testLen=strlen(a_v2cnf.BUILD_DISP_ID)-1;
  4433 + memset(tmp_checkSwVer,0x0,sizeof(tmp_checkSwVer));
  4434 + strncpy(tmp_checkSwVer,a_v2cnf.BUILD_DISP_ID,testLen);
  4435 + g_pMainDlg->myrslt_sw.Format(_T("%s"), tmp_checkSwVer);
  4436 +
  4437 +
4423 } 4438 }
4424 //if (strcmp(g_pMainDlg->myversion.GetBuffer(),a_v2cnf.)) 4439 //if (strcmp(g_pMainDlg->myversion.GetBuffer(),a_v2cnf.))
4425 //{g_pMainDlg->myversion 4440 //{g_pMainDlg->myversion
@@ -4427,18 +4442,21 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -4427,18 +4442,21 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4427 4442
4428 if (g_sMetaComm.bCheckQCFlag) 4443 if (g_sMetaComm.bCheckQCFlag)
4429 { 4444 {
4430 - Ret = REQ_ReadAP_NVRAM_QC();  
4431 - switch(Ret) 4445 + resultQC = REQ_ReadAP_NVRAM_QC();
  4446 + switch(resultQC)
4432 { 4447 {
4433 case 0: 4448 case 0:
4434 - UpdateUIMsg("未进行QC测试"); 4449 + g_pMainDlg->myrslt_qc=_T("0");
  4450 + UpdateUIMsg("QC untest");
4435 bAnyOperationFail = true; 4451 bAnyOperationFail = true;
4436 break; 4452 break;
4437 case 1: 4453 case 1:
4438 - UpdateUIMsg("QC测试通过"); 4454 + g_pMainDlg->myrslt_qc=_T("1");
  4455 + UpdateUIMsg("QC test pass");
4439 break; 4456 break;
4440 default: 4457 default:
4441 - UpdateUIMsg("QC测试失败"); 4458 + g_pMainDlg->myrslt_qc=_T("Fail");
  4459 + UpdateUIMsg("QC test fail");
4442 bAnyOperationFail = true; 4460 bAnyOperationFail = true;
4443 break; 4461 break;
4444 } 4462 }
@@ -4452,7 +4470,7 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -4452,7 +4470,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4452 MTRACE (g_hEBOOT_DEBUG, "m_bWriteModemNvram = %d,m_sMdInfo.number_of_md = %d", m_bWriteModemNvram, m_sMdInfo.number_of_md); 4470 MTRACE (g_hEBOOT_DEBUG, "m_bWriteModemNvram = %d,m_sMdInfo.number_of_md = %d", m_bWriteModemNvram, m_sMdInfo.number_of_md);
4453 if ((m_bWriteModemNvram == true || g_sMetaComm.bCheckCalFlag || g_sMetaComm.bCheckFtFlag) && m_sMdInfo.number_of_md >= 1) 4471 if ((m_bWriteModemNvram == true || g_sMetaComm.bCheckCalFlag || g_sMetaComm.bCheckFtFlag) && m_sMdInfo.number_of_md >= 1)
4454 { 4472 {
4455 - UpdateUIMsg("切换到BP database"); 4473 + UpdateUIMsg("Start switch to MD meta and init Modem database...");
4456 4474
4457 UpdateProgress(0.14); 4475 UpdateProgress(0.14);
4458 4476
@@ -4493,7 +4511,7 @@ void SmartPhoneSN::ThreadMainEntryPoint() @@ -4493,7 +4511,7 @@ void SmartPhoneSN::ThreadMainEntryPoint()
4493 UpdateProgress(0.22); 4511 UpdateProgress(0.22);
4494 4512
4495 EnableStartBTN(false); 4513 EnableStartBTN(false);
4496 - UpdateUIMsg("开始读取BARCODE IMEI"); 4514 + UpdateUIMsg("Start loop write data to nvram...");
4497 MetaResult = WriteNvramLoop(); 4515 MetaResult = WriteNvramLoop();
4498 if (MetaResult != META_SUCCESS) 4516 if (MetaResult != META_SUCCESS)
4499 { 4517 {
@@ -4536,7 +4554,7 @@ End: @@ -4536,7 +4554,7 @@ End:
4536 } 4554 }
4537 else 4555 else
4538 { 4556 {
4539 - UpdateUIMsg("所有操作完成!!"); 4557 + UpdateUIMsg("All Operate successfully!!");
4540 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::All Operate successfully!!"); 4558 MTRACE(g_hEBOOT_DEBUG, "SmartPhoneSN::All Operate successfully!!");
4541 4559
4542 #ifdef _AUTO_GEN_FEATURE_ 4560 #ifdef _AUTO_GEN_FEATURE_
@@ -74,7 +74,7 @@ protected: @@ -74,7 +74,7 @@ protected:
74 74
75 virtual SPMETA_DLL::META_RESULT REQ_ReadAP_NVRAM_Start(WriteData_Type_e dataType, char *pOutData, unsigned short iRID); 75 virtual SPMETA_DLL::META_RESULT REQ_ReadAP_NVRAM_Start(WriteData_Type_e dataType, char *pOutData, unsigned short iRID);
76 #ifdef __TOPWELL_QCTEST__ 76 #ifdef __TOPWELL_QCTEST__
77 - virtual int REQ_ReadAP_NVRAM_QC(); 77 + virtual byte REQ_ReadAP_NVRAM_QC();
78 #endif 78 #endif
79 virtual SPMETA_DLL::META_RESULT REQ_WriteAP_NVRAM_Start(WriteData_Type_e dataType, char *pInData, unsigned short iRID); 79 virtual SPMETA_DLL::META_RESULT REQ_WriteAP_NVRAM_Start(WriteData_Type_e dataType, char *pInData, unsigned short iRID);
80 virtual META_RESULT REQ_ReadModem_NVRAM_Start(WriteData_Type_e dataType, char *pOutData, unsigned short iRID); 80 virtual META_RESULT REQ_ReadModem_NVRAM_Start(WriteData_Type_e dataType, char *pOutData, unsigned short iRID);
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
1 ----- start searching Matches (6 in 1 files) ----  
2 -SPexc.cpp (execute): UpdateUIMsg("Start searching preloader com port and handshake...");  
3 -SPexc.cpp (execute): UpdateUIMsg("Start searching kernel com port and handshake...");  
4 -SPexc.cpp (execute): UpdateUIMsg("Start searching preloader com port and handshake...");  
5 -SPexc.cpp (execute): UpdateUIMsg("Start searching fastboot devices...");  
6 -SPexc.cpp (execute): UpdateUIMsg("Start searching preloader com port and handshake...");  
7 -SPexc.cpp (execute): UpdateUIMsg("Start searching ADB devices..."); 1 +---- IMEI¶ÁÈ¡ Matches (2 in 1 files) ----
  2 +SPexc.cpp (execute): UpdateUIMsg("IMEI¶ÁÈ¡³É¹¦"+str_imei);
  3 +SPexc.cpp (execute): UpdateUIMsg("IMEI¶Áȡʧ°Ü");
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
@@ -3,10 +3,10 @@ Stress Test = 0 @@ -3,10 +3,10 @@ Stress Test = 0
3 Already in Meta = False 3 Already in Meta = False
4 Keep in Meta = False 4 Keep in Meta = False
5 Clear Meta Boot Flag = False 5 Clear Meta Boot Flag = False
6 -Operator Mode = 0 6 +Operator Mode = 10000
7 Preloader Connect Timeout = 20000 7 Preloader Connect Timeout = 20000
8 Kernel Connect Timeout = 120000 8 Kernel Connect Timeout = 120000
9 -Target type = 1 9 +Target type = 64182496
10 Brom Port Filter = VID_0E8D&PID_0003 10 Brom Port Filter = VID_0E8D&PID_0003
11 Preloader Port Filter = VID_0E8D&PID_2000 VID_0525&PID_A4A7 VID_1004&PID_6000 11 Preloader Port Filter = VID_0E8D&PID_2000 VID_0525&PID_A4A7 VID_1004&PID_6000
12 Kernel Port Filter = VID_0E8D&PID_2007 VID_0E8D&PID_2006&MI_02 VID_0E8D&PID_2040&MI_02 VID_0BB4&PID_0005&MI_02 VID_1004&PID_6000 12 Kernel Port Filter = VID_0E8D&PID_2007 VID_0E8D&PID_2006&MI_02 VID_0E8D&PID_2040&MI_02 VID_0BB4&PID_0005&MI_02 VID_1004&PID_6000
@@ -22,7 +22,7 @@ Check Fastboot OEM Lock Enable = False @@ -22,7 +22,7 @@ Check Fastboot OEM Lock Enable = False
22 Check Calibration flag Enable = True 22 Check Calibration flag Enable = True
23 Check FinalTest flag Enable = False 23 Check FinalTest flag Enable = False
24 Check QCTest flag Enable = True 24 Check QCTest flag Enable = True
25 -Check_SW_VER = fdsfsfd 25 +Check_SW_VER = L61_V5019A_AR_KMG_V1.02_201708220170826
26 Write Meid = True 26 Write Meid = True
27 Write Esn = False 27 Write Esn = False
28 Write Barcode = True 28 Write Barcode = True
@@ -67,9 +67,9 @@ Ethernet header string = @@ -67,9 +67,9 @@ Ethernet header string =
67 DRMKey MCID header string = 67 DRMKey MCID header string =
68 AP DB from DUT = False 68 AP DB from DUT = False
69 MD DB from DUT = False 69 MD DB from DUT = False
70 -Modem_1 database path = E:\zc\INTEX_AQUA_LIONS_N1_V01_INDIAN\db\BPLGUInfoCustomAppSrcP_MT6735_S00_MOLY_LR9_W1444_MD_LWTG_MP_V110_5_P5_1_lwg_n 70 +Modem_1 database path = C:\Users\echo\Desktop\L61\L61_V5019A_AR_KMG_V1.02_20170822\db\BPLGUInfoCustomAppSrcP_MT6735_S00_MOLY_LR9_W1444_MD_LWTG_MP_V110_5_P9_1_lwg_n
71 Modem_2 database path = 71 Modem_2 database path =
72 -AP database path = E:\zc\INTEX_AQUA_LIONS_N1_V01_INDIAN\db\APDB_MT6735_S01_alps-mp-n0.mp1_W17.31 72 +AP database path = C:\Users\echo\Desktop\L61\L61_V5019A_AR_KMG_V1.02_20170822\db\APDB_MT6735_S01_alps-mp-n0.mp1_W17.31
73 FP Auth path = 73 FP Auth path =
74 SP Auth path = 74 SP Auth path =
75 Hdcp Bin path = 75 Hdcp Bin path =
No preview for this file type
No preview for this file type
No preview for this file type
@@ -6,13 +6,7 @@ @@ -6,13 +6,7 @@
6 --------------------Configuration: SN Writer - Win32 Debug-------------------- 6 --------------------Configuration: SN Writer - Win32 Debug--------------------
7 </h3> 7 </h3>
8 <h3>Command Lines</h3> 8 <h3>Command Lines</h3>
9 -Creating temporary file "D:\temp\RSP357D.tmp" with contents  
10 -[  
11 -/nologo /MTd /W3 /Gi /GX /ZI /Od /I ".\\" /I ".\SNbase\inc" /I ".\Execute" /I ".\Extra\CBtnST" /I ".\Form\About" /I ".\Form\AutoGen" /I ".\Form\ScanData" /I ".\Form\Identify" /I ".\Form\FileSel" /I ".\Form\SystemConfig" /I ".\MtkLib\AT_cmd\inc" /I ".\CBtnST" /I ".\MtkLib\Brom\inc" /I ".\MtkLib\DebugTrace\inc" /I ".\MtkLib\SNFstream\inc" /I ".\Common" /I ".\MtkLib\Eboot\inc" /I ".\MtkLib\Meta\inc" /I ".\MtkLib\Security\inc" /I ".\MtkLib\USBSwitchTool\inc" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR"Debug/" /Fp"Debug/SN_Station.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c  
12 -"D:\workspace\SN_Write_tool_v1728\Execute\SPexc.cpp"  
13 -]  
14 -Creating command line "cl.exe @D:\temp\RSP357D.tmp"  
15 -Creating temporary file "D:\temp\RSP357E.tmp" with contents 9 +Creating temporary file "C:\Users\echo\AppData\Local\Temp\RSPD80C.tmp" with contents
16 [ 10 [
17 shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Security/lib/*.lib" "./mtklib/SNFstream/lib/*.lib" "./mtklib/DebugTrace/lib/*.lib" "./mtklib/usbswitchtool/lib/*.lib" /nologo /subsystem:windows /incremental:yes /pdb:"Output/SN Writer.pdb" /debug /machine:I386 /out:"Output/SN Writer.exe" /pdbtype:sept 11 shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Security/lib/*.lib" "./mtklib/SNFstream/lib/*.lib" "./mtklib/DebugTrace/lib/*.lib" "./mtklib/usbswitchtool/lib/*.lib" /nologo /subsystem:windows /incremental:yes /pdb:"Output/SN Writer.pdb" /debug /machine:I386 /out:"Output/SN Writer.exe" /pdbtype:sept
18 .\Debug\Common.obj 12 .\Debug\Common.obj
@@ -38,12 +32,9 @@ shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Secur @@ -38,12 +32,9 @@ shlwapi.lib "./mtklib/meta/lib/*.lib" "./mtklib/Eboot/lib/*.lib" "./mtklib/Secur
38 .\Debug\StdAfx.obj 32 .\Debug\StdAfx.obj
39 ".\Debug\SN Writer.res" 33 ".\Debug\SN Writer.res"
40 ] 34 ]
41 -Creating command line "link.exe @D:\temp\RSP357E.tmp" 35 +Creating command line "link.exe @C:\Users\echo\AppData\Local\Temp\RSPD80C.tmp"
42 <h3>Output Window</h3> 36 <h3>Output Window</h3>
43 -Compiling...  
44 -SPexc.cpp  
45 Linking... 37 Linking...
46 - Creating library Output/SN Writer.lib and object Output/SN Writer.exp  
47 38
48 39
49 40
@@ -277,9 +277,9 @@ FONT 9, "΢ÈíÑźÚ" @@ -277,9 +277,9 @@ FONT 9, "΢ÈíÑźÚ"
277 BEGIN 277 BEGIN
278 EDITTEXT IDC_COUNT_TOTAL,198,139,38,13,ES_AUTOHSCROLL | 278 EDITTEXT IDC_COUNT_TOTAL,198,139,38,13,ES_AUTOHSCROLL |
279 ES_READONLY 279 ES_READONLY
280 - PUSHBUTTON "Config",IDC_BTN_SYSCONFIG,48,213,30,12 280 + DEFPUSHBUTTON "Config",IDC_BTN_SYSCONFIG,48,214,30,12
281 DEFPUSHBUTTON "Start",IDC_BTN_START,11,214,30,12 281 DEFPUSHBUTTON "Start",IDC_BTN_START,11,214,30,12
282 - PUSHBUTTON "Quit",IDC_BTN_QUIT,119,214,30,12 282 + DEFPUSHBUTTON "Quit",IDC_BTN_QUIT,119,214,30,12
283 EDITTEXT IDC_COUNT_PASS,198,163,38,13,ES_AUTOHSCROLL | 283 EDITTEXT IDC_COUNT_PASS,198,163,38,13,ES_AUTOHSCROLL |
284 ES_READONLY 284 ES_READONLY
285 EDITTEXT IDC_COUNT_FAIL,198,187,38,13,ES_AUTOHSCROLL | 285 EDITTEXT IDC_COUNT_FAIL,198,187,38,13,ES_AUTOHSCROLL |
@@ -291,7 +291,7 @@ BEGIN @@ -291,7 +291,7 @@ BEGIN
291 LTEXT "Fail:",IDC_STATIC,166,187,27,10 291 LTEXT "Fail:",IDC_STATIC,166,187,27,10
292 COMBOBOX IDC_COMBO_COMPORT,180,209,34,51,CBS_DROPDOWNLIST | 292 COMBOBOX IDC_COMBO_COMPORT,180,209,34,51,CBS_DROPDOWNLIST |
293 CBS_SORT | WS_VSCROLL | WS_TABSTOP 293 CBS_SORT | WS_VSCROLL | WS_TABSTOP
294 - PUSHBUTTON "Button1",IDC_BTN_INDITE,83,214,30,12,BS_BITMAP 294 + DEFPUSHBUTTON "Reset",IDC_BTN_RESET,83,214,30,12
295 LTEXT "SW Version",IDC_STATIC,6,12,48,9 295 LTEXT "SW Version",IDC_STATIC,6,12,48,9
296 EDITTEXT IDC_EDT_VERSION,56,10,182,13,ES_AUTOHSCROLL 296 EDITTEXT IDC_EDT_VERSION,56,10,182,13,ES_AUTOHSCROLL
297 PUSHBUTTON "Save",IDC_BT_SAVE_SWVER,246,10,44,15 297 PUSHBUTTON "Save",IDC_BT_SAVE_SWVER,246,10,44,15
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 #include "FileSelDlg.h" 15 #include "FileSelDlg.h"
16 #include "AutoGenDlg.h" 16 #include "AutoGenDlg.h"
17 #include "HdcpEncryption.h" 17 #include "HdcpEncryption.h"
18 - 18 +#include "spmeta.h"
19 19
20 #ifdef _DEBUG 20 #ifdef _DEBUG
21 #define new DEBUG_NEW 21 #define new DEBUG_NEW
@@ -127,6 +127,9 @@ void CSNWriterDlg::DoDataExchange(CDataExchange* pDX) @@ -127,6 +127,9 @@ void CSNWriterDlg::DoDataExchange(CDataExchange* pDX)
127 DDX_Control(pDX, IDC_BTN_QUIT, m_QuitBTN); 127 DDX_Control(pDX, IDC_BTN_QUIT, m_QuitBTN);
128 DDX_Control(pDX, IDC_BTN_SYSCONFIG, m_SystemCfgBTN); 128 DDX_Control(pDX, IDC_BTN_SYSCONFIG, m_SystemCfgBTN);
129 129
  130 + DDX_Control(pDX, IDC_BTN_RESET, m_ResetBTN);
  131 +
  132 +
130 133
131 } 134 }
132 135
@@ -135,6 +138,7 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog) @@ -135,6 +138,7 @@ BEGIN_MESSAGE_MAP(CSNWriterDlg, CDialog)
135 ON_WM_PAINT() 138 ON_WM_PAINT()
136 ON_WM_QUERYDRAGICON() 139 ON_WM_QUERYDRAGICON()
137 ON_BN_CLICKED(IDC_BTN_START, OnBtnStart) 140 ON_BN_CLICKED(IDC_BTN_START, OnBtnStart)
  141 + ON_BN_CLICKED(IDC_BTN_RESET, OnBtnReset)
138 ON_BN_CLICKED(IDC_BTN_QUIT, OnBtnQuit) 142 ON_BN_CLICKED(IDC_BTN_QUIT, OnBtnQuit)
139 ON_BN_CLICKED(IDC_BTN_SYSCONFIG, OnBtnSysconfig) 143 ON_BN_CLICKED(IDC_BTN_SYSCONFIG, OnBtnSysconfig)
140 ON_CBN_SELCHANGE(IDC_COMBO_COMPORT, OnSelchangeComboComport) 144 ON_CBN_SELCHANGE(IDC_COMBO_COMPORT, OnSelchangeComboComport)
@@ -624,6 +628,13 @@ void CSNWriterDlg::OnBtnStart() @@ -624,6 +628,13 @@ void CSNWriterDlg::OnBtnStart()
624 } 628 }
625 } 629 }
626 630
  631 +void CSNWriterDlg::OnBtnReset()
  632 +{
  633 + MessageBox("This feature has not yet been completed");
  634 + // SPMETA_DLL::SP_META_NVRAM_ResetToFactoryDefault(5000);
  635 +}
  636 +
  637 +
627 void CSNWriterDlg::OnBtnQuit() 638 void CSNWriterDlg::OnBtnQuit()
628 { 639 {
629 // TODO: Add your control notification handler code here 640 // TODO: Add your control notification handler code here
@@ -64,6 +64,7 @@ protected: @@ -64,6 +64,7 @@ protected:
64 afx_msg HCURSOR OnQueryDragIcon(); 64 afx_msg HCURSOR OnQueryDragIcon();
65 afx_msg void OnBtnStart(); 65 afx_msg void OnBtnStart();
66 afx_msg void OnBtnQuit(); 66 afx_msg void OnBtnQuit();
  67 + afx_msg void OnBtnReset();
67 afx_msg void OnBtnSysconfig(); 68 afx_msg void OnBtnSysconfig();
68 afx_msg void OnSelchangeComboComport(); 69 afx_msg void OnSelchangeComboComport();
69 afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor); 70 afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
@@ -123,6 +124,7 @@ private: @@ -123,6 +124,7 @@ private:
123 CButton m_StartBTN; 124 CButton m_StartBTN;
124 CButton m_QuitBTN; 125 CButton m_QuitBTN;
125 CButton m_SystemCfgBTN; 126 CButton m_SystemCfgBTN;
  127 + CButton m_ResetBTN;
126 128
127 129
128 public: 130 public:
@@ -101,6 +101,7 @@ @@ -101,6 +101,7 @@
101 #define IDC_DRMKEY_MCID_DATA 1077 101 #define IDC_DRMKEY_MCID_DATA 1077
102 #define IDC_BTN_INDITE 1078 102 #define IDC_BTN_INDITE 1078
103 #define IDC_MEID_DATA 1078 103 #define IDC_MEID_DATA 1078
  104 +#define IDC_BTN_RESET 1078
104 #define IDC_SERIAL_NO_DATA 1079 105 #define IDC_SERIAL_NO_DATA 1079
105 #define IDC_SERIAL_NO_HEADER_SCAN 1080 106 #define IDC_SERIAL_NO_HEADER_SCAN 1080
106 #define IDC_BTN_SAVE 1081 107 #define IDC_BTN_SAVE 1081
Please register or login to post a comment