Merge branch 'development' into withBoot

source/Application/APP/BackLight/BackGroundLight.c

@@ -3,7 +3,7 @@
 #include "BGLInterface.h"
 #include "GPIO.h"
 #include "Data_CoolantTemperature.h"
-#include "kwp2000_service.h"
+
 #include "Telltales.h"
 #include "Menu.h"
 
@@ -405,7 +405,7 @@ void BackLightDeal(BL_USER_PARA BL_FunPara, BL_STATE_PARA BLFunStatePara)
         SetBacklightDestVal(BL_DIAL, BL_FunPara.BL_User_GaugesDuty);
 
         /*燃油报警*/
-        if (((LED_Fuel_Judgement() == 1u) && (K_Line_Set.K_Line_LID43 == 0x82u)) || (MenuFlag.Menu_Popup_Flag == 4u))
+        if ((LED_Fuel_Judgement() == 1u) || (MenuFlag.Menu_Popup_Flag == 4u))
         {
             SetBacklightDestVal(LED_FUEL, 0);
         }
@@ -414,7 +414,7 @@ void BackLightDeal(BL_USER_PARA BL_FunPara, BL_STATE_PARA BLFunStatePara)
             SetBacklightDestVal(LED_FUEL, BL_FunPara.BL_User_GaugesDuty);
         }
         /*水温报警*/
-        if ((LED_Temp_Judgement() == 1u) && (K_Line_Set.K_Line_LID43 == 0x82u))
+        if (LED_Temp_Judgement() == 1u)
         {
             SetBacklightDestVal(LED_TEMP, 0);
             //SetBacklightDestVal(LED_TEMPBL, 0);
@@ -427,7 +427,8 @@ void BackLightDeal(BL_USER_PARA BL_FunPara, BL_STATE_PARA BLFunStatePara)
             //Water_Temp_Led_R_MCU_OUT = 0u;
         }
         /*水温背光灯*/
-        if ((Coolant_Get_CurSeg() >= 11) && (K_Line_Set.K_Line_LID43 == 0x82u))
+        //if (Coolant_Get_CurSeg() >= 11)
+        if (LED_Temp_Judgement() == 1u)
         {
             SetBacklightDestVal(LED_TEMPBL, 0);
             Water_Temp_Led_R_MCU_OUT = 1u;
@@ -438,7 +439,6 @@ void BackLightDeal(BL_USER_PARA BL_FunPara, BL_STATE_PARA BLFunStatePara)
             Water_Temp_Led_R_MCU_OUT = 0u;
         }
 
-
         for ( i = 0u; i < BACKLIGHT_TOTAL; i++)
         {
             if ((BackLightPara[i].DestBackLightDuty != 0u) && (PwmStopFlag[i] == 1u))

source/Application/APP/BackLight/BackLight_APP.c

@@ -58,7 +58,7 @@ void BL_Init(void)
 void BL_Management_service(void)
 {
     uint8_t Msg;
-    uint8_t LED_Pos;
+    uint8_t LED_Pos = 0u;
     uint8_t LED_Left;
     uint8_t LED_Right;
     uint8_t LED_Plus;

source/Application/APP/Data_Fuel/Data_Fuel_User.c

@@ -6,11 +6,13 @@
 #include "GPIO.h"
 #include "Services_ODO_User.h"
 #include "TYW_stdint.h"
+#include "DisplaySch_user.h"
+#include "DispSch.h"
+#include <string.h>
 
 static uint16_t Fuel_CurSeg;
 static uint16_t Fuel_CyrStep;
 
-
 #pragma ghs section bss=".myNonInitArea"
 uint8_t FuelSaveData[1024]          ;// =  {0};
 uint16_t FuelSaveLen                ;// = 0;
@@ -115,13 +117,13 @@ void Fuel_User_Sleep_Init(void)
 
     if (FuelSaveLen < 1024)
     {
-        memcpy_new(FuelSaveData, p, FuelSaveLen);
+        memcpy(FuelSaveData, p, FuelSaveLen);
     }
     p = GetDrivingRangeSaveData(&DrivingRangeSaveLen);
 
     if (DrivingRangeSaveLen < 1024)
     {
-        memcpy_new(DrivingRangeSaveData, p, DrivingRangeSaveLen);
+        memcpy(DrivingRangeSaveData, p, DrivingRangeSaveLen);
     }
 }
 /*-------------------------------------------------------------------------
@@ -265,4 +267,36 @@ uint16_t Fuel_Get_Step(void)
     FuelStep = GetFuelStep();
 
     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;
+    UElib_uint16_t HMI_MENU_Sta = 0u;
+
+    variable_1 = Fuel_Get_CurSeg();/*格*/
+    variable_2 = GetFuelSensorState();/*燃油状态*/
+    variable_5 = GetFuelResistance(); /*采集的阻值*/
+
+    HMI_MENU_Sta = Get_Cur_HMI();
+
+    if (
+        (variable_1 <= 1 ) &&
+        (variable_2 == FuelSensorNormal) &&
+        (variable_5 != 65535) &&
+        ((HMI_MENU_Sta == Display_Menu) || (HMI_MENU_Sta == Display_Alarm))
+    )
+    {
+        Popup_Sta = 1u;
+    }
+    else
+    {
+        Popup_Sta = 0u;
+    }
+
+    return Popup_Sta;
 }
\ 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/Data_SpeedOut/Speed_PPK_Out.c

@@ -39,30 +39,6 @@ void Speed_PPK_Processing(void)
     {
         Frequency = 0u;
     }
-/*    
-    if (Frequency == 0u)
-    {
-        Frequency = 0u;
-    }
-    else if (Frequency >= 1u)
-    {
-        Frequency = Frequency;
-    }
-    else
-    {
-        Frequency = 1u;
-    }
-    if (Frequency != 0u)
-    {
-        m_Clock = Speed_Clock / Frequency;
-        m_Duty = m_Clock / 2u;
-    }
-    else
-    {
-        m_Clock = 0u;
-        m_Duty = 0u;
-    }
-*/
 
     RTE_PWM_Set_Speed_Out(Frequency, 500);
 }
\ No newline at end of file

source/Application/APP/Data_SpeedOut/Speed_PPK_Out.h

@@ -3,9 +3,6 @@
 
 #include "TYW_stdint.h"
 
-#define FE_7B_PPK 2500u
-#define Speed_Clock 64453u  /*PWM时钟512分频之后*/
-
 uint16_t Speed_PPK_Calc(uint16_t V_Speed, uint16_t m_PPK);
 void Speed_PPK_Processing(void);
 

source/Application/APP/Data_TPMS/Service_TPMS.c

@@ -29,21 +29,21 @@ void Data_TPMS_KL30_Init(void)
     TPMS_Out[FourthROut].TPMSTyreID = FourthROutID;
     TPMS_Out[FourthRIn].TPMSTyreID = FourthRInID;
 
-    TPMS_Out[FirstLOut].TPMSDataInvalidTime = 600u;
-    TPMS_Out[FirstROut].TPMSDataInvalidTime = 600u;
+    TPMS_Out[FirstLOut].TPMSDataInvalidTime = TPMSDataInvaliTimeNUM;
+    TPMS_Out[FirstROut].TPMSDataInvalidTime = TPMSDataInvaliTimeNUM;
 
-    TPMS_Out[SecondLIn].TPMSDataInvalidTime = 600u;
-    TPMS_Out[SecondRIn].TPMSDataInvalidTime = 600u;
+    TPMS_Out[SecondLIn].TPMSDataInvalidTime = TPMSDataInvaliTimeNUM;
+    TPMS_Out[SecondRIn].TPMSDataInvalidTime = TPMSDataInvaliTimeNUM;
 
-    TPMS_Out[ThirdLOut].TPMSDataInvalidTime = 600u;
-    TPMS_Out[ThirdLIn].TPMSDataInvalidTime = 600u;
-    TPMS_Out[ThirdROut].TPMSDataInvalidTime = 600u;
-    TPMS_Out[ThirdRIn].TPMSDataInvalidTime = 600u;
+    TPMS_Out[ThirdLOut].TPMSDataInvalidTime = TPMSDataInvaliTimeNUM;
+    TPMS_Out[ThirdLIn].TPMSDataInvalidTime = TPMSDataInvaliTimeNUM;
+    TPMS_Out[ThirdROut].TPMSDataInvalidTime = TPMSDataInvaliTimeNUM;
+    TPMS_Out[ThirdRIn].TPMSDataInvalidTime = TPMSDataInvaliTimeNUM;
 
-    TPMS_Out[FourthLOut].TPMSDataInvalidTime = 600u;
-    TPMS_Out[FourthLIn].TPMSDataInvalidTime = 600u;
-    TPMS_Out[FourthROut].TPMSDataInvalidTime = 600u;
-    TPMS_Out[FourthRIn].TPMSDataInvalidTime = 600u;
+    TPMS_Out[FourthLOut].TPMSDataInvalidTime = TPMSDataInvaliTimeNUM;
+    TPMS_Out[FourthLIn].TPMSDataInvalidTime = TPMSDataInvaliTimeNUM;
+    TPMS_Out[FourthROut].TPMSDataInvalidTime = TPMSDataInvaliTimeNUM;
+    TPMS_Out[FourthRIn].TPMSDataInvalidTime = TPMSDataInvaliTimeNUM;
 }
 /******************************************************************************
   Function：Data_TPMS_KL15_ON_Init
@@ -56,7 +56,7 @@ void Data_TPMS_KL15_ON_Init(void)
 }
 /******************************************************************************
   Function：Data_TPMS_Value_Processing
-  Description：数据处理总接口  100ms任务
+  Description：数据处理总接口  ms任务
   Input:
   Output:
  ******************************************************************************/
@@ -158,6 +158,11 @@ void Get_Data_TPMS_Value(TPMSNUM_t TPMSTyreID)
             TPMS_Out[TPMSTyreID].TPMSDataInvalidTime = 0xFFFFu;
         }
     }
+    if (CAN_MSG_Status(ID_CanMsg18011733_Msg_Count) == CAN_SIG_LOST)
+    {
+        TPMS_Out[TPMSTyreID].TPMSPressure = 0x00u;
+        TPMS_Out[TPMSTyreID].TPMSTemp = 0x00u;
+    }
 }
 
 /******************************************************************************
@@ -168,8 +173,7 @@ void Get_Data_TPMS_Value(TPMSNUM_t TPMSTyreID)
  ******************************************************************************/
 void Get_Data_TPMS_Status(TPMSNUM_t TPMSTyreID)
 {
-    if ((TPMS_Out[TPMSTyreID].TPMSTyreID == Get_ID_18011733_Sig_Tire_Index()) &&
-            (TPMS_Out[TPMSTyreID].TPMSDataInvalidTime <= 600u))
+    if (TPMS_Out[TPMSTyreID].TPMSTyreID == Get_ID_18011733_Sig_Tire_Index())
     {
         /*低气压报警          */
         TPMS_Out[TPMSTyreID].TPMSLowpressure = Get_ID_18011733_Sig_Low_Presure_Alarm();
@@ -186,7 +190,7 @@ void Get_Data_TPMS_Status(TPMSNUM_t TPMSTyreID)
         /*传感器故障信息       */
         TPMS_Out[TPMSTyreID].TPMSSensorfault = Get_ID_18011733_Sig_Sensor_fault_information();
     }
-    else
+    else if (CAN_MSG_Status(ID_CanMsg18011733_Msg_Count) == CAN_SIG_LOST)
     {
         /*低气压报警          */
         TPMS_Out[TPMSTyreID].TPMSLowpressure = 0u;
@@ -226,7 +230,7 @@ uint16_t Get_DataTPMS_Pressure_Sta(TPMSNUM_t TPMSTyreID)
 {
     uint16_t Pressure_Sta = 0u;
 
-    if ((TPMS_Out[TPMSTyreID].TPMSDataInvalidTime) >= 600u) /*数据超时 掉线或轮刷超时*/
+    if ((TPMS_Out[TPMSTyreID].TPMSDataInvalidTime) >= TPMSDataInvaliTimeNUM) /*数据超时 掉线或轮刷超时*/
     {
         Pressure_Sta = (uint16_t)STATUS_TIMEOUT;
     }
@@ -286,7 +290,7 @@ uint16_t Get_DataTPMS_Temp_Sta(TPMSNUM_t TPMSTyreID)
 
     Get_Temp_Value = Get_DataTPMS_Temp_Value(TPMSTyreID);
 
-    if (TPMS_Out[TPMSTyreID].TPMSDataInvalidTime >= 600u) /*数据超时 掉线或轮刷超时*/
+    if (TPMS_Out[TPMSTyreID].TPMSDataInvalidTime >= TPMSDataInvaliTimeNUM) /*数据超时 掉线或轮刷超时*/
     {
         Temp_Value = (uint16_t)STATUS_TIMEOUT;
     }

source/Application/APP/Data_TPMS/Service_TPMS.h

@@ -17,6 +17,7 @@
 #define FourthROutID 0x44u
 
 #define TYRETEMP_OFFSET_VALUE (128u) /*胎温数据偏移量*/
+#define TPMSDataInvaliTimeNUM   600u
 
 typedef enum
 {

source/Application/APP/Data_VehicleSpeed/Data_VehicleSpeed.c

@@ -5,6 +5,7 @@
 #include "Common_Interface.h"
 #include "GUI.h"
 #include "kwp2000_service.h"
+#include "GPIO.h"
 
 static uint32_t SPEED_RADIO = 637u;
 
@@ -22,6 +23,9 @@ uint16_t       GslYblSpeedTime  ;
 
 volatile uint32_t VehFreBuf[VehFreNum];
 
+DriveInfoSpeedPlusConverterStruct  DriveInfoSpeed1PlusConverter;
+DriveInfoSpeedPlusConverterStruct  DriveInfoSpeed2PlusConverter;
+
 void Speed_KL30_Init(void)
 {
     uint8_t i = 0u;
@@ -55,6 +59,19 @@ void Speed_KL15_ON_Init(void)
 
     Speed_Old = 0u;
     GslYblSpeedTime = 0u;
+
+
+    DriveInfoSpeed1PlusConverter.Enable    = 0;
+    DriveInfoSpeed1PlusConverter.Level     = 1;
+    DriveInfoSpeed1PlusConverter.Timer     = 0xFFFFFFFE;
+    DriveInfoSpeed1PlusConverter.Period    = 0xFFFFFFFF;
+    DriveInfoSpeed1PlusConverter.ActPeriod = 0xFFFFFFFF;
+
+    DriveInfoSpeed2PlusConverter.Enable    = 0;
+    DriveInfoSpeed2PlusConverter.Level     = 1;
+    DriveInfoSpeed2PlusConverter.Timer     = 0xFFFFFFFE;
+    DriveInfoSpeed2PlusConverter.Period    = 0xFFFFFFFF;
+    DriveInfoSpeed2PlusConverter.ActPeriod = 0xFFFFFFFF;
 }
 
 void Speed_KL15_OFF_Init(void)
@@ -353,14 +370,117 @@ void Data_GsLYbL_Speed_Processing(void)
 }
 //15925
 //5096
-void Drive_Info_Speed1_Plus_Conversion(void)
+
+void Drive_Info_Speed1_Plus_Conversion_ISR ( void )
+{
+    if ( DriveInfoSpeed1PlusConverter.Enable )
+    {
+        DriveInfoSpeed1PlusConverter.Timer++;
+
+        if ( DriveInfoSpeed1PlusConverter.ActPeriod >= 10000u )
+            DriveInfoSpeed1PlusConverter.ActPeriod = DriveInfoSpeed1PlusConverter.Period;
+
+        if ( DriveInfoSpeed1PlusConverter.Timer >= DriveInfoSpeed1PlusConverter.ActPeriod )
+        {
+            DriveInfoSpeed1PlusConverter.Timer = 0;
+
+            if ( DriveInfoSpeed1PlusConverter.Level )
+            {
+                DriveInfoSpeed1PlusConverter.Level = 0;
+                DriveInfoSpeed1PlusConverter.ActPeriod = DriveInfoSpeed1PlusConverter.Period;
+            }
+            else
+                DriveInfoSpeed1PlusConverter.Level = 1;
+        }
+
+        SPEED1_PWM_MCU_OUT = DriveInfoSpeed1PlusConverter.Level;
+    }
+}
+void Drive_Info_Speed1_Plus_Conversion ( void )
+{
+    uint32_t Speed;
+
+    if ( ( Speed_Get_Valid() == 1u ) && ( Common_Get_Disp_V_Speed() >= 0u ) )
+    {
+        Speed = ( uint32_t ) Common_Get_Disp_V_Speed();
+        DriveInfoSpeed1PlusConverter.Period = ( uint32_t ) ( 360000000 / 15925) / Speed;
+        DriveInfoSpeed1PlusConverter.Enable = 1;
+    }
+    else
+    {
+        if ( DriveInfoSpeed1PlusConverter.Enable )
+        {
+            DriveInfoSpeed1PlusConverter.Enable    = 0;
+            DriveInfoSpeed1PlusConverter.Level     = 0;
+            DriveInfoSpeed1PlusConverter.Timer     = 0;
+            DriveInfoSpeed1PlusConverter.Period    = 0xFFFFFFFF;
+            DriveInfoSpeed1PlusConverter.ActPeriod = 0xFFFFFFFF;
+        }
+
+        SPEED1_PWM_MCU_OUT = 1;
+    }
+}
+void Drive_Info_Speed2_Plus_Conversion_ISR ( void )
 {
-    uint32_t Veh_Frequenc = 0u;
+    if ( DriveInfoSpeed2PlusConverter.Enable )
+    {
+        DriveInfoSpeed2PlusConverter.Timer++;
+
+        if ( DriveInfoSpeed2PlusConverter.ActPeriod >= 10000u )
+            DriveInfoSpeed2PlusConverter.ActPeriod = DriveInfoSpeed2PlusConverter.Period;
 
-    Veh_Frequenc = Cal_Veh_Frequency();
-    Veh_Frequenc *= 10u;
-    TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH10, Veh_Frequenc, 500u);/*车速1 25*/
+        if ( DriveInfoSpeed2PlusConverter.Timer >= DriveInfoSpeed2PlusConverter.ActPeriod )
+        {
+            DriveInfoSpeed2PlusConverter.Timer = 0;
 
-    Veh_Frequenc = Veh_Frequenc * 5096 / 15925;
-    TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH13, Veh_Frequenc, 500u);/*车速2 8*/
-}
+            if ( DriveInfoSpeed2PlusConverter.Level )
+            {
+                DriveInfoSpeed2PlusConverter.Level = 0;
\ No newline at end of file
+                DriveInfoSpeed2PlusConverter.ActPeriod = DriveInfoSpeed2PlusConverter.Period;
+            }
+            else
+                DriveInfoSpeed2PlusConverter.Level = 1;
+        }
+
+        SPEED2_PWM_MCU_OUT = DriveInfoSpeed2PlusConverter.Level;
+        SPEED3_PWM_MCU_OUT = DriveInfoSpeed2PlusConverter.Level;
+    }
+}
+void Drive_Info_Speed2_Plus_Conversion ( void )
+{
+    uint32_t Speed;
+
+    if ( ( Speed_Get_Valid() == 1u ) && ( Common_Get_Disp_V_Speed() >= 0u ) )
+    {
+        Speed = ( uint32_t ) Common_Get_Disp_V_Speed();
+        DriveInfoSpeed2PlusConverter.Period = ( uint32_t ) ( 360000000 / 5096) / Speed;
+        DriveInfoSpeed2PlusConverter.Enable = 1;
+    }
+    else
+    {
+        if ( DriveInfoSpeed2PlusConverter.Enable )
+        {
+            DriveInfoSpeed2PlusConverter.Enable    = 0;
+            DriveInfoSpeed2PlusConverter.Level     = 0;
+            DriveInfoSpeed2PlusConverter.Timer     = 0;
+            DriveInfoSpeed2PlusConverter.Period    = 0xFFFFFFFF;
+            DriveInfoSpeed2PlusConverter.ActPeriod = 0xFFFFFFFF;
+        }
+
+        SPEED2_PWM_MCU_OUT = 1;
+        SPEED3_PWM_MCU_OUT = 1;
+    }
+}
+//void Drive_Info_Speed2_Plus_Conversion(void)
+//{
+//    uint32_t Veh_Frequenc = 0u;
+//
+//    Veh_Frequenc = Cal_Veh_Frequency();
+//    Veh_Frequenc *= 10u;
+//    TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH10, Veh_Frequenc, 500u);/*车速1 25*/
+//
+//    Veh_Frequenc = Veh_Frequenc * 5096 / 15925;
+//    TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH13, Veh_Frequenc, 500u);/*车速2 8*/
+//
+//    TimerB_PWM_Channel_Fre_Set(TIMERB_2_CH15, Veh_Frequenc, 500u);/*车速3 8*/
+//}
\ No newline at end of file

source/Application/APP/Data_VehicleSpeed/Data_VehicleSpeed.h

@@ -24,6 +24,15 @@ extern _ACCSUBSPEED   AccSubSpeed;
 extern uint16_t       Speed_Old  ;
 extern uint16_t       GslYblSpeedTime  ;
 
+typedef struct
+{
+    uint32_t  Enable;
+    uint32_t  Level;
+    uint32_t  Timer;
+    uint32_t  Period;
+    uint32_t  ActPeriod;
+} DriveInfoSpeedPlusConverterStruct;
+
 extern void Speed_KL30_Init(void);
 extern void Speed_KL15_ON_Init(void);
 extern void Speed_KL15_OFF_Init(void);
@@ -41,6 +50,11 @@ extern uint8_t Speed_Get_Valid(void);
 extern uint8_t Speed_Get_CurSeg(void);
 extern void Data_Acc_Speed_Processing(void);
 extern void Data_GsLYbL_Speed_Processing(void);
+
 extern void Drive_Info_Speed1_Plus_Conversion(void);
+extern void Drive_Info_Speed1_Plus_Conversion_ISR ( void );
+
+extern void Drive_Info_Speed2_Plus_Conversion(void);
+extern void Drive_Info_Speed2_Plus_Conversion_ISR ( void );
 
 #endif

source/Application/APP/Data_Voltmeter/Data_Voltmeter.c

@@ -21,7 +21,7 @@ static struct
 
 static void Data_Voltmeter_2_Gui(void);
 static uint16_t Get_VoltFilter(void);
-static
+
 /*-------------------------------------------------------------------------
  * Function Name  : Voltmeter_KL30_Init
  * Description    :

source/Application/APP/GaugesMode/Gauges.c

@@ -426,7 +426,7 @@ void GaugeMoveing(uint8_t GaugesNum)
                     /*水温表上升最后一格需要调整时间*/
                     if ((GaugesNum == TempGauges) && (DirecSign[TempGauges] == 1u) && (GaugesCurrentPos[TempGauges] == (DestPostion[TempGauges] - 10u)))
                     {
-                        GaugesMoveTimesTmp = 2000u;
+                        GaugesMoveTimesTmp = 4000u;
                     }
                     else
                     {

source/Application/APP/GaugesMode/GaugesInterface.c

@@ -16,7 +16,7 @@ static const uint16_t GaugesDataInInit[GaugesTotal][3][25] =
         {1,   5,   9,  13,  17,   21,   25,   29,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
     },
     /*转速*/
-    {   {0u, 1000, 1500, 2000, 2500, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    {   {0u,  900, 1400, 1900, 2400, 2900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
         {0u, 1000, 1500, 2000, 2500, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
         {1u,    6,   11,   16,   21,   27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
     },

source/Application/APP/LINE_IN/Line_In_user.c

@@ -45,7 +45,7 @@ const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] =
     {   LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_HI_BEAM,},                     /*A25  HI BEAM*/
     {   LINE_IN_LEVEL_LOW,  200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_BRAKE_AIR_EBS,},               /*A28  BRAKE AIR/EBS*/
     {   LINE_IN_LEVEL_LOW,  200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_SEAT_BELT,},                   /*A30  SEAT BELT*/
-    {   LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_MIL,},                         /*A31  MIL*/
+    {   LINE_IN_LEVEL_LOW,  200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_MIL,},                         /*A31  MIL*/
     {   LINE_IN_LEVEL_LOW,  200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ENG_OIL,},                     /*A32  ENG OIL*/
     {   LINE_IN_LEVEL_LOW,  200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_CHARGE,},                      /*A34  CHARGE*/
     {   LINE_IN_LEVEL_LOW,  200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_ABS_INFO,},            /*B03  TRAILER ABS INFO*/
@@ -53,7 +53,7 @@ const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] =
     {   LINE_IN_LEVEL_LOW,  200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ACC_AIR,},                     /*B15  ACC AIR*/
     {   LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_AIR_SUS,},                     /*B30  AIR SUS*/
     {   LINE_IN_LEVEL_LOW,  200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_BRAKE,},               /*B31  TRAILER BRAKE*/
-    {   LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_ABS,},                 /*B33  TRAILER ABS*/
+    {   LINE_IN_LEVEL_LOW,  200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_ABS,},                 /*B33  TRAILER ABS*/
     {   LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_RR_DIFF_LOCK,},                /*B36  RR DIFF LOCK*/
     {   LINE_IN_LEVEL_LOW,  200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_WEAR_IND,},                    /*B38  WEAR IND*/
 

source/Application/APP/PowerManagement/PowerManagement.h

@@ -10,16 +10,16 @@
 
 typedef enum
 {
-    m_IGN_OFF_Init,
-    m_IGN_OFF,
-    m_IGN_Sleep_Init,
-    m_IGN_Sleep,
-    m_IGN_Wakeup,
-    m_IGN_ON_Init,
-    m_IGN_ON,
-    m_IGN_LVP,
-    m_IGN_OVP,
-    m_IGN_LIMIT,
+    /*0*/m_IGN_OFF_Init,
+    /*1*/m_IGN_OFF,
+    /*2*/m_IGN_Sleep_Init,
+    /*3*/m_IGN_Sleep,
+    /*4*/m_IGN_Wakeup,
+    /*5*/m_IGN_ON_Init,
+    /*6*/m_IGN_ON,
+    /*7*/m_IGN_LVP,
+    /*8*/m_IGN_OVP,
+    /*9*/m_IGN_LIMIT,
 } Power_Status_t;
 
 void Power_Management_Init ( uint8_t u8InitFlag );

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();
@@ -132,29 +133,33 @@ Power_Status_t Power_KL30_Init ( void )
 
 void Power_Sleep_Init(void)
 {
-    //TimerB_PWM_Channel_Sleep(TIMERB_2_CH10);
-    //TimerB_PWM_Channel_Sleep(TIMERB_1_CH10);
-
-    VCC12V0_OUT_EN = 1u;        /*12V 电源使能*/
-    VCC05V0_OUT_EN = 1u;        /*外设5V 电源使能*/
-    D1530_EN_MCU_OUT = 1u;      /*1530 使能*/
-    //BL_ACC_EN = 1U;             /*8867 使能*/
-    Fuel_VCC05V_OUT_EN = 1u ;   /*燃油电源 使能*/
-    AIR_5V_OUT_EN = 1u;         /*气压 5V*/
-    ACC5V_LED_PWM_MCU = 1u;
-    BUZZER_ACC_OUT_EN = 1u;
-
-    IS31_Shutdown();
-
+    /*数据*/
     Speed_Sleep_Init();
     Tacho_Sleep_Init();
     Coolant_Sleep_Init();
 
-    UART_Sleep_Init();
-
     /*燃油库睡眠前需要调用 ----20220503----*/
     Fuel_User_Sleep_Init();
 
+    /*外设*/
+    Seg_Display_OFF();
+    IS31_Shutdown();
+    UART_Sleep_Init();
+    Buzzer_Shutdown(); /*蜂鸣器*/
+    TimerB_PWM_Channel_Sleep(TIMERB_0_CH15);
+    TimerB_PWM_Channel_Sleep(TIMERB_2_CH1);
+    TimerB_PWM_Channel_Sleep(TIMERB_2_CH7);
+    TimerB_PWM_Channel_Sleep(TIMERB_1_CH15);
+
+    VCC12V0_OUT_EN = 0u;        /*12V 电源使能*/
+    VCC05V0_OUT_EN = 0u;        /*外设5V 电源使能*/
+    D1530_EN_MCU_OUT = 0u;      /*1530 使能*/
+    //BL_ACC_EN = 1U;             /*8867 使能*/
+    Fuel_VCC05V_OUT_EN = 0u ;   /*燃油电源 使能*/
+    AIR_5V_OUT_EN = 0u;         /*气压 5V*/
+    ACC5V_LED_PWM_MCU = 0u;
+    BUZZER_ACC_OUT_EN = 0u;
+
     GPIO_Init(GPIO_SLEEP_MODE );
 }
 
@@ -225,6 +230,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 +252,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();
@@ -331,8 +338,13 @@ Power_Status_t Power_Stay_OFF(void)
 
 Power_Status_t  Power_Stay_Protect(void)
 {
-    Power_Status_t u8PowerSts;
-    u8PowerSts = m_IGN_OFF_Init;
+    Power_Status_t u8PowerSts = m_IGN_OFF_Init;
+
+    //if (SYS_OPR_STAT_RUN)
+    //{
+    //    u8PowerSts = m_IGN_ON;
+    //}
+
     return  u8PowerSts;
 }
 

source/Application/APP/PowerManagement/System_Monitor.h

@@ -2,7 +2,7 @@
 #ifndef SYSTEM_MONITOR_H
 #define SYSTEM_MONITOR_H
 
-
+#include "System_Monitor.h"
 #include "TYW_stdint.h"
 
 

source/Application/APP/SEG_LCD/SEG_DISPLAY.c

@@ -1123,28 +1123,10 @@ void Seg_Display_Service(void)
 
                 wbyTestNum = Common_Get_Disp_V_Speed();
                 SEG_VehicleSpeed_Num(wbyTestNum, GUI_DISP_MODE_NORMAL); //车速值
-
-                // SEG_PRI_Display(wbyTestSeg,GUI_DISP_MODE_NORMAL,7u) ;//PRI气压格
-                // SEG_SEC_Display(wbyTestSeg,GUI_DISP_MODE_NORMAL,7u) ;//SEC气压格
-                // SEG_Coolant_Display(wbyTestSeg,GUI_DISP_MODE_NORMAL,7u) ;//水温格
-                // SEG_Fuel_Display(wbyTestSeg, GUI_DISP_MODE_NORMAL,7u);//燃油格
-                // SEG_Tacho_Display(wbyTestSeg,GUI_DISP_MODE_NORMAL,7u);//转速格
-                // SEG_VehicleSpeed_Display(wbyTestSeg,GUI_DISP_MODE_NORMAL,7u);//车速格
-                // SEG_VehicleSpeed_Num(wbyTestNum,GUI_DISP_MODE_NORMAL);//车速值
             }
             else
             {
                 GaugesTimer--;
-
-                /*此处为测试水温走格速度用*/
-                //if (Coolant_Get_Valid())
-                //{
-                //    SEG_Coolant_Display(Coolant_Get_CurSeg(), GUI_DISP_MODE_NORMAL, 7u); //水温格
-                //}
-                //else
-                //{
-                //    SEG_Coolant_Display(Coolant_Get_CurSeg(), GUI_DISP_MODE_INVALID, 7u); //水温格
-                //}
             }
         }
     }

source/Application/APP/Telltales/Telltales.h

@@ -7,45 +7,45 @@
 
 typedef enum
 {
-    em_LED_INTER_DIFF_LOCK_T,
-    em_LED_FOUR_MUL_FOUR_T,
-    em_LED_EXH_BRAKE_T,
-    em_LED_QOS_GLOW_T,
-    em_LED_HI_BEAM_T,
-    em_LED_Rr_FOG_LAMP_T,
-    em_LED_MIL_T,
-    em_LED_SVS_T,
-    em_LED_H_S_A__T,
-    em_LED_RETARDER_T,
-    em_LED_AUTO_LEVELING_T,
-    em_LED_ROWS_L,
-    em_LED_BSM_OFF_L,
-    em_LED_AEBS_OFF_L,
-    em_LED_LDWS_L,
-    em_LED_SRS_L,
-    em_LED_ENG_OIL_L,
-    em_LED_CHARG_L,
-    em_LED_SEAT_BELT_L,
-    em_LED_RR_DIFF_LOCK_L,
-    em_LED_TPMS_L,
-    em_LED_ASR_or_EVSC_OFF_L,
-    em_LED_EVSC_L,
-    em_LED_eco_stop_OFF_L,
-    em_LED_AMT_L,
-    em_LED_WEAR_IND_L,
-    em_LED_TRAILER_BRAKE_R,
-    em_LED_BRAKE_AIR_or_EBS_YELLOW_R,
-    em_LED_ACC_AIR_R,
-    em_LED_ABS_R,
-    em_LED_PARK_BRAKE_R,
-    em_LED_BRAKE_AIR_or_EBS_RED_R,
-    em_LED_BRAKE_LOCK_R,
-    em_LED_AIR_SUS_R,
-    em_LED_TRAILER_ABS_U,
-    em_LED_WORKING_LAMP_U,
-    em_LED_TRAILER_ABS_INFO_U,
-    em_LED_TEMP,
-    em_LED_FUEL,
+    /* 0*/em_LED_INTER_DIFF_LOCK_T,
+    /* 1*/em_LED_FOUR_MUL_FOUR_T,
+    /* 2*/em_LED_EXH_BRAKE_T,
+    /* 3*/em_LED_QOS_GLOW_T,
+    /* 4*/em_LED_HI_BEAM_T,
+    /* 5*/em_LED_Rr_FOG_LAMP_T,
+    /* 6*/em_LED_MIL_T,
+    /* 7*/em_LED_SVS_T,
+    /* 8*/em_LED_H_S_A__T,
+    /* 9*/em_LED_RETARDER_T,
+    /*10*/em_LED_AUTO_LEVELING_T,
+    /*11*/em_LED_ROWS_L,
+    /*12*/em_LED_BSM_OFF_L,
+    /*13*/em_LED_AEBS_OFF_L,
+    /*14*/em_LED_LDWS_L,
+    /*15*/em_LED_SRS_L,
+    /*16*/em_LED_ENG_OIL_L,
+    /*17*/em_LED_CHARG_L,
+    /*18*/em_LED_SEAT_BELT_L,
+    /*19*/em_LED_RR_DIFF_LOCK_L,
+    /*20*/em_LED_TPMS_L,
+    /*21*/em_LED_ASR_or_EVSC_OFF_L,
+    /*22*/em_LED_EVSC_L,
+    /*23*/em_LED_eco_stop_OFF_L,
+    /*24*/em_LED_AMT_L,
+    /*25*/em_LED_WEAR_IND_L,
+    /*26*/em_LED_TRAILER_BRAKE_R,
+    /*27*/em_LED_BRAKE_AIR_or_EBS_YELLOW_R,
+    /*28*/em_LED_ACC_AIR_R,
+    /*29*/em_LED_ABS_R,
+    /*30*/em_LED_PARK_BRAKE_R,
+    /*31*/em_LED_BRAKE_AIR_or_EBS_RED_R,
+    /*32*/em_LED_BRAKE_LOCK_R,
+    /*33*/em_LED_AIR_SUS_R,
+    /*34*/em_LED_TRAILER_ABS_U,
+    /*35*/em_LED_WORKING_LAMP_U,
+    /*36*/em_LED_TRAILER_ABS_INFO_U,
+    /*37*/em_LED_TEMP,
+    /*38*/em_LED_FUEL,
 
     LED_Max,
 } LED_Idx_t;

source/Application/Alarm/Popup_List.c

@@ -17,9 +17,10 @@ const Popup_Attribute_t PopupAttributeTable[POPUP_MAX] =
     {/*02 POPUP1_BRAKE_SPACING_R            */    POPUP_TYPE_FATAL   ,    0u,     0u,    POPUP_IGN_ON,     POPUP1_BRAKE_SPACING_R                      , NULL,          1u,           POPUP1_MSG_BRAKE_SPACING_R                   ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
     {/*03 POPUP1_BRAKE_SPACING_COLLISION    */    POPUP_TYPE_FATAL   ,    0u,     0u,    POPUP_IGN_ON,     POPUP1_BRAKE_SPACING_COLLISION              , NULL,          1u,           POPUP1_MSG_BRAKE_SPACING_COLLISION           ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
     {/*04 POPUP1_BRAKE_SPACING_Y            */    POPUP_TYPE_FATAL   ,    0u,     0u,    POPUP_IGN_ON,     POPUP1_BRAKE_SPACING_Y                      , NULL,          1u,           POPUP1_MSG_BRAKE_SPACING_Y                   ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
+    {/*04 POPUP1_BRAKE_SPACING_Y2           */    POPUP_TYPE_FATAL   ,    0u,     0u,    POPUP_IGN_ON,     POPUP1_BRAKE_SPACING_Y2                     , NULL,          1u,           POPUP1_MSG_BRAKE_SPACING_Y2                  ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
     {/*05 POPUT1_ASR_OPERATE                */    POPUP_TYPE_FATAL   ,    0u,     0u,    POPUP_IGN_ON,     POPUT1_ASR_OPERATE                          , NULL,          1u,           POPUT1_MSG_ASR_OPERATE                       ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
-    {/*06 POPUT2_PTO                        */    POPUP_TYPE_FATAL   ,    0u,     0u,    POPUP_IGN_ON,     POPUT2_PTO                                  , NULL,          1u,           POPUT2_MSG_PTO                               ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
-    {/*07 POPUP2_PARKING_BRAKE              */    POPUP_TYPE_FATAL   ,    0u,     1u,    POPUP_IGN_ON,     POPUP2_PARKING_BRAKE                        , NULL,          1u,           POPUP2_MSG_PARKING_BRAKE                     ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
+    {/*06 POPUT2_PTO                        */    POPUP_TYPE_WARNING ,    0u,     0u,    POPUP_IGN_ON,     POPUT2_PTO                                  , NULL,          1u,           POPUT2_MSG_PTO                               ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
+    {/*07 POPUP2_PARKING_BRAKE              */    POPUP_TYPE_WARNING ,    0u,     1u,    POPUP_IGN_ON,     POPUP2_PARKING_BRAKE                        , NULL,          1u,           POPUP2_MSG_PARKING_BRAKE                     ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
     {/*08 POPUP2_AIRMATIC_HIGHT             */    POPUP_TYPE_WARNING ,    0u,     2u,    POPUP_IGN_ON,     POPUP2_AIRMATIC_HIGHT                       , NULL,          1u,           POPUP2_MSG_AIRMATIC_HIGHT                    ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
     {/*09 POPUP3_CRUISE                     */    POPUP_TYPE_WARNING ,    1u,     0u,    POPUP_IGN_ON,     POPUP3_CRUISE                               , NULL,          1u,           POPUP3_MSG_CRUISE                            ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
     {/*10 POPUP3_VARIABLE_SLD               */    POPUP_TYPE_WARNING ,    1u,     0u,    POPUP_IGN_ON,     POPUP3_VARIABLE_SLD                         , NULL,          1u,           POPUP3_MSG_VARIABLE_SLD                      ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
@@ -66,6 +67,13 @@ const Popup_Attribute_t PopupAttributeTable[POPUP_MAX] =
     {/*51 POPUP8_OVERVOLTAGE                */    POPUP_TYPE_WARNING ,    3u,     0u,    POPUP_IGN_ON,     POPUP8_OVERVOLTAGE                          , NULL,          1u,           POPUP8_MSG_OVERVOLTAGE                       ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
     {/*52 POPUP8_BRAKE_BLOCKR               */    POPUP_TYPE_WARNING ,    3u,     0u,    POPUP_IGN_ON,     POPUP8_BRAKE_BLOCKR                         , NULL,          1u,           POPUP8_MSG_BRAKE_BLOCKR                      ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
     {/*53 POPUP8_BRAKE_BLOCKF               */    POPUP_TYPE_WARNING ,    3u,     0u,    POPUP_IGN_ON,     POPUP8_BRAKE_BLOCKF                         , NULL,          1u,           POPUP8_MSG_BRAKE_BLOCKF                      ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
+
+    {/*   POPUP8_TemperatureThigh           */    POPUP_TYPE_WARNING ,    3u,     0u,    POPUP_IGN_ON,     POPUP8_TemperatureThigh                     , NULL,          1u,           POPUP8_MSG_TemperatureThigh                  ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
+    {/*   POPUP8_TBOX_GW_Sta                */    POPUP_TYPE_WARNING ,    3u,     0u,    POPUP_IGN_ON,     POPUP8_TBOX_GW_Sta                          , NULL,          1u,           POPUP8_MSG_TBOX_GW_Sta                       ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
+    {/*   POPUP8_TBOX_Sta                   */    POPUP_TYPE_WARNING ,    3u,     0u,    POPUP_IGN_ON,     POPUP8_TBOX_Sta                             , NULL,          1u,           POPUP8_MSG_TBOX_Sta                          ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
+    {/*   POPUP8_TBOX_Sig                   */    POPUP_TYPE_WARNING ,    3u,     0u,    POPUP_IGN_ON,     POPUP8_TBOX_Sig                             , NULL,          1u,           POPUP8_MSG_TBOX_Sig                          ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
+    {/*   POPUP8_TBOX_Sig_Error             */    POPUP_TYPE_WARNING ,    3u,     0u,    POPUP_IGN_ON,     POPUP8_TBOX_Sig_Error                       , NULL,          1u,           POPUP8_MSG_TBOX_Sig_Error                    ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
+
     {/*54 POPUP8_DPD_AUTO                   */    POPUP_TYPE_WARNING ,    3u,     0u,    POPUP_IGN_ON,     POPUP8_DPD_AUTO                             , NULL,          1u,           POPUP8_MSG_DPD_AUTO                          ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
     {/*55 POPUP9_AIR_PRESSURE               */    POPUP_TYPE_WARNING ,    3u,     0u,    POPUP_IGN_ON,     POPUP9_AIR_PRESSURE                         , NULL,          1u,           POPUP9_MSG_AIR_PRESSURE                      ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},
     {/*56 POPUP9_EBS_ERROR                  */    POPUP_TYPE_WARNING ,    3u,     0u,    POPUP_IGN_ON,     POPUP9_EBS_ERROR                            , NULL,          1u,           POPUP9_MSG_EBS_ERROR                         ,  POPUP_MODE_MULTI,    SND_NONE      ,  SND_TYPE_MULTI,},

source/Application/Alarm/Popup_List.h

@@ -20,6 +20,7 @@ enum PopupName
     POPUP1_BRAKE_SPACING_R              ,/*02.车间距警报-刹车(红字)*/
     POPUP1_BRAKE_SPACING_COLLISION      ,/*03.车间距警报-碰撞报警*/
     POPUP1_BRAKE_SPACING_Y              ,/*04.车间距警报-刹车(黄字)*/
+    POPUP1_BRAKE_SPACING_Y2             ,/*   车间距警报-刹车(黄字)*/
     POPUT1_ASR_OPERATE                  ,/*05.ASR工作*/
     POPUT2_PTO                          ,/*06.PTO紧急警报-刹车*/
     POPUP2_PARKING_BRAKE                ,/*07.忘记松手刹车*/
@@ -69,6 +70,13 @@ enum PopupName
     POPUP8_OVERVOLTAGE                  ,/*51.过电压报警*/
     POPUP8_BRAKE_BLOCKR                 ,/*52.后蹄片磨损*/
     POPUP8_BRAKE_BLOCKF                 ,/*53.前蹄片磨损*/
+
+    POPUP8_TemperatureThigh             ,/*   变速箱温度高*/
+    POPUP8_TBOX_GW_Sta                  ,/*   未检测到GW*/
+    POPUP8_TBOX_Sta                     ,/*   未检测到TBOX*/
+    POPUP8_TBOX_Sig                     ,/*   TBOX通信异常*/
+    POPUP8_TBOX_Sig_Error               ,/*   平台通信异常*/
+
     POPUP8_DPD_AUTO                     ,/*54.DPD自动再生-再生将自动完成，不需要操作开关*/
     POPUP9_AIR_PRESSURE                 ,/*55.气压过低-请冲入空气*/
     POPUP9_EBS_ERROR                    ,/*56.EBS故障（红）-请与五十铃公司联系*/

source/Application/Alarm/Popup_Message_List.h

@@ -14,6 +14,7 @@ enum PopupMessageName
     POPUP1_MSG_BRAKE_SPACING_R                    ,  /*02.车间距警报-刹车(红字)*/
     POPUP1_MSG_BRAKE_SPACING_COLLISION            ,  /*03.车间距警报-碰撞报警*/
     POPUP1_MSG_BRAKE_SPACING_Y                    ,  /*04.车间距警报-刹车(黄字)*/
+    POPUP1_MSG_BRAKE_SPACING_Y2                   ,  /*   */
     POPUT1_MSG_ASR_OPERATE                        ,  /*05.ASR工作*/
     POPUT2_MSG_PTO                                ,  /*06.PTO紧急警报-刹车*/
     POPUP2_MSG_PARKING_BRAKE                      ,  /*07.忘记松手刹车*/
@@ -63,6 +64,13 @@ enum PopupMessageName
     POPUP8_MSG_OVERVOLTAGE                        ,  /*51.过电压报警*/
     POPUP8_MSG_BRAKE_BLOCKR                       ,  /*52.后蹄片磨损*/
     POPUP8_MSG_BRAKE_BLOCKF                       ,  /*53.前蹄片磨损*/
+
+    POPUP8_MSG_TemperatureThigh                   ,  /*   变速箱温度高*/
+    POPUP8_MSG_TBOX_GW_Sta                        ,  /*   未检测到GW*/
+    POPUP8_MSG_TBOX_Sta                           ,  /*   未检测到TBOX*/
+    POPUP8_MSG_TBOX_Sig                           ,  /*   TBOX通信异常*/
+    POPUP8_MSG_TBOX_Sig_Error                     ,  /*   平台通信异常*/
+
     POPUP8_MSG_DPD_AUTO                           ,  /*54.DPD自动再生-再生将自动完成，不需要操作开关*/
     POPUP9_MSG_AIR_PRESSURE                       ,  /*55.气压过低-请冲入空气*/
     POPUP9_MSG_EBS_ERROR                          ,  /*56.EBS故障（红）-请与五十铃公司联系*/
@@ -126,6 +134,7 @@ static const PopupMsgAttributeStruct PopupMsgAttributeTable[] =
     { /* POPUP1_MSG_BRAKE_SPACING_R             */  POPUP_TYPE_GENERAL,},     /*02.车间距警报-刹车(红字)*/
     { /* POPUP1_MSG_BRAKE_SPACING_COLLISION     */  POPUP_TYPE_GENERAL,},     /*03.车间距警报-碰撞报警*/
     { /* POPUP1_MSG_BRAKE_SPACING_Y             */  POPUP_TYPE_GENERAL,},     /*04.车间距警报-刹车(黄字)*/
+    { /* POPUP1_MSG_BRAKE_SPACING_Y2            */  POPUP_TYPE_GENERAL,},     /*   车间距警报-刹车(黄字)*/
     { /* POPUT1_MSG_ASR_OPERATE                 */  POPUP_TYPE_GENERAL,},     /*05.ASR工作*/
     { /* POPUT2_MSG_PTO                         */  POPUP_TYPE_GENERAL,},     /*06.PTO紧急警报-刹车*/
     { /* POPUP2_MSG_PARKING_BRAKE               */  POPUP_TYPE_GENERAL,},     /*07.忘记松手刹车*/
@@ -175,6 +184,13 @@ static const PopupMsgAttributeStruct PopupMsgAttributeTable[] =
     { /* POPUP8_MSG_OVERVOLTAGE                 */  POPUP_TYPE_GENERAL,},     /*51.过电压报警*/
     { /* POPUP8_MSG_BRAKE_BLOCKR                */  POPUP_TYPE_GENERAL,},     /*52.后蹄片磨损*/
     { /* POPUP8_MSG_BRAKE_BLOCKF                */  POPUP_TYPE_GENERAL,},     /*53.前蹄片磨损*/
+
+    { /* POPUP8_MSG_TemperatureThigh            */  POPUP_TYPE_GENERAL,},     /*   变速箱温度高*/
+    { /* POPUP8_MSG_TBOX_GW_Sta                 */  POPUP_TYPE_GENERAL,},     /*   未检测到GW*/
+    { /* POPUP8_MSG_TBOX_Sta                    */  POPUP_TYPE_GENERAL,},     /*   未检测到TBOX*/
+    { /* POPUP8_MSG_TBOX_Sig                    */  POPUP_TYPE_GENERAL,},     /*   TBOX通信异常*/
+    { /* POPUP8_MSG_TBOX_Sig_Error              */  POPUP_TYPE_GENERAL,},     /*   平台通信异常*/
+
     { /* POPUP8_MSG_DPD_AUTO                    */  POPUP_TYPE_GENERAL,},     /*54.DPD自动再生-再生将自动完成，不需要操作开关*/
     { /* POPUP9_MSG_AIR_PRESSURE                */  POPUP_TYPE_GENERAL,},     /*55.气压过低-请冲入空气*/
     { /* POPUP9_MSG_EBS_ERROR                   */  POPUP_TYPE_GENERAL,},     /*56.EBS故障（红）-请与五十铃公司联系*/

source/Application/Alarm/Popups.h

@@ -25,4 +25,6 @@ void Popups_Displaying ( uint16_t PopupID );
 void Popups_Sound_Playing ( uint8_t PopupID );
 void Popup_Alone_Sound_Server(void);
 
+uint8_t Common_Get_Water_Temp_Level_Flag(void);
+
 #endif
\ No newline at end of file

source/Application/CAN_APP_NM/AutoSarNM/None_NM.c

@@ -28,7 +28,7 @@ void None_NM_Service(void)
     }
     else
     {
-        if (NM_Idle_Timer <= 1600000ul) /*休眠唤醒*/
+        if (NM_Idle_Timer <= 160000ul) /*休眠唤醒*/
         {
             NM_Idle_Timer++;
         }

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.h

@@ -3,6 +3,8 @@
 
 #include "TYW_stdint.h"
 
+#define DTCNumberBuf          50u
+
 typedef struct
 {
     uint32_t TripA_Fuel;
@@ -15,13 +17,56 @@ typedef struct
     uint32_t TripB_Fuel_Consume;
     uint32_t TripB_Idling;
     uint32_t TripB_Runing;
+    uint32_t Engine_Oil;
     uint32_t Engine_Surplus;
-
 } USER_ECU;
 extern USER_ECU User_ECU;
 
-extern uint32_t DisDTCNumber[50];
-extern uint8_t  DisDTCNum;
+//extern uint32_t DisDTCNumber[50];
+extern uint32_t DTCNumberEngine[DTCNumberBuf];
+extern uint32_t DTCNumberBrake[DTCNumberBuf];
+extern uint32_t DTCNumberAMT[DTCNumberBuf];
+extern uint32_t DTCNumberRadar[DTCNumberBuf];
+extern uint32_t DTCNumberCamera[DTCNumberBuf];
+extern uint32_t DTCNumberRetarder[DTCNumberBuf];
+
+//extern uint32_t DisDTCNum;
+extern uint32_t DisDTCNumEngine ;
+extern uint32_t DisDTCNumBrake ;
+extern uint32_t DisDTCNumAMT ;
+extern uint32_t DisDTCNumRadar ;
+extern uint32_t DisDTCNumCamera ;
+extern uint32_t DisDTCNumRetarder ;
+
+
+#define MAX_MULCANDATALEN 100
+typedef union
+{
+    struct
+    {
+        uint32_t StructDTC[25];
+    } SubDTC;
+    uint8_t UnionDTC[100];
+} _DATADTC;
+
+typedef struct                          //7 bytes
+{
+    uint16_t wPGN;                          //打包消息的参数组编号
+    uint8_t  bPackage;                      //全部数据包的数
+    uint8_t  bLength;                       //整个消息大小的字节数
+    uint8_t  bCtrByte;                      //控制字节
+    uint8_t  bRcvInfoFlg;                   //有效接收标志，接收到该报文=1
+    uint8_t  bRcvBusy;                      // 本标志位有效，表明正在接收多包信息。
+    uint8_t  bPrePckNum;                    //上一个包序号
+    _DATADTC DataDTC;                       //多包信息缓冲区
+} MULCANMSG;
+
+extern MULCANMSG ECM18EBFF00;
+extern MULCANMSG ECM18EBFF03;
+extern MULCANMSG ECM18EBFF0B;
+extern MULCANMSG ECM18EBFF10;
+extern MULCANMSG ECM18EBFFA0;
+extern MULCANMSG ECM18EBFFE8;
 
 extern void Can_Set_Buff_18FEAE17(uint8_t CopyData[]);
 
@@ -51,6 +96,8 @@ extern void Can_Set_Buff_18033317(uint8_t CopyData[]);
 
 extern void Can_Set_Buff_180433A2(uint8_t CopyData[]);
 
+extern void Can_Set_Buff_18EA0017(uint8_t CopyData[]);
+
 void Drive_Info_IC1_STATUS_Rx(void);
 void Drive_Info_IC3_STATUS_Rx(void);
 
@@ -71,11 +118,29 @@ void Common_SetId18FFE517Msg_TXSUCCESS(void);
 uint8_t Common_GetId18FFE517Msg_TXSUCCESS(void);
 void Common_Set_LDWS_Flag_Sta(uint8_t Vol);
 uint8_t Common_Get_LDWS_Flag_Sta(void);
+uint8_t Common_Get_Water_Temp_Level_Flag(void);
+
+void Common_DTCEngine_Server(void);
+void Common_DTCBrake_Server(void);
+void Common_DTCAMT_Server(void);
+void Common_DTCRadar_Server(void);
+void Common_DTCCamera_Server(void);
+void Common_DTCRetarder_Server(void);
+
+void GetAllDtcEngineFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* pHisFault, uint8_t* pHisFaultNum);
+void GetAllDtcBrakeFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* pHisFault, uint8_t* pHisFaultNum);
+void GetAllDtcAMTFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* pHisFault, uint8_t* pHisFaultNum);
+void GetAllDtcRadarFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* pHisFault, uint8_t* pHisFaultNum);
+void GetAllDtcCameraFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* pHisFault, uint8_t* pHisFaultNum);
+void GetAllDtcRetarderFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* pHisFault, uint8_t* pHisFaultNum);
 
-
-void Common_DTC_Server(void);
-void GetAllDtcFault(uint32_t* pCurFault, uint8_t* pCurFaultNum, uint32_t* pHisFault, uint8_t* pHisFaultNum);
 void swap32(uint32_t *DwData);
 
+void DoCAN_Get_Multi_frame00_Recv(void);
+void DoCAN_Get_Multi_frame03_Recv(void);
+void DoCAN_Get_Multi_frame0B_Recv(void);
+void DoCAN_Get_Multi_frame10_Recv(void);
+void DoCAN_Get_Multi_frameA0_Recv(void);
+void DoCAN_Get_Multi_frameE8_Recv(void);
 
 #endif
\ No newline at end of file

source/Application/Graphic/GUI/GUI_Interface.c

@@ -126,4 +126,58 @@ void GUI_Unicode_Display(SpriteName_t SpriteID, uint16_t Posx, uint16_t Posy, ui
     LogicLayerAttr.u32UnicodeColor = Color;
 
     loc_Unicode_Normal(SpriteID, LogicLayerAttr, Unicode, Length);
+}
+
+
+void GUI_General_Digit16_Display(SpriteName_t SpriteID, uint32_t Digit, uint16_t u16Font, uint8_t Len, uint8_t Blank, const uint16_t *px, uint16_t y, uint8_t u8BlendEn)
+{
+    uint8_t i;
+    uint8_t ActLen;
+    uint8_t d[10];
+    LogicLayerAttr_t LogicLayerAttr = {0};
+
+    ActLen = 0;
+    while (Digit)
+    {
+        d[ActLen] = Digit % 16;
+        Digit /= 16;
+        ActLen++;
+    }
+
+    if (ActLen == 0)
+    {
+        ActLen = 1;
+        d[0] = 0;
+    }
+
+    for (i = ActLen; i < Len; i++ )
+        d[i] = 0;
+
+
+    i = (Len - 1);
+    while ((d[i] == 0) && (i >= (Len - Blank)))
+    {
+        d[i] = 0xFF;
+        i--;
+    }
+
+    loc_memset_LogicLayerAttr(&LogicLayerAttr);
+    LogicLayerAttr.u8BlendEn = u8BlendEn;
+    for (i = 0; i < Len; i++)
+    {
+        if (d[i] == 0xFF)
+        {
+            LogicLayerAttr.u16ImageID = SpriteSize;
+            LogicLayerAttr.u16PosX = *(px + i);
+            LogicLayerAttr.u16PosY = y;
+            loc_RenderTexture_Normal(SpriteID, LogicLayerAttr);
+        }
+        else
+        {
+            LogicLayerAttr.u16ImageID = u16Font + d[i];
+            LogicLayerAttr.u16PosX = *(px + i);
+            LogicLayerAttr.u16PosY = y;
+            loc_RenderTexture_Normal(SpriteID, LogicLayerAttr);
+        }
+    }
 }
\ No newline at end of file

source/Application/Graphic/GUI/GUI_Interface.h

@@ -10,4 +10,6 @@ void GUI_Translate_Display(SpriteName_t SpriteID, uint16_t ImageID, uint16_t Pos
 void GUI_General_Digit_Display(SpriteName_t SpriteID, uint32_t Digit, uint16_t u16Font, uint8_t Len, uint8_t Blank, const uint16_t *px, uint16_t y, uint8_t u8BlendEn);
 void GUI_Unicode_Display(SpriteName_t SpriteID, uint16_t Posx, uint16_t Posy, uint16_t Unicode[], uint8_t Length, uint32_t Color);
 
+void GUI_General_Digit16_Display(SpriteName_t SpriteID, uint32_t Digit, uint16_t u16Font, uint8_t Len, uint8_t Blank, const uint16_t *px, uint16_t y, uint8_t u8BlendEn);
+
 #endif

source/Application/Graphic/UE/DisplaySch_user.c

@@ -307,11 +307,14 @@ void Display_NothingService(void)
 
 void GUI_DisplayServices(void)
 {
+    uint16_t DispVSpeed = 0u;
+    uint16_t DispESpeed = 0u;
     uint32_t PowerStatus = 0u;
     UElib_uint16_t HMI_MENU_Sta = 0u;
 
     HMI_MENU_Sta = Get_Cur_HMI();
     PowerStatus = Common_Get_IG_Sts();
+    DispVSpeed = Common_Get_Disp_V_Speed();
 
     if (HMI_MENU_Sta == Display_Alarm)
     {
@@ -326,6 +329,15 @@ void GUI_DisplayServices(void)
         {
             MenuFlag.Menu_Popup_Flag = 1u;
 
+            if (bCurMenuIDX < _MN_DSP_Menu_OFF)
+            {
+                MenuFlag.Meun_Test_Dealer = bCurMenuIDX ;
+            }
+            else
+            {
+                MenuFlag.Meun_Test_Dealer = 0u;
+            }
+
             NextMenu(_MN_DSP_LEVEPOPUP);
             bCurMenuIDX = _MN_DSP_LEVEPOPUP;
         }
@@ -362,8 +374,16 @@ void GUI_DisplayServices(void)
             {
                 MenuFlag.Menu_Popup_Flag = 0u;
 
-                NextMenu( MenuFlag.Menu_Flag);
-                bCurMenuIDX = MenuFlag.Menu_Flag;
+                if (DispVSpeed > 66u)
+                {
+                    NextMenu(MenuFlag.Menu_Flag);
+                    bCurMenuIDX = MenuFlag.Menu_Flag;
+                }
+                else
+                {
+                    NextMenu(MenuFlag.Meun_Test_Dealer);
+                    bCurMenuIDX = MenuFlag.Meun_Test_Dealer;
+                }
             }
 
             if (((bCurMenuIDX > _MN_DSP_LEVEPOPUP) && (bCurMenuIDX < _MN_DSP_LEVEL3_5_MENU_1)) ||
@@ -571,17 +591,7 @@ void Meter_Mode_conversion(void)
         }
         else
         {
-            if (DispVSpeed > 66u)
-            {
-                if ((bCurMenuIDX >= _MN_DSP_LEVEL2MENU_1) && (bCurMenuIDX <= _MN_DSP_MENU_MAX))
-                {
-                    NextMenu(MenuFlag.Menu_Flag);
-                }
-            }
-            else
-            {
-                ; /*Do Nothing!*/
-            }
+            ;/*Do Nothing!*/
         }
     }
 }
\ No newline at end of file

source/Application/Graphic/UE/DisplaySch_user.h

@@ -14,7 +14,7 @@
 
 
 #define DisplayAnimationTime 4500u
-#define DisplayMenuTime      5000u / 10u
+#define DisplayMenuTime      5500u / 10u
 #define MAX_DriveInfoPage    6u
 #define FUNC_ENABLE          1u
 #define FUNC_DISABLE         0u

source/Application/RTE/Common_Interface.h

@@ -56,7 +56,17 @@ uint32_t Common_Get_Menu_FacDea_Time_Sta(void);
 uint8_t Common_Get_TPMS_TEST_OFF_Time_Sta(void);
 uint32_t Coom_Get_Menu_Off_Time(void);
 
+void Common_Set_18EF1718_Msg_Sta(void);
+DataValid_t Common_Get_18EF1718_Msg_Sta(void);
+
 void ReadDTCEOLValue_Meter_K_LINE(void);
 void Common_Set_K_Line_Value(void);
 
+void Common_Set_UdsCanIDSta(uint32_t Val);
+uint32_t Common_Get_UdsCanIDSta(void);
+uint32_t Common_Get_OIL_PRESSURE_Time(void);
+
+void Common_Set_Can_Engine_Oil_Num(uint32_t Val);
+uint32_t Common_Get_Can_Engine_Oil_Num(void);
+
 #endif

source/Application/UDS_M/Link_Layer.c

@@ -13,7 +13,7 @@ volatile _LinkData LinkData;
 * Return         : None
 * onther         :
 --------------------------------------------------------------------------*/
-void LK_Link_main(uint16_t PDU_addr, uint8_t *CAN_BufAddr, uint8_t dlc)
+void LK_Link_main(uint32_t PDU_addr, uint8_t *CAN_BufAddr, uint8_t dlc)
 {
     if (LinkDataBuf[0].TransferStatus == empoty)
     {

source/Application/UDS_M/Link_Layer.h

@@ -12,6 +12,6 @@ EXTERN_LK_DIAGNO volatile _LinkData LinkDataBuf[2];
 EXTERN_LK_DIAGNO volatile _LinkData LinkData;
 
 EXTERN_LK_DIAGNO void LK_FillMsg(uint8_t *data, uint8_t FillData, uint8_t dlc);
-EXTERN_LK_DIAGNO void LK_Link_main(uint16_t PDU_addr, uint8_t *CAN_BufAddr, uint8_t dlc);
+EXTERN_LK_DIAGNO void LK_Link_main(uint32_t PDU_addr, uint8_t *CAN_BufAddr, uint8_t dlc);
 
 #endif /* LK_DIAGNO_H_ */

source/System/sys_scheduler.c

@@ -30,6 +30,7 @@ void Sys_Init(void)
     SysScheduling.msRocBak            =  0U;
 
     SysScheduling.TaskGroup.ID2ms     =  0U;
+    SysScheduling.TaskGroup.ID5ms     =  0U;
     SysScheduling.TaskGroup.ID10ms    =  0U;
     SysScheduling.TaskGroup.ID20ms    =  0U;
     SysScheduling.TaskGroup.ID50ms    =  0U;