调整报警

source/Application/Alarm/Popups.c

@@ -19,11 +19,6 @@
 #include "Data_Voltmeter.h"
 #include "Data_Fuel_User.h"
 
-static uint8_t CRUISE_1_Time     = 0x00u;
-static uint8_t CRUISE_STUDY_Time = 0x00u;
-static uint8_t CRUISE_SLD1_Time  = 0x00u;
-static uint8_t CRUISE_SLD2_Time = 0x00u;
-
 void Popups_Management_Service(void)
 {
     Popups_Polling( );
@@ -213,8 +208,9 @@ void Popups_Polling(void)
             /*----第三组---------------------------------------------------------------------*/
             /*9.自动巡航模式*/
             variable_1 = Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp();
+            variable_2 = Common_Get_Cruise_Time();
 
-            if (variable_1 == 0x01u) //5s内不显示
+            if ((variable_1 == 0x01u) && (variable_2 < 30u)) //5s内不显示
             {
                 Popup_Request(POPUP3_CRUISE);
             }
@@ -225,8 +221,9 @@ void Popups_Polling(void)
 
             /*10.可变SLD 模式*/
             variable_1 = Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp();
+            variable_2 = Common_Get_Cruise_SLD_Time();
 
-            if (variable_1 == 0x03u) //5s内不显示
+            if ((variable_1 == 0x03u) && (variable_2 < 30u)) //5s内不显示
             {
                 Popup_Request(POPUP3_VARIABLE_SLD);
             }

source/Application/Graphic/GUI/GUI.c

@@ -631,7 +631,7 @@ void GUI_AdBlue_Dispaly(uint8_t Mode)
  --------------------------------------------------------------------------*/
 void Gui_TRIPA_Display(uint8_t Mode)
 {
-    uint16_t TRIPA_value = 0u;
+    uint32_t TRIPA_value = 0u;
 
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
@@ -643,7 +643,7 @@ void Gui_TRIPA_Display(uint8_t Mode)
         GUI_Translate_Display(TRIP_Sprite, Nb_19_dian, 668u, 410u, GUI_BLENDMODE_SRC_OVER); /*显示 小数点*/
 
         /*显示 TRIP A 的数值*/
-        GUI_General_Digit_Display(TRIP_Sprite, TRIPA_value, CN_RC_Nb_19_0, 5u, 3u, GUI_DISP_TRIPA, 389, GUI_BLENDMODE_SRC_OVER);
+        GUI_General_Digit_Display(TRIP_Sprite, TRIPA_value, CN_RC_Nb_19_0, 7u, 5u, GUI_DISP_TRIPA, 389, GUI_BLENDMODE_SRC_OVER);
 
         GUI_Translate_Display(TRIP_Sprite, CN_ODO_danwei, 699u, 400u, GUI_BLENDMODE_SRC_OVER); /*显示文字 “ km ”*/
     }
@@ -655,7 +655,7 @@ void Gui_TRIPA_Display(uint8_t Mode)
 
 void Gui_TRIPB_Display(uint8_t Mode)
 {
-    uint16_t TRIPB_value = 0u;
+    uint32_t TRIPB_value = 0u;
 
     if (Mode == GUI_DISP_MODE_NORMAL)
     {
@@ -667,7 +667,7 @@ void Gui_TRIPB_Display(uint8_t Mode)
         GUI_Translate_Display(TRIP_Sprite, Nb_19_dian, 668u, 410u, GUI_BLENDMODE_SRC_OVER); /*显示 小数点*/
 
         /*显示 TRIP B 的数值*/
-        GUI_General_Digit_Display(TRIP_Sprite, TRIPB_value, CN_RC_Nb_19_0, 5u, 3u, GUI_DISP_TRIPA, 389, GUI_BLENDMODE_SRC_OVER);
+        GUI_General_Digit_Display(TRIP_Sprite, TRIPB_value, CN_RC_Nb_19_0, 7u, 5u, GUI_DISP_TRIPA, 389, GUI_BLENDMODE_SRC_OVER);
 
         GUI_Translate_Display(TRIP_Sprite, CN_ODO_danwei, 699u, 400u, GUI_BLENDMODE_SRC_OVER); /*显示文字 “ km ”*/
     }

source/Application/Graphic/GUI/GUI.h

@@ -169,8 +169,9 @@ static const GUIGeneralPopupStruct GUIGeneralPopupTable[] =
     {CN_Alarm_drive_06_image, CN_Alarm_drive_06_wenzi, SpriteSize, SpriteSize             , SpriteSize}, /*07.忘记松手刹车*/
     {CN_Alarm_drive_10_image, CN_Alarm_drive_10_wenzi, SpriteSize, SpriteSize             , SpriteSize}, /*08.遥控调整车辆高度(有车速)*/
     /*----第三组----*/
-    {0, 0, 0, 0, 0}, /*09.自动巡航模式*/
-    {0, 0, 0, 0, 0}, /*10.可变SLD 模式*/
+    {CN_Alarm_drive_12_image, CN_Alarm_drive_12_wenzi, SpriteSize, CN_Alarm_drive_12_wenzi, SpriteSize}, /*09.自动巡航模式*/
+    {CN_Alarm_drive_14_image, CN_Alarm_drive_14_wenzi, SpriteSize, CN_Alarm_drive_14_wenzi, SpriteSize}, /*10.可变SLD 模式*/
+    /*----第四组----*/
     {0, 0, 0, 0, 0}, /*11.充电异常（系统检测）*/
     {0, 0, 0, 0, 0}, /*12.油压（系统检测）*/
     {0, 0, 0, 0, 0}, /*13.AMT初始化异常*/
@@ -268,7 +269,7 @@ static const uint16_t GUI_DISP_Minutes[2] = {428u, 406u};
 static const uint16_t GUI_DISP_Year[4] = {568u, 552u, 538u, 522u};
 static const uint16_t GUI_DISP_Month[2] = {617u, 604u};
 static const uint16_t GUI_DISP_Date[2] = {669u, 653u};
-static const uint16_t GUI_DISP_TRIPA[5] = {676u, 648u, 629u, 610u, 591u};               /*TRIP*/
+static const uint16_t GUI_DISP_TRIPA[7] = {676u, 648u, 629u, 610u, 591u, 572u, 553u};   /*TRIP*/
 static const uint16_t GUI_DISP_ODO[7] = {676u, 657u, 638u, 619u, 600u, 581u, 562u};     /*ODO*/
 static const uint16_t GUI_DISP_DrivingSupport[3] = {481u, 459u, 436u};                  /*定速巡航*/
 static const uint16_t GUI_DISP_OILTEMP[7] = {729u, 697u, 676u, 655u, 634u, 613u, 592u}; /*油温时间*/

source/Application/RTE/Common_Interface.c

@@ -56,7 +56,6 @@ static void Individual_ECU_Communication(void);
 
 _EOL_K_LINE_SET K_Line_Set;
 
-
 /**/
 static  uint16_t User_FDJYLQQ_Time;
 static  uint16_t User_RYLQQ_Time;
@@ -67,6 +66,12 @@ static  uint16_t User_KQGZJ_Time;
 static  uint16_t User_DLZXY_Time;
 static  uint16_t User_LT_Time;
 
+static uint8_t CRUISE_1_Time    ;
+static uint8_t CRUISE_STUDY_Time;
+static uint8_t CRUISE_SLD1_Time ;
+static uint8_t CRUISE_SLD2_Time ;
+
+
 /*每次唤醒调用*/
 void Common_DataInit(void)
 {
@@ -93,6 +98,11 @@ void Common_DataInit(void)
     User_KQGZJ_Time  = 0x00u;
     User_DLZXY_Time  = 0x00u;
     User_LT_Time  = 0x00u;
+
+    CRUISE_1_Time = 0x00u;
+    CRUISE_STUDY_Time = 0x00u;
+    CRUISE_SLD1_Time = 0x00u;
+    CRUISE_SLD2_Time = 0x00u;
 }
 
 /*以下由各个处理模块按需调用*/
@@ -330,6 +340,39 @@ void Common_Input_Para(void)
         }
 
         /**/
+        if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 1u)
+        {
+            if (CRUISE_1_Time    < 40)
+            {
+                CRUISE_1_Time++      ;
+            }
+        }
+        else
+        {
+            CRUISE_1_Time     = 0;
+        }
+        if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 2u)
+        {
+            if (CRUISE_STUDY_Time < 40)
+            {
+                CRUISE_STUDY_Time++ ;
+            }
+        }
+        else
+        {
+            CRUISE_STUDY_Time = 0;
+        }
+        if (Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp() == 3u)
+        {
+            if (CRUISE_SLD1_Time < 40)
+            {
+                CRUISE_SLD1_Time++;
+            }
+        }
+        else
+        {
+            CRUISE_SLD1_Time  = 0;
+        }
     }
     else
     {
@@ -435,6 +478,19 @@ int32_t SEGGER_RTT_printf(uint16_t BufferIndex, const char *sFormat, ...)
     return 0;
 }
 
+uint8_t Common_Get_Cruise_Time(void)
+{
+    return CRUISE_1_Time;
+}
+
+uint8_t Common_Get_Cruise_SLD_Time(void)
+{
+    return CRUISE_SLD1_Time;
+}
+
+
+
+
 /*EOL诊断配置数据转换为仪表配置数据*/
 void ReadDTCEOLValue_Meter_K_LINE(void)
 {

source/Application/RTE/Common_Interface.h

@@ -126,6 +126,9 @@ void Set_Can18FF5510_FirstRecv_Event(void);
 void Set_Can18FF2300_FirstRecv_Event(void);
 uint8_t Get_CanFirstRecv_Event(uint8_t ID);
 
+uint8_t Common_Get_Cruise_Time(void);
+uint8_t Common_Get_Cruise_SLD_Time(void);
+
 void ReadDTCEOLValue_Meter_K_LINE(void);
 void K_LINE_EOL_InitVal(void);
 

source/Driver/Graphic/loc_graphics_data.h

@@ -29,7 +29,7 @@ uint8_t             AdBlueEn = 0u;
 LogicLayerAttr_t    AdBlueLogicLayerAttr[MAX_ADBLUE_SUP_LAYER];
 
 /*区域2 TRIP*/
-#define MAX_TRIP_SUP_LAYER        10
+#define MAX_TRIP_SUP_LAYER        15
 MultiBufferSprite_t TRIPSpriteBuf;
 uint8_t             TRIPIndex = 0u;
 uint8_t             TRIPUpdate = 0u;