Skip to content

H
haoJin750TFT
Commit aa057fca authored by 张金硕's avatar 张金硕
Browse files
Options

Merge branch 'LYK' into 'dev' 

禅道QAC问题修改

See merge request !107
parents 76370aed eedbe43b
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
Firmware/Source/UDS/UDS_ISO14229_Services.c
View file @ aa057fca
...@@ -83,19 +83,19 @@ uint8_t MCU_PartNumber[12] = {'H', 'J', 'Y', 'B', '-', '7', '5', '0', '0', 'T', ...@@ -83,19 +83,19 @@ uint8_t MCU_PartNumber[12] = {'H', 'J', 'Y', 'B', '-', '7', '5', '0', '0', 'T',
/* internal program info */ /* internal program info */
const uint8_t DID_1024[13] = const uint8_t DID_1024[13] =
{ {
((internal_version / 100UL) + 0x30UL), (uint8_t)((internal_version / 100UL) + 0x30UL),
'.', '.',
(((internal_version / 10UL) % 10UL) + 0x30UL), (uint8_t)(((internal_version / 10UL) % 10UL) + 0x30UL),
((internal_version % 10UL) + 0x30UL), (uint8_t)((internal_version % 10UL) + 0x30UL),
'_', '_',
((internal_date / 10000000UL) + 0x30), (uint8_t)((internal_date / 10000000UL) + 0x30),
(((internal_date / 1000000UL) % 10UL) + 0x30), (uint8_t)(((internal_date / 1000000UL) % 10UL) + 0x30),
(((internal_date / 100000UL) % 10UL) + 0x30), (uint8_t)(((internal_date / 100000UL) % 10UL) + 0x30),
(((internal_date / 10000UL) % 10UL) + 0x30), (uint8_t)(((internal_date / 10000UL) % 10UL) + 0x30),
(((internal_date / 1000UL) % 10UL) + 0x30), (uint8_t)(((internal_date / 1000UL) % 10UL) + 0x30),
(((internal_date / 100UL) % 10UL) + 0x30), (uint8_t)(((internal_date / 100UL) % 10UL) + 0x30),
(((internal_date / 10UL) % 10UL) + 0x30), (uint8_t)(((internal_date / 10UL) % 10UL) + 0x30),
((internal_date % 10UL) + 0x30) (uint8_t)((internal_date % 10UL) + 0x30)
}; };
/*写App有效性标志*/ /*写App有效性标志*/
...@@ -134,7 +134,7 @@ void S3_ServerCNTT(void) ...@@ -134,7 +134,7 @@ void S3_ServerCNTT(void)
if(Service27_DelayTimer >= 100U) if(Service27_DelayTimer >= 100U)
{ {
Service27_DelayTimer_Enable = 0U; Service27_DelayTimer_Enable = 0U;
Attemptcnt -= AttemptMaxCnt - 1U; Attemptcnt = (uint8_t)(AttemptMaxCnt - 1U);
Service27_DelayTimer = 0U; Service27_DelayTimer = 0U;
} }
else else
...@@ -680,12 +680,12 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A ...@@ -680,12 +680,12 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A
case 0x5000U: // 读UUID case 0x5000U: // 读UUID
(void)memcpy(&UDS_ISO14229_Transfer[2], Diag_Write_Data.DID_5000, sizeof(Diag_Write_Data.DID_5000)); (void)memcpy(&UDS_ISO14229_Transfer[2], Diag_Write_Data.DID_5000, sizeof(Diag_Write_Data.DID_5000));
UDS_Service_Response(si, POSITIVE_RSP, DIAG_ID_Tx, 2 + sizeof(Diag_Write_Data.DID_5000), UDS_ISO14229_Transfer); UDS_Service_Response(si, POSITIVE_RSP, DIAG_ID_Tx, (uint16_t)(2 + sizeof(Diag_Write_Data.DID_5000)), UDS_ISO14229_Transfer);
break; break;
case 0x1024: // 读内部版本号 case 0x1024: // 读内部版本号
(void)memcpy(&UDS_ISO14229_Transfer[2], DID_1024, sizeof(DID_1024)); (void)memcpy(&UDS_ISO14229_Transfer[2], DID_1024, sizeof(DID_1024));
UDS_Service_Response(si, POSITIVE_RSP, DIAG_ID_Tx, 2 + sizeof(DID_1024), UDS_ISO14229_Transfer); UDS_Service_Response(si, POSITIVE_RSP, DIAG_ID_Tx, (uint16_t)(2 + sizeof(DID_1024)), UDS_ISO14229_Transfer);
break; break;
// case 0x2024: // ESP32内部版本号 // case 0x2024: // ESP32内部版本号
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment