Merge branch 'ZMY' into 'dev'

修改QAC问题 增加DID读取ESP32程序版本号、增加BOOT文件、修改变更记录

See merge request !34

Firmware/Source/UDS/UDS_ISO14229_Services.c

@@ -36,7 +36,7 @@ extern const ProjectInfoStruct ProjectInfo __attribute__((section(".ARM.__at_0x0
         "CAN_STD",
         "CAN_CH_0",
         "CAN_500Kbps",
-        {DIAG_ID_Tx, DIAG_ID_Rx_PHY, DIAG_ID_Rx_FUN}
+        {DIAG_ID_Tx, DIAG_ID_Rx_PHY, DIAG_ID_Rx_FUN, 0}
     }
 };
 #else
@@ -49,7 +49,7 @@ extern const ProjectInfoStruct ProjectInfo __attribute__((section(".ARM.__at_0x0
         "CAN_STD",
         "CAN_CH_0",
         "CAN_500Kbps",
-        {DIAG_ID_Tx, DIAG_ID_Rx_PHY, DIAG_ID_Rx_FUN}
+        {DIAG_ID_Tx, DIAG_ID_Rx_PHY, DIAG_ID_Rx_FUN, 0}
     }
 };
 #endif
@@ -78,9 +78,6 @@ uint8_t  DiagLockFlag = 0;
 uint8_t  Seed [ 4 ];
 uint32_t ValidSeedKey;
 uint8_t  Services27_01_Requested;
-/************Speed**************/
-extern uint16_t DataVSpeedDisp;
-extern uint16_t DataESpeedDisp;
 /******************************************************************************
  The service access point of the diagnostics application layer provides a number
  of services that all have the same general structure. For each service, three
@@ -718,7 +715,7 @@ static const uint8_t Ser22BanResponse = DisableResponseType;
 static const uint8_t Ser22Sub []      = {0xFF};
 static const uint8_t Ser22MinLen []   = {2};
 static const uint8_t Ser22SubLen []   = {2};
-static const uint16_t Ser22DIDList [] = {0xF195, 0xF193, 0xF180, 0xF187, 0x1024, 0x1028, 0xF184 };
+static const uint16_t Ser22DIDList [] = {0xF195, 0xF193, 0xF180, 0xF187, 0x1024, 0x1028, 0xF184,0x2024 };
 static const uint8_t Ser22UnlockLevel []       = {NoNeed};
 static const uint8_t Ser22SupportSession       = DefaultMode | ProgrammingMode | ExtendedDiagnosticMode;
 static const uint8_t Ser22SubSupportSession [] = {DefaultMode | ProgrammingMode | ExtendedDiagnosticMode};
@@ -865,6 +862,11 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A
             UDS_Service_Response(0x22, POSITIVE_RSP, DIAG_ID_Tx, 2 + 32, UDS_ISO14229_Transfer);
             break;
 
+        case 0x2024: // ESP32内部版本号
+            UDS_ISO14229_Transfer[3] = BlueTooth.ESP32_SWV;
+            UDS_Service_Response(0x22, POSITIVE_RSP, DIAG_ID_Tx, 2 + 1, UDS_ISO14229_Transfer);
+            break;
+
         default:
             if (FunorPhy == DIAG_ID_Rx_FUN)
             {

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

 ----2024/06/7----
 BOOT文件V1.0
 文件名：TY_TY200.080000b(ty)_Boot_B1.00_240607.hex
-变更内容：BOOT文件出版提交
\ No newline at end of file
+变更内容：BOOT文件出版提交
+
+----2024/06/20----
+TY_TY200.080000b(ty)_Boot_B1.01_240620.hex
+变更内容：修改QAC问题、修改内部版本号
\ No newline at end of file

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

@@ -8,4 +8,9 @@ BOOT文件V1.0
 文件名：TY_TY200.080000b_Boot_B1.01_240602.hex
 变更内容：、
 1、由于硬件较慢，连续帧发不出来，增加连续帧的延时，增大STmin
-2、修改内部版本号
\ No newline at end of file
+2、修改内部版本号
+
+
+----2024/06/20----
+TY_TY200.080000b_Boot_B1.02_240620.hex
+变更内容：修改QAC问题、修改内部版本号
\ No newline at end of file