Merge branch 'dev' of http://tyw-server.synology.me:12345/ty/tianying_ty100 into lijianshuang

Firmware/Source/UDS/UDS_ISO14229_Services.c

@@ -194,7 +194,7 @@ void Data_Read_DiagPara(void)
 {
     uint8_t i;
     Ser2EDFlashData* ReadSer2EDataForDFlash = (Ser2EDFlashData*)0x500600ul; 
-    for ( i = 0; i < 21; i++)
+    for ( i = 0; i < 32; i++)
     {
         Ser2EDataForDFlash.DID_F184[i] = ReadSer2EDataForDFlash->DID_F184[i];
     }
@@ -857,11 +857,11 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A
             break;
 
         case 0xF184: // UUID
-            for (i = 0; i < 21; i++)
+            for (i = 0; i < 32; i++)
             {
                 UDS_ISO14229_Transfer[i + 2] = Ser2EDataForDFlash.DID_F184[i];
             }
-            UDS_Service_Response(0x22, POSITIVE_RSP, DIAG_ID_Tx, 2 + 21, UDS_ISO14229_Transfer);
+            UDS_Service_Response(0x22, POSITIVE_RSP, DIAG_ID_Tx, 2 + 32, UDS_ISO14229_Transfer);
             break;
 
         case 0x2024: // ESP32内部版本号
@@ -942,7 +942,7 @@ void UDS_Service_2E_Indication ( uint16_t A_TA_type, uint16_t A_Length, uint8_t
     switch ( DID )
     {
         case 0xF184: // 写入UUID
-            if ( Service2EDiagDataLength == 23 ) //限制最大长度
+            if ( Service2EDiagDataLength == 34 ) //限制最大长度
             {
                 for (i = 0; i < (sizeof(Ser2EDataForDFlash.DID_F184)); i++)
                 {

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -354,8 +354,7 @@ extern DiagDFlashData DiagDataForDFlash;
 typedef struct
 {
     uint32_t Flag;
-    uint8_t DID_F184[21];
-    uint8_t Filldata[11];
+    uint8_t DID_F184[32];
 } Ser2EDFlashData;
 extern Ser2EDFlashData Ser2EDataForDFlash;