增加新报警

source/Application/Alarm/Popup_List.c

@@ -66,6 +66,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

@@ -69,6 +69,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

@@ -63,6 +63,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故障（红）-请与五十铃公司联系*/
@@ -175,6 +182,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.c

@@ -36,7 +36,7 @@
  --------------------------------------------------------------------------*/
 void Popups_Management_Service(void)
 {
-    //Popups_Polling();
+    Popups_Polling();
 }
 
 /*-------------------------------------------------------------------------
@@ -182,9 +182,10 @@ void Popups_Polling(void)
             }
 
             /*5.--4--ASR工作*/
-            variable_1 = Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State();
-
-            if ((variable_1 == 0x01u) && (K_Line_Set.K_Line_LID21 == 0x01u))
+            variable_1 = (uint8_t)Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State();/*byte6 78*/
+            variable_2 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Lamp_State(); /*byte1 12*/
+            variable_3 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Fully_operational();/*byte1 34*/
+            if (((variable_2 == 0x01u) || (variable_3 == 0x01u)) && (K_Line_Set.K_Line_LID21 == 0x01u)) //|| (variable_1 == 0x01))
             {
                 Popup_Request(POPUT1_ASR_OPERATE);
                 return;
@@ -811,6 +812,61 @@ void Popups_Polling(void)
                 Popup_Delete(POPUP8_BRAKE_BLOCKF);
             }
 
+            /*   变速箱温度高*/
+            variable_1 = (uint8_t)Get_ID_18FF8503_Sig_Temperature_too_high();
+            if (variable_1 == 0x01u)
+            {
+                Popup_Request(POPUP8_TemperatureThigh);
+            }
+            else
+            {
+                Popup_Delete(POPUP8_TemperatureThigh);
+            }
+
+            /*   未检测到GW*/
+            variable_1 = CAN_MSG_Status(ID_CanMsg18FF064A_Msg_Count);
+            if (variable_1 == CAN_SIG_LOST)
+            {
+                Popup_Request(POPUP8_TBOX_GW_Sta);
+            }
+            else
+            {
+                Popup_Delete(POPUP8_TBOX_GW_Sta);
+            }
+
+            /*   未检测到TBOX*/
+            variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sta();
+            if ((variable_1 == 1) || (variable_1 == 2) || (variable_1 == 3))
+            {
+                Popup_Request(POPUP8_TBOX_Sta);
+            }
+            else
+            {
+                Popup_Delete(POPUP8_TBOX_Sta);
+            }
+
+            /*   TBOX通信异常*/
+            variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sig();
+            if (variable_1 == 1)
+            {
+                Popup_Request(POPUP8_TBOX_Sig);
+            }
+            else
+            {
+                Popup_Delete(POPUP8_TBOX_Sig);
+            }
+
+            /*   平台通信异常*/
+            variable_1 = (uint8_t)Get_ID_18FF064A_Sig_TBOX_Sig_Error();
+            if (variable_1 == 1)
+            {
+                Popup_Request(POPUP8_TBOX_Sig_Error);
+            }
+            else
+            {
+                Popup_Delete(POPUP8_TBOX_Sig_Error);
+            }
+
             /*54.--8--DPD自动再生-DPD自动再生中  ID：18FED900 (AUXIO)  Byte：8  bit：5,4  01(B)  Engine Speed ： 350rpm以上*/
             variable_1 = Get_ID_18FED900_Sig_DPF_Regeneration_Status();
 
@@ -828,7 +884,7 @@ void Popups_Polling(void)
             variable_1 = (uint8_t)Line_In_Get_Status(LINE_IN_BRAKE_AIR_EBS);
             variable_2 = Common_Get_L12_Air_Sta();
 
-            if ((variable_1 == LINE_IN_LOGIC_VALID) || (variable_2 == 0X01U))
+            if ((variable_1 == LINE_IN_LOGIC_VALID) || (variable_2 == 0x01U))
             {
                 Popup_Request(POPUP9_AIR_PRESSURE);
             }
@@ -1033,6 +1089,13 @@ void Popups_Polling(void)
             Popup_Clear(POPUP8_OVERVOLTAGE);             /*51.过电压报警*/
             Popup_Clear(POPUP8_BRAKE_BLOCKR);            /*52.后蹄片磨损*/
             Popup_Clear(POPUP8_BRAKE_BLOCKF);            /*53.前蹄片磨损*/
+
+            Popup_Clear(POPUP8_TemperatureThigh);        /*   变速箱温度高*/
+            Popup_Clear(POPUP8_TBOX_GW_Sta);             /*   未检测到GW*/
+            Popup_Clear(POPUP8_TBOX_Sta);                /*   未检测到TBOX*/
+            Popup_Clear(POPUP8_TBOX_Sig);                /*   TBOX通信异常*/
+            Popup_Clear(POPUP8_TBOX_Sig_Error);          /*   平台通信异常*/
+
             Popup_Clear(POPUP8_DPD_AUTO);                /*54.DPD自动再生-再生将自动完成，不需要操作开关*/
             Popup_Clear(POPUP9_AIR_PRESSURE);            /*55.气压过低-请冲入空气*/
             Popup_Clear(POPUP9_EBS_ERROR);               /*56.EBS故障（红）-请与五十铃公司联系*/

source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c

@@ -464,6 +464,16 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
         (( void * )0),
         (( void * )0),
     },
+    {
+        {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
+        {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
+        {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
+        5000ul,
+        0x18FF064Aul,
+        (( void * )0),
+        (( void * )0),
+        (( void * )0),
+    },
     {
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
@@ -943,6 +953,11 @@ uint8_t  Get_ID_18F00503_Sig_Current_Gear(void)
     return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18F00503_Msg_Count, 3u) >> 0u) & 0xFFu));
 }
 
+uint8_t  Get_ID_18FF8503_Sig_Temperature_too_high(void)
+{
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FF8503_Msg_Count, 1u) >> 6u) & 0x03u));
+}
+
 uint8_t  Get_ID_18FF8503_Sig_Low_air_warning(void)
 {
     return (((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FF8503_Msg_Count, 1u) >> 4u) & 0x03u));
@@ -1327,6 +1342,21 @@ uint16_t Get_ID_18FECAA0_Sig_DM1(void)
             ((uint16_t)((uint16_t)CAN_MSG_Read(ID_CanMsg18FECAA0_Msg_Count, 2u) >> 0u) & 0xFFu));
 }
 
+uint8_t  Get_ID_18FF064A_Sig_TBOX_Sta(void)
+{
+    return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FF064A_Msg_Count, 0u) >> 0u) & 0x03u);
+}
+
+uint8_t  Get_ID_18FF064A_Sig_TBOX_Sig(void)
+{
+    return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FF064A_Msg_Count, 0u) >> 2u) & 0x03u);
+}
+
+uint8_t  Get_ID_18FF064A_Sig_TBOX_Sig_Error(void)
+{
+    return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FF064A_Msg_Count, 1u) >> 4u) & 0x0Fu);
+}
+
 uint8_t  Get_ID_18ECFFA0_Sig_PRIO(void)
 {
     return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18ECFFA0_Msg_Count, 0u) >> 0u) & 0xFFu);
@@ -1542,6 +1572,9 @@ uint8_t  Co_Can_ConvertSubID(uint32_t MsgID)
     case ID_CanMsg18FECAA0_Msg:
         u8Result = ID_CanMsg18FECAA0_Msg_Count;
         break;
+    case ID_CanMsg18FF064A_Msg:
+        u8Result = ID_CanMsg18FF064A_Msg_Count;
+        break;
 
     case ID_CanMsg18FECA00_Msg:
         u8Result = ID_CanMsg18FECA00_Msg_Count;

source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h

@@ -50,10 +50,10 @@ typedef enum
     /*41*/ID_CanMsg18FECA2A_Msg_Count,
     /*42*/ID_CanMsg18FECAA1_Msg_Count,
     /*43*/ID_CanMsg18FECAA0_Msg_Count,
+    /*44*/ID_CanMsg18FF064A_Msg_Count,
 
     ID_CanMsg18FECA00_Msg_Count,
     ID_CanMsg18FECA10_Msg_Count,
-
     ID_CanMsg18ECFF00_Msg_Count,
     ID_CanMsg18EBFF00_Msg_Count,
     ID_CanMsg18ECFF0B_Msg_Count,
@@ -136,6 +136,7 @@ extern const st_CAN_SendAttribute    st_CANSendAttr[ID_SEND_TOTAL] ;
 #define  ID_CanMsg18FECA2A_Msg    0x18FECA2Au
 #define  ID_CanMsg18FECAA1_Msg    0x18FECAA1u
 #define  ID_CanMsg18FECAA0_Msg    0x18FECAA0u
+#define  ID_CanMsg18FF064A_Msg    0x18FF064Au
 
 #define  ID_CanMsg18FECA00_Msg    0x18FECA00u
 #define  ID_CanMsg18FECA10_Msg    0x18FECA10u
@@ -222,6 +223,7 @@ extern uint8_t  Get_ID_18FF4925_Sig_ID18FF4925_byte3_bit1_2(void);
 extern uint8_t  Get_ID_18FF4925_Sig_ID18FF4925_byte3_bit3_4(void);
 extern uint8_t  Get_ID_18F00503_Sig_ID18F00503_byte5(void);
 extern uint8_t  Get_ID_18F00503_Sig_Current_Gear(void);
+extern uint8_t  Get_ID_18FF8503_Sig_Temperature_too_high(void);
 extern uint8_t  Get_ID_18FF8503_Sig_Low_air_warning(void);
 extern uint8_t  Get_ID_18FF8503_Sig_Clutch_Overload_warning(void);
 extern uint8_t  Get_ID_18FF8503_Sig_Clutch_Wear_warning(void);
@@ -255,6 +257,9 @@ extern uint8_t  Get_ID_18FF5612_Sig_ID18FF5612_byte3_bit1_8(void);
 extern uint8_t  Get_ID_18FD7C00_Sig_DPF_Lamp_Status_Amber(void);
 extern uint8_t  Get_ID_18FECAE8_Sig_Amber_Warning_Lamp_Status(void);
 extern uint8_t  Get_ID_18FEED00_Sig_Maximum_Vehicle_Speed_Limit(void);
+extern uint8_t  Get_ID_18FF064A_Sig_TBOX_Sta(void);
+extern uint8_t  Get_ID_18FF064A_Sig_TBOX_Sig(void);
+extern uint8_t  Get_ID_18FF064A_Sig_TBOX_Sig_Error(void);
 //extern uint32_t Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup(void);
 extern uint8_t  Get_ID_0C010305_Sig_Auto_EcoPow(void);
 extern uint32_t Get_ID_18FECA03_Sig_SPN(void);

source/Application/Graphic/GUI/GUI.h

@@ -251,6 +251,13 @@ static const GUIGeneralPopupStruct GUIGeneralPopupTable[] =
     {CN_Alarm_drive_33_image,    CN_Alarm_drive_39_wenzi2,    SpriteSize,                 CN_Alarm_drive_39_wenzi2,    SpriteSize},                /*51.      过电压报警*/
     {CN_Alarm_drive_70_image,    CN_Alarm_drive_70_wenzi1,    SpriteSize,                 CN_Alarm_stop_71_wenzi1_1,   CN_Alarm_stop_70_wenzi2},   /*52.      后蹄片磨损*/
     {CN_Alarm_drive_70_image,    CN_Alarm_drive_70_wenzi1,    SpriteSize,                 CN_Alarm_stop_70_wenzi1_1,   CN_Alarm_stop_70_wenzi2},   /*53.      前蹄片磨损*/
+
+    {CN_Alarm_76_image,          CN_Alarm_76_wenzi1,          CN_Alarm_76_wenzi2,         CN_Alarm_76_wenzi1,          CN_Alarm_76_wenzi2},        /*   变速箱温度高*/
+    {CN_Alarm_72_image,          CN_Alarm_72_wenzi,           SpriteSize,                 CN_Alarm_72_wenzi,           SpriteSize        },        /*   未检测到GW*/
+    {CN_Alarm_73_image,          CN_Alarm_73_wenzi,           SpriteSize,                 CN_Alarm_73_wenzi,           SpriteSize        },        /*   未检测到TBOX*/
+    {CN_Alarm_73_image,          CN_Alarm_74_wenzi,           SpriteSize,                 CN_Alarm_74_wenzi,           SpriteSize        },        /*   TBOX通信异常*/
+    {CN_Alarm_75_image,          CN_Alarm_75_wenzi,           SpriteSize,                 CN_Alarm_75_wenzi,           SpriteSize        },        /*   平台通信异常*/
+
     {CN_Alarm_drive_41_image,    CN_Alarm_drive_41_wenzi,     SpriteSize,                 CN_Alarm_stop_43_wenzi1,     CN_Alarm_stop_43_wenzi2},   /*54.      DPD自动再生-再生将自动完成，不需要操作开关*/
     {CN_Alarm_drive_42_image,    CN_Alarm_drive_42_wenzi1,    SpriteSize,                 CN_Alarm_stop_44_wenzi1_1,   CN_Alarm_stop_44_wenzi1_2}, /*55.第九组 气压过低-请冲入空气*/
     {CN_Alarm_drive_42_image,    CN_Alarm_drive_42_wenzi2_2,  CN_Alarm_drive_42_wenzi2_1, CN_Alarm_stop_44_wenzi2_1,   CN_Alarm_stop_44_wenzi2_2}, /*56.      EBS故障（红）-请与五十铃公司联系*/