Merge branch 'ZMY' into 'dev'

修改QAC问题

See merge request !82

Firmware/Source/UDS/DoCAN_ISO15765.c

@@ -353,7 +353,7 @@ void DoCAN_L_Data_Indication(uint16_t Identifier, uint32_t dlc, uint8_t *pData)
     LinkRxFIFO.LinkData [ LinkRxFIFO.IPtr ].Identifier = Identifier;    // 装入报文ID
     for ( i = 0; i < dlc; i++ )                                         // 拷贝报文
         LinkRxFIFO.LinkData [ LinkRxFIFO.IPtr ].Data [ i ] = *(pData + i);
-    LinkRxFIFO.LinkData [ LinkRxFIFO.IPtr ].DLC = dlc;    // 保存报文长度
+    LinkRxFIFO.LinkData [ LinkRxFIFO.IPtr ].DLC = (uint8_t)dlc;    // 保存报文长度
 
     LinkRxFIFO.Depth++;    // 新报文装入,深度+1
     LinkRxFIFO.IPtr++;     // 输入指针+1

Firmware/Source/UDS/UDS_ISO14229_Services.c

@@ -276,7 +276,7 @@ uint8_t SerXXNRC12Filter(uint8_t insub, const uint8_t *supportsub, uint8_t size,
     return nrccode;
 }
 
-uint8_t SerXXNRC13Filter(uint8_t type, uint8_t serlength, const uint8_t *length, uint8_t index)
+uint8_t SerXXNRC13Filter(uint8_t type, uint16_t serlength, const uint8_t *length, uint8_t index)
 {
     uint8_t nrccode;
     nrccode = incorrectMessageLength;
@@ -789,7 +789,7 @@ void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A
     if (0 == NrcCode)
     {
         DID = ((uint16_t)UDS_ISO14229_Transfer[0] << 8) | UDS_ISO14229_Transfer[1];
-        NrcCode = SerXXNRC31DIDFilter(DID, Ser22DIDList, (sizeof(Ser22DIDList) / 2), &Index);
+        NrcCode = SerXXNRC31DIDFilter(DID, Ser22DIDList, (uint8_t)(sizeof(Ser22DIDList) / 2), &Index);
     }
 
     if (0 == NrcCode)
@@ -903,7 +903,7 @@ void UDS_Service_2E_Indication ( uint16_t A_TA_type, uint16_t A_Length, uint8_t
 {
     uint16_t i;
     uint16_t DID;
-    uint8_t  Service2EDiagDataLength;
+    uint16_t  Service2EDiagDataLength;
     uint16_t FunorPhy = 0;
     Service2EDiagDataLength = A_Length;
     S3_ServerCnt = 0;

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -393,7 +393,7 @@ typedef void (*InitFunction)(void);
 /***********Local Functin*************/
 uint8_t GetCurrentSession(void);
 uint8_t SerXXNRC12Filter(uint8_t insub, const uint8_t *supportsub, uint8_t size, uint8_t *index);
-uint8_t SerXXNRC13Filter(uint8_t type, uint8_t serlength, const uint8_t *length, uint8_t index);
+uint8_t SerXXNRC13Filter(uint8_t type, uint16_t serlength, const uint8_t *length, uint8_t index);
 uint8_t SerXXNRC22Filter(void);
 uint8_t SerXXNRC31DIDFilter(uint16_t inDID, const uint16_t *DIDList, uint8_t size, uint8_t *index);
 uint8_t SerXXNRC33Filter(const uint8_t *levelList, uint8_t index);