Merge branch 'LBW' into 'shihao'

Lbw

See merge request !11

le19源码/Source/Application/UDS/APP/Common/UDS_Common.c

@@ -181,7 +181,7 @@ void Ser27_ChangeSessionHandle(void)
 void UDS_RESET(void)
 {
     ControlMessageCommunication(networkManagementMsgAndnormalMsg, disableRxAndTx);
-    UDS_Delay(3000u);
+    UDS_Delay(30000u);
     RESET();
 }
 
@@ -750,22 +750,22 @@ void ReadAllDFlashData(void)
     }
 
 
-    if(memcmp(Ser2EToDFlashInfo.DID_F112,DID_F112,sizeof(DID_F112))!=0)
+    /*if(memcmp(Ser2EToDFlashInfo.DID_F112,DID_F112,sizeof(DID_F112))!=0)
     {
         flag2E=1;
         memset(Ser2EToDFlashInfo.DID_F112, 0x20, 8u);
         memcpy(Ser2EToDFlashInfo.DID_F112,DID_F112,sizeof(DID_F112));
     }
-    /*if(memcmp(Ser2EToDFlashInfo.DID_F1A2,Ser22_DID_F1A2,sizeof(Ser22_DID_F1A2))!=0)
+    if(memcmp(Ser2EToDFlashInfo.DID_F1A2,Ser22_DID_F1A2,sizeof(Ser22_DID_F1A2))!=0)
     {   
         flag2E=1;
         memcpy(Ser2EToDFlashInfo.DID_F1A2,Ser22_DID_F1A2,4);
-    }*/
+    }
 
     if (flag2E==1)
     {
        WriteDFlashData(0x04u, (uint32_t *)&Ser2EToDFlashInfo.Flag, sizeof(Ser2EToDFlashInfo) / 4u, NeedWait);
-    }
+    }*/
     
     if (Ser27_FlowCtrlCnt.LV1ReqSeedCnt >= SER27_MAX_REQ_SEED_NUM )
     {