调整诊断ID，调整保养通知机油&滤清器显示功能

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c

@@ -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++;

source/Application/Graphic/GUI/GUI.c

@@ -4355,7 +4355,12 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
         }
         else
         {
-            if (Sig_Engine_Oil == 1u)/*事前报警*/
+            if ((Sig_Engine_Oil == 3u) || (State_Flag.Engine_Oil_Time >= 100u)) //(Sig_Starter_OH == 3u))/*空白*//*此报文掉线5S*/
+            {
+                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

@@ -10,6 +10,6 @@
 
 #define DIAG_ID_Tx                0x7F8           /*发送ID*/
 #define DIAG_ID_Rx_PHY            0x7F0            /*接收ID,物理寻址*/
-#define DIAG_ID_Rx_FUN            0x7F0            /*接收ID,功能寻址*/
+#define DIAG_ID_Rx_FUN            0x7F1            /*接收ID,功能寻址*/
 
 #endif
\ No newline at end of file

source/Driver/CAN/RSCAN_Table.c

@@ -43,5 +43,5 @@ const RSCANFD_Filter_st_t CANFD_RX_RULE_TABLE_LIST[CANFD0_RX_RULE_SIZE] =
     {0x000007E8ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 1*/
 
     {0x000007F0ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 2*/
-    //{0x00000112ul, 0xDFFFFFFFUL, 0x80000000ul, CANFD0_CH2_RX_SELECT},/* 3*/
+    {0x000007F1ul, 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 2U
+#define CANFD0_CH2_RX_RULE_SIZE 3U
 
 
 #define CANFD0_RX_RULE_SIZE (CANFD0_CH0_RX_RULE_SIZE + \