调整BUG

source/Application/APP/Data_Fuel/Data_Fuel_User.c

@@ -266,3 +266,25 @@ uint16_t Fuel_Get_Step(void)
 
     return FuelStep;
 }
+
+uint8_t Fuel_Get_Popup_Sta(void)
+{
+    uint8_t variable_1 = 0x00u;
+    uint8_t variable_2 = 0x00u;
+    uint16_t variable_5 = 0x00u;
+
+    uint8_t Popup_Sta = 0u;
+
+    variable_1 = Fuel_Get_CurSeg();/*格*/
+    variable_2 = GetFuelSensorState();/*燃油状态*/
+    variable_5 = GetFuelResistance(); /*采集的阻值*/
+
+    if ((variable_1 <= 1 ) && (variable_2 == FuelSensorNormal) && (variable_5 != 65535))
+    {
+        Popup_Sta = 1u;
+    }
+    else
+    {
+        Popup_Sta = 0u;
+    }
+}
\ No newline at end of file

source/Application/APP/Data_Fuel/Data_Fuel_User.h

@@ -14,4 +14,7 @@ extern void Fuel_User_KL15_OFF_Processing_Service(void);
 extern uint8_t Fuel_Get_CurSeg(void);
 extern uint16_t Fuel_Get_Res(void);
 extern uint16_t Fuel_Get_Step(void);
+extern uint8_t Fuel_Get_Popup_Sta(void);
+
+
 #endif

source/Application/APP/PowerManagement/PowerManagement_user.c

@@ -32,7 +32,7 @@
 #include "BackLight_APP.h"
 #include "Clock.h"
 #include "TimerB.h"
-
+#include "SEG_DISPLAY.h"
 #include "CD4051.h"
 #include "GaugesInterface.h"
 #include "DisplaySch_user.h"
@@ -62,6 +62,7 @@ Power_Status_t Power_KL30_Init ( void )
 {
     Power_Status_t u8PowerSts;
     RTE_RTC_KL30_Init();
+    CD4051B_KL15Init();
     /*电源 指示灯 硬线 通用信息部分  赵建智 维护开始*/
     ClearNoInitArea();
     Common_DataInit();
@@ -225,6 +226,9 @@ void Power_IG_OFF_Init(void)
     Popup_Scheduler_OFF();
     //Menu_Init_IG(0u);
     GUI_Display_KL15_OFF_Init();
+
+    /*关闭所有断码*/
+    Seg_Display_OFF();
 }
 void Power_IG_ON_Init(void)
 {
@@ -244,10 +248,9 @@ void Power_IG_ON_Init(void)
     /*表头数据处理 added by yutian*/
     UserGaugeK15Init() ;/*仪表IGON调用*/
     /*end*/
-
+    CD4051B_KL15Init();
     /*5s不按按键计时清零*/
     //LongTimeNoKey_Operation_TimeRest();
-    CD4051B_KL15Init();
 
     DispSch_TotalInit();
     GUI_Display_KL15_ON_Init();

source/Application/APP/Telltales/Telltales_user.c

@@ -2001,14 +2001,10 @@ uint8_t LED_Fuel_Judgement(void)
 {
     uint8_t u8Result = 0u;
     uint8_t variable_1 = 0x00u;
-    uint8_t variable_2 = 0x00u;
-    uint16_t variable_5 = 0x00u;
 
-    variable_1 = Fuel_Get_CurSeg();/*格*/
-    variable_2 = GetFuelSensorState();/*燃油状态*/
-    variable_5 = GetFuelResistance(); /*采集的阻值*/
+    variable_1 = Fuel_Get_Popup_Sta();
 
-    if ((variable_1 <= 1 ) && (variable_2 == FuelSensorNormal) && (variable_5 != 65535))//&& (K_Line_Set.K_Line_LID43 == 0x82u))
+    if (variable_1 == 1)//&& (K_Line_Set.K_Line_LID43 == 0x82u))
     {
         u8Result = 1u;
     }

source/Application/Alarm/Popups.c

@@ -281,7 +281,7 @@ void Popups_Polling(void)
                 variable_2 = Gui_Get_Voltmeter_DisplayMode(); /*当前电压格数*/
                 variable_3 = Get_Voltmeter_Valid();
 
-                if ((variable_1 == LINE_IN_LOGIC_VALID) || ((variable_2 < 4u) && (variable_3 == 1u)))
+                if ((variable_1 == 1u) || ((variable_2 < 4u) && (variable_3 == 1u)))
                 {
                     Popup_Request(POPUP4_OIL_PRESSURE);
                 }
@@ -711,13 +711,11 @@ void Popups_Polling(void)
 
             /*----第八组---------------------------------------------------------------------*/
             /*47.--1--补充燃料-油箱单位*/
-            variable_1 = Fuel_Get_CurSeg();    /*格*/
-            variable_2 = GetFuelSensorState(); /*燃油状态*/
-            variable_5 = GetFuelResistance();  /*采集的阻值*/
+            variable_1 =  Fuel_Get_Popup_Sta();
 
             if (K_Line_Set.K_Line_LID43 == 0x82u)
             {
-                if ((variable_1 <= 1) && (variable_2 == FuelSensorNormal) && (variable_5 != 65535))
+                if (variable_1 == 1)
                 {
                     Popup_Request(POPUP8_REFUEL);
                 }
@@ -770,7 +768,7 @@ void Popups_Polling(void)
             {
                 Popup_Request(POPUP8_LOWVOLTAGE);
             }
-            else if (variable_1 == 0x00u)
+            else //if (variable_1 == 0x00u)
             {
                 Popup_Delete(POPUP8_LOWVOLTAGE);
             }
@@ -782,7 +780,7 @@ void Popups_Polling(void)
             {
                 Popup_Request(POPUP8_OVERVOLTAGE);
             }
-            else if (variable_1 == 0x00u)
+            else //if (variable_1 == 0x00u)
             {
                 Popup_Delete(POPUP8_OVERVOLTAGE);
             }

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c

@@ -21,6 +21,7 @@
 #include "kwp2000_service.h"
 #include "DisplaySch_user.h"
 #include "DispSch.h"
+#include "FuelConfig.h"
 
 uint8_t TpmsMsg18033317SendFlag = 0;
 
@@ -450,6 +451,8 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
         Over_Heat_Warning_Status = 0 ;
     }
 
+    /*剩余燃料报警*/
+    Remining_Fuel_Warning = Fuel_Get_Popup_Sta();
     /*电源电压*/
     IGN_Voltage  = (9 + Gui_Get_Voltmeter_DisplayMode()) * 10 ;
 

source/Application/Graphic/GUI/GUI.c

@@ -1602,8 +1602,6 @@ void GUI_Battery_Display_Display(uint8_t Mode)
     {
         GUI_General_Display(MultiPurpose_Sprite, CN_dianyaji_tubiao, GUI_BLENDMODE_SRC_OVER); /*电池*/
         GUI_General_Display(MultiPurpose_Sprite, CN_dianyaji_kedu, GUI_BLENDMODE_SRC_OVER);   /*标尺*/
-        GUI_General_Display(MultiPurpose_Sprite, CN_dianyaji_L, GUI_BLENDMODE_SRC_OVER);      /*L*/
-        GUI_General_Display(MultiPurpose_Sprite, CN_dianyaji_H, GUI_BLENDMODE_SRC_OVER);      /*H*/
 
         current_value = Gui_Get_Voltmeter_DisplayMode();
 
@@ -1740,6 +1738,9 @@ void GUI_Battery_Display_Display(uint8_t Mode)
             GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
             break;
         }
+
+        GUI_General_Display(MultiPurpose_Sprite, CN_dianyaji_L, GUI_BLENDMODE_SRC_OVER);      /*L*/
+        GUI_General_Display(MultiPurpose_Sprite, CN_dianyaji_H, GUI_BLENDMODE_SRC_OVER);      /*H*/
     }
     else
     {

source/Driver/CD4051/CD4051.c

@@ -29,6 +29,29 @@ void CD4051B_KL15Init(void)
             CD4051B_GeneralCOM_Value[i][j] = 0u;
         }
     }
+
+    CD4051B_GeneralCOM_Value[COM1][Channel2] = 1u;
+    CD4051B_GeneralCOM_Value[COM1][Channel3] = 1u;
+    CD4051B_GeneralCOM_Value[COM1][Channel4] = 1u;
+    CD4051B_GeneralCOM_Value[COM1][Channel6] = 1u;
+    CD4051B_GeneralCOM_Value[COM1][Channel7] = 1u;
+    CD4051B_GeneralCOM_Value[COM2][Channel0] = 1u;
+    CD4051B_GeneralCOM_Value[COM2][Channel1] = 1u;
+    CD4051B_GeneralCOM_Value[COM2][Channel2] = 1u;
+    CD4051B_GeneralCOM_Value[COM2][Channel3] = 1u;
+    CD4051B_GeneralCOM_Value[COM2][Channel7] = 1u;
+    CD4051B_GeneralCOM_Value[COM3][Channel4] = 1u;
+    CD4051B_GeneralCOM_Value[COM3][Channel5] = 1u;   /*A20*/
+    CD4051B_GeneralCOM_Value[COM4][Channel2] = 1u;
+    CD4051B_GeneralCOM_Value[COM4][Channel6] = 1u;
+    CD4051B_GeneralCOM_Value[COM4][Channel7] = 1u;
+    CD4051B_GeneralCOM_Value[COM5][Channel4] = 1u;
+    CD4051B_GeneralCOM_Value[COM5][Channel6] = 1u;
+    CD4051B_GeneralCOM_Value[COM6][Channel0] = 1u;
+    CD4051B_GeneralCOM_Value[COM6][Channel3] = 1u;
+    CD4051B_GeneralCOM_Value[COM6][Channel7] = 1u;
+    CD4051B_GeneralCOM_Value[COM7][Channel0] = 1u;
+
     CD4051B_C_MCU = 0u;
     CD4051B_B_MCU = 0u;
     CD4051B_A_MCU = 0u;