Merge branch 'withBoot' of http://tyw-server.synology.me:12345/isuzu/vc66_7c 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 ;
     }
@@ -1399,6 +1399,7 @@ void Drive_Info_IC1_STATUS_Rx(void)
             break;
         case 0x20:
             User_ECU.Engine_Oil = Temp;
+            State_Flag.Engine_Oil_Time = 0u;
         case 0x22:
             User_ECU.Engine_Surplus = Temp;
             break;
@@ -1452,6 +1453,12 @@ void Drive_Info_IC1_STATUS_Rx(void)
         break;
     }
 
+    /*单报文掉线计时----针对"发动机油 ＆滤清器"此功能----20220718*/
+    if (State_Flag.Engine_Oil_Time < 0xFFu)
+    {
+        State_Flag.Engine_Oil_Time++;
+    }
+
     if (State_Flag.FState_COilTimeOut < FState_COilTimeOutNum)
     {
         State_Flag.FState_COilTimeOut++;
@@ -1459,7 +1466,7 @@ void Drive_Info_IC1_STATUS_Rx(void)
 
     if (Data_Sig == 0x40u)
     {
-        State_Flag.FState_ClearOilRx == 1;
+        State_Flag.FState_ClearOilRx = 1;
     }
 }
 

source/Application/Graphic/GUI/GUI.c

@@ -4348,14 +4348,19 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
 
         User_Value = (User_ECU.Engine_Oil / 1000u); /*显示数据*/
 
-        if (CanStatus == CAN_SIG_LOST)
+        if ((CanStatus == CAN_SIG_LOST) || (State_Flag.Engine_Oil_Time >= 100u))/*此报文掉线5S*/
         {
             GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
             GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_ERROR, GUI_BLENDMODE_SRC_OVER); /*error*/
         }
         else
         {
-            if (Sig_Engine_Oil == 1u)/*事前报警*/
+            if (Sig_Engine_Oil == 3u) //(Sig_Starter_OH == 3u))/*空白*/
+            {
+                GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
+                GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
+            }
+            else if ((Sig_Engine_Oil == 1u) && (User_Value >= 1u) && (User_Value <= 1000u)) /*事前报警*/
             {
                 GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_14, GUI_BLENDMODE_SRC_OVER); /*即将请更换*/
 
@@ -4370,10 +4375,11 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
 
                 GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
             }
-            else if ((Sig_Engine_Oil == 0u) || (Sig_Starter_OH == 0u)) /*无报警*/
+            else if ((Sig_Engine_Oil == 2u) && (User_Value == 0u)) // || (Sig_Starter_OH == 2u)) /*本报警*/
             {
-                GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER);/*距离更换*/
+                GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_13, GUI_BLENDMODE_SRC_OVER); /*请更换*/
 
+                GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER);  /*负号*/
                 if (User_Value >= 1000u)
                 {
                     GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
@@ -4383,13 +4389,12 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
                     GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
                 }
 
-                GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
+                GUI_General_Digit_Display(MENU_Sprite, 1000u, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
             }
-            else if ((Sig_Engine_Oil == 2u) || (Sig_Starter_OH == 2u)) /*本报警*/
+            else if (Sig_Engine_Oil == 0u) //|| (Sig_Starter_OH == 0u)) /*无报警*/
             {
-                GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_13, GUI_BLENDMODE_SRC_OVER); /*请更换*/
+                GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER);/*距离更换*/
 
-                GUI_Translate_Display(MENU_Sprite, Nb_15_fuhao, 506u, 279u, GUI_BLENDMODE_SRC_OVER);  /*负号*/
                 if (User_Value >= 1000u)
                 {
                     GUI_Translate_Display(MENU_Sprite, Nb_15_douhao, 534u, 281u, GUI_BLENDMODE_SRC_OVER); /*逗号*/
@@ -4401,15 +4406,10 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
 
                 GUI_General_Digit_Display(MENU_Sprite, User_Value, Nb_15_0, 6u, 5u, GUI_REP1_X, 277u, GUI_BLENDMODE_SRC_OVER);
             }
-            else if ((Sig_Engine_Oil == 3u) || (Sig_Starter_OH == 3u))/*空白*/
+            else/*发送了没有的状态就什么都不显示*/
             {
-                GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
-                GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
-            }
-            else
-            {
-                GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
-                GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
+                //GUI_General_Display(MENU_Sprite, CN_User_Menu3_01_12, GUI_BLENDMODE_SRC_OVER); /*距离更换*/
+                GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_CUSTOM);
             }
         }
 

source/Application/Graphic/GUI/GUI.h

@@ -88,7 +88,7 @@ typedef struct
     uint8_t FState_ClearOilRx;
 
     uint16_t FState_COilTimeOut;
-    uint8_t Reserve1;
+    uint8_t Engine_Oil_Time;
     uint8_t Reserve2;
 
 } _Display_State_Flag;

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            0x7F1            /*接收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*/
+    {0x000007F1ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 3*/
 };
\ No newline at end of file