Merge branch 'development' into menutest

source/Application/APP/Telltales/Telltales_user.c

@@ -739,7 +739,7 @@ uint8_t LED_H_S_A_T_Judgement(void)
 
     /*禅道4885*/
     m_Condition1 = Get_ID_18FDC40B_Sig_HSAYellow_Sta();
-    m_Condition2 = Get_ID_18F0010B_Sig_HSAGreen();
+    m_Condition2 = Get_ID_18F0010B_Sig_HSAGreen_Sta();//Get_ID_18F0010B_Sig_HSAGreen();
 
     if (m_Condition1 == 1u)
     {

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c

@@ -2160,9 +2160,12 @@ void DoCAN_Get_Multi_frame00_Recv(void)
         )
         {
             for (i = 1 ; i < 8; i++)
+            {
+                if (ECM18EBFF00.bCtrByte < MAX_MULCANDATALEN)
                 {
                     ECM18EBFF00.DataDTC.UnionDTC[ECM18EBFF00.bCtrByte++] = Get_ID_18EBFF00_Sig_DATA(i);
                 }
+            }
             ECM18EBFF00.bPrePckNum ++;
             ECM18EBFF00.bRcvBusy = 1;    /*正在接收*/
         }
@@ -2216,9 +2219,12 @@ void DoCAN_Get_Multi_frame03_Recv(void)
         )
         {
             for (i = 1 ; i < 8; i++)
+            {
+                if (ECM18EBFF03.bCtrByte < MAX_MULCANDATALEN)
                 {
                     ECM18EBFF03.DataDTC.UnionDTC[ECM18EBFF03.bCtrByte++] = Get_ID_18EBFF03_Sig_DATA(i);
                 }
+            }
             ECM18EBFF03.bPrePckNum ++;
             ECM18EBFF03.bRcvBusy = 1;    /*正在接收*/
         }
@@ -2272,9 +2278,12 @@ void DoCAN_Get_Multi_frame0B_Recv(void)
         )
         {
             for (i = 1 ; i < 8; i++)
+            {
+                if (ECM18EBFF0B.bCtrByte < MAX_MULCANDATALEN)
                 {
                     ECM18EBFF0B.DataDTC.UnionDTC[ECM18EBFF0B.bCtrByte++] = Get_ID_18EBFF0B_Sig_DATA(i);
                 }
+            }
             ECM18EBFF0B.bPrePckNum ++;
             ECM18EBFF0B.bRcvBusy = 1;    /*正在接收*/
         }
@@ -2326,9 +2335,12 @@ void DoCAN_Get_Multi_frame10_Recv(void)
         )
         {
             for (i = 1 ; i < 8; i++)
+            {
+                if (ECM18EBFF10.bCtrByte < MAX_MULCANDATALEN)
                 {
                     ECM18EBFF10.DataDTC.UnionDTC[ECM18EBFF10.bCtrByte++] = Get_ID_18EBFF10_Sig_DATA(i);
                 }
+            }
             ECM18EBFF10.bPrePckNum ++;
             ECM18EBFF10.bRcvBusy = 1;    /*正在接收*/
         }
@@ -2380,9 +2392,12 @@ void DoCAN_Get_Multi_frameA0_Recv(void)
         )
         {
             for (i = 1 ; i < 8; i++)
+            {
+                if (ECM18EBFFA0.bCtrByte < MAX_MULCANDATALEN)
                 {
                     ECM18EBFFA0.DataDTC.UnionDTC[ECM18EBFFA0.bCtrByte++] = Get_ID_18EBFFA0_Sig_DATA(i);
                 }
+            }
             ECM18EBFFA0.bPrePckNum ++;
             ECM18EBFFA0.bRcvBusy = 1;    /*正在接收*/
         }
@@ -2434,9 +2449,12 @@ void DoCAN_Get_Multi_frameE8_Recv(void)
         )
         {
             for (i = 1 ; i < 8; i++)
+            {
+                if (ECM18EBFFE8.bCtrByte < MAX_MULCANDATALEN)
                 {
                     ECM18EBFFE8.DataDTC.UnionDTC[ECM18EBFFE8.bCtrByte++] = Get_ID_18EBFFE8_Sig_DATA(i);
                 }
+            }
             ECM18EBFFE8.bPrePckNum ++;
             ECM18EBFFE8.bRcvBusy = 1;    /*正在接收*/
         }