Merge branch 'development' into withBoot

source/Application/APP/Data_CoolantTemperature/Data_CoolantTemperature.c

@@ -2,6 +2,10 @@
 #include "CAN_Communication_Matrix.h"
 #include "GaugesInterface.h"
 #include "GPIO.h"
+
+#include "DisplaySch_user.h"
+#include "DispSch.h"
+
 //-------------------------------------------
 //水温数据处理
 //-------------------------------------------
@@ -170,6 +174,17 @@ uint8_t Coolant_Get_Valid(void)
 uint8_t Coolant_Get_CurSeg(void)
 {
     uint8_t u8Result = 0u;
-    u8Result = CoolantVariable.CurSeg ;
+    UElib_uint16_t HMI_MENU_Sta = 0u;
+
+    HMI_MENU_Sta = Get_Cur_HMI();
+
+    if (HMI_MENU_Sta != Display_StartAnimation)
+    {
+        u8Result = CoolantVariable.CurSeg ;
+    }
+    else
+    {
+        u8Result = 0;
+    }
     return u8Result;
 }
\ No newline at end of file

source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c

@@ -821,7 +821,7 @@ uint8_t  Get_ID_18F0010B_Sig_ASR_Brake_Control_Active(void)
 
 uint8_t  Get_ID_18F0010B_Sig_HSAGreen_Sta(void)
 {
-    return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18F0010B_Msg_Count, 0u) >> 4u) & 0x03u));
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18F0010B_Msg_Count, 2u) >> 4u) & 0x03u));
 }
 
 uint8_t  Get_ID_18F0010B_Sig_ASR_Offroad_Switch(void)

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c

@@ -91,7 +91,7 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData[])
     Main_Air_Pressure = (uint8_t)((Common_Get_WET_Data() - 500u) / 20u);
 
     /*气压状态*/
-    if ((K_Line_Set.K_Line_LID42 == 0x00u) || (K_Line_Set.K_Line_LID42 == 0x03u))
+    if ((K_Line_Set.K_Line_LID42 == 0x02u) || (K_Line_Set.K_Line_LID42 == 0x03u))
     {
         if (Common_Get_Air1_Data() != 0u)
         {
@@ -111,7 +111,7 @@ void Can_Set_Buff_18FEAE17(uint8_t CopyData[])
             Service_Brake_Circuit2_AirPressure = 0u;
         }
     }
-    else if ((K_Line_Set.K_Line_LID42 == 0x01u) || (K_Line_Set.K_Line_LID42 == 0x02u))
+    else if ((K_Line_Set.K_Line_LID42 == 0x00u) || (K_Line_Set.K_Line_LID42 == 0x01u))
     {
         if (Common_Get_Air2_Data() != 0u)
         {
@@ -466,7 +466,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
     {
         Water_Temp_Level = 0 ;
     }
-    else if ((Coolant_Get_CurSeg() >= 11) && (Coolant_Get_CurSeg() <= 12) && (Temperature >= 0x96u))
+    else if ((Coolant_Get_CurSeg() >= 11) && (Coolant_Get_CurSeg() <= 12))
     {
         Water_Temp_Level = 1 ;
     }
@@ -1459,7 +1459,7 @@ void Drive_Info_IC1_STATUS_Rx(void)
 
     if (Data_Sig == 0x40u)
     {
-        State_Flag.FState_ClearOilRx == 1;
+        State_Flag.FState_ClearOilRx = 1;
     }
 }
 

source/Application/UDS/TP/Diag_ID_Def.h

@@ -8,8 +8,8 @@
 #ifndef _DIAG_ID_DEF_H_
 #define _DIAG_ID_DEF_H_
 
-#define DIAG_ID_Tx                0x0113            /*发送ID*/
-#define DIAG_ID_Rx_PHY            0x0112            /*接收ID,物理寻址*/
-#define DIAG_ID_Rx_FUN            0x0111            /*接收ID,功能寻址*/
+#define DIAG_ID_Tx                0x7F8           /*发送ID*/
+#define DIAG_ID_Rx_PHY            0x7F0            /*接收ID,物理寻址*/
+#define DIAG_ID_Rx_FUN            0x7F0            /*接收ID,功能寻址*/
 
 #endif
\ No newline at end of file

source/Driver/CAN/RSCAN_Table.c

@@ -42,6 +42,6 @@ const RSCANFD_Filter_st_t CANFD_RX_RULE_TABLE_LIST[CANFD0_RX_RULE_SIZE] =
 
     {0x000007E8ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 1*/
 
-    {0x00000111ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 2*/
-    {0x00000112ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 3*/
+    {0x000007F0ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 2*/
+    //{0x00000112ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 3*/
 };
\ No newline at end of file

source/Driver/CAN/RSCAN_Table.h

@@ -13,7 +13,7 @@ typedef struct
 
 #define CANFD0_CH0_RX_RULE_SIZE 24u
 #define CANFD0_CH1_RX_RULE_SIZE 0U
-#define CANFD0_CH2_RX_RULE_SIZE 3U
+#define CANFD0_CH2_RX_RULE_SIZE 2U
 
 
 #define CANFD0_RX_RULE_SIZE (CANFD0_CH0_RX_RULE_SIZE + \