Merge branch 'ZMY' into 'dev'

修改零件号长度、上传BOOT文件、修改BOOT变更记录

See merge request !64

Firmware/Source/UDS/UDS_ISO14229_Services.c

@@ -119,20 +119,21 @@ uint8_t MCU_HWversion[6] = {'H', 'V', (uint8_t)((HWV >> 8u) & 0x0Fu) + 0x30u, '.
 uint8_t MCU_FBLversion[6] = {'B', 'V', (uint8_t)((BTV >> 8u) & 0x0Fu) + 0x30u, '.', (uint8_t)((BTV >> 4u) & 0x0Fu) + 0x30u, (uint8_t)(BTV & 0x0Fu) + 0x30u};
 
 //零件号信息 F187
-uint8_t MCU_PartNumber[17] = {'T', 'Y', '2', '0', '0', '.', '0', '8', '0', '0', '0', '0', 'b', '(', 't', 'y', ')'};
+uint8_t MCU_PartNumber[18] = {'T', 'Y', '2', '0', '0', '.', '0', '8', '0', '0', '0', '0', '0', 'b', '(', 't', 'y', ')'};
 #endif
 
 void Data_Set_DiagPara(void)
 {
     uint8_t i;
     uint8_t length = 0;
+    uint8_t Filldata_length = 0;
 
     //获取DID的值，等待写入DFlash
     for(i = 0; i < 6; i++)
     {
         DiagDataForDFlash.DID_F180[i] = MCU_FBLversion[i];
     }
-    length = (IC_Current == TY200_080000b) ? 13 : 17;
+    length = (IC_Current == TY200_080000b) ? 13 : 18;
     for( i = 0; i < length; i++)
     {
         DiagDataForDFlash.DID_F187[i] = MCU_PartNumber[i];
@@ -145,7 +146,8 @@ void Data_Set_DiagPara(void)
     {
         DiagDataForDFlash.DID_F195[i] = MCU_SWversion[i];
     }
-    for(i = 0; i < 1; i++)
+    Filldata_length = (IC_Current == TY200_080000b) ? 1 : 4;
+    for(i = 0; i < Filldata_length; i++)
     {
         DiagDataForDFlash.Filldata[i] = 0u;
     }
@@ -809,7 +811,7 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A
             }
             UDS_Service_Response(si, POSITIVE_RSP, DIAG_ID_Tx, 2 + 6, UDS_ISO14229_Transfer);
             break;
-        case 0xF180: // 读硬件版本号
+        case 0xF180: // 引导版本信息
             for (i = 0; i < 6; i++)
             {
                 UDS_ISO14229_Transfer[i + 2] = MCU_FBLversion[i];
@@ -818,7 +820,7 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A
             break;
 
         case 0xF187: // 读零件号
-            length = (IC_Current == TY200_080000b) ? 13 : 17;
+            length = (IC_Current == TY200_080000b) ? 13 : 18;
             for (uint8_t i = 0; i < length; i++) 
             {
                 UDS_ISO14229_Transfer[i + 2] = MCU_PartNumber[i];

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -338,7 +338,8 @@ typedef struct
     uint8_t  RequestSeedIICnt;
 } Ser27_FlowCtrlCntUnion;
 
-#define DID_F187_SIZE ((IC_Current == TY200_080000b) ? 13 : 17)
+#define DID_F187_SIZE ((IC_Current == TY200_080000b) ? 13 : 18)
+#define Filldata_SIZE ((IC_Current == TY200_080000b) ? 1 : 4)
 typedef struct
 {
     uint32_t Flag;
@@ -346,7 +347,7 @@ typedef struct
     uint8_t DID_F187[DID_F187_SIZE];
     uint8_t DID_F193[6];
     uint8_t DID_F195[6];
-    uint8_t Filldata[1];
+    uint8_t Filldata[Filldata_SIZE];
 } DiagDFlashData;
 extern DiagDFlashData DiagDataForDFlash;
 

Firmware/utility/Boot_Release/TY200.080000b(ty)/TY200.080000b(ty)_BOOT变更记录.txt

@@ -11,4 +11,13 @@ TY_TY200.080000b(ty)_Boot_B1.01_240620.hex
 ----2024/07/19----
 TY_TY200.080000b(ty)_Boot_B1.02_240719.hex
 变更内容：
-修改诊断ID、修改内部版本号V1.02 24 07 19
\ No newline at end of file
+修改诊断ID、修改内部版本号V1.02 24 07 19
+
+----2024/08/14----
+TY_TY200.080000b(ty)_Boot_B1.03_240814.hex
+变更内容：
+feat：修改需要忽略的文件
+feat：修改内存配置文件
+feat：领导规定，将时钟放到SRAM中运行
+feat：修改BOOT内部版本号103 230814
+feat：修改零件号长度
\ No newline at end of file

Firmware/utility/Boot_Release/TY200.080000b/TY200.080000b_BOOT变更记录.txt

@@ -18,4 +18,10 @@ TY_TY200.080000b_Boot_B1.02_240620.hex
 ----2024/07/19----
 TY_TY200.080000b_Boot_B1.03_240719.hex
 变更内容：
-修改诊断ID、修改内部版本号V1.03 24 07 19
\ No newline at end of file
+修改诊断ID、修改内部版本号V1.03 24 07 19
+
+----2024/08/14----
+TY_TY200.080000b_Boot_B1.04_240814.hex
+变更内容：
+feat：修改内部版本号104 240814
+feat：修改内存配置文件
\ No newline at end of file