增加一个报警

source/Application/Alarm/Popup_List.c

@@ -17,6 +17,7 @@ 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_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,},

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.忘记松手刹车*/

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.忘记松手刹车*/
@@ -133,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.忘记松手刹车*/

source/Application/Alarm/Popups.c

@@ -100,6 +100,7 @@ void Popups_Polling(void)
                     Popup_Clear(POPUP1_BRAKE_SPACING_R);
                     Popup_Clear(POPUP1_BRAKE_SPACING_COLLISION);
                     Popup_Clear(POPUP1_BRAKE_SPACING_Y);
+                    Popup_Clear(POPUP1_BRAKE_SPACING_Y2);
                     Popup_Clear(POPUT1_ASR_OPERATE);
                     return;
                 }
@@ -117,6 +118,7 @@ void Popups_Polling(void)
                     Popup_Clear(POPUP1_BRAKE_SPACING_R);
                     Popup_Clear(POPUP1_BRAKE_SPACING_COLLISION);
                     Popup_Clear(POPUP1_BRAKE_SPACING_Y);
+                    Popup_Clear(POPUP1_BRAKE_SPACING_Y2);
                     Popup_Clear(POPUT1_ASR_OPERATE);
                     return;
                 }
@@ -134,6 +136,7 @@ void Popups_Polling(void)
                     Popup_Request(POPUP1_BRAKE_SPACING_R);
                     Popup_Clear(POPUP1_BRAKE_SPACING_COLLISION);
                     Popup_Clear(POPUP1_BRAKE_SPACING_Y);
+                    Popup_Clear(POPUP1_BRAKE_SPACING_Y2);
                     Popup_Clear(POPUT1_ASR_OPERATE);
                     return;
                 }
@@ -142,13 +145,14 @@ void Popups_Polling(void)
                     Popup_Delete(POPUP1_BRAKE_SPACING_R);
                 }
 
-                /*3.--2--车间距警报-碰撞报警*/
+                /*3.--3--车间距警报-碰撞报警*/
                 variable_1 = Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
 
                 if (variable_1 == 0x06u)
                 {
                     Popup_Request(POPUP1_BRAKE_SPACING_COLLISION);
                     Popup_Clear(POPUP1_BRAKE_SPACING_Y);
+                    Popup_Clear(POPUP1_BRAKE_SPACING_Y2);
                     Popup_Clear(POPUT1_ASR_OPERATE);
                     return;
                 }
@@ -157,13 +161,14 @@ void Popups_Polling(void)
                     Popup_Delete(POPUP1_BRAKE_SPACING_COLLISION);
                 }
 
-                /*4.--3--车间距警报-刹车(黄字)*/
+                /*4.--4--车间距警报-刹车(黄字)*/
                 variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
                 variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
 
                 if ((variable_1 == 0x05u) || (variable_2 == 0x05u))
                 {
                     Popup_Request(POPUP1_BRAKE_SPACING_Y);
+                    Popup_Clear(POPUP1_BRAKE_SPACING_Y2);
                     Popup_Clear(POPUT1_ASR_OPERATE);
                     return;
                 }
@@ -171,6 +176,19 @@ void Popups_Polling(void)
                 {
                     Popup_Delete(POPUP1_BRAKE_SPACING_Y);
                 }
+
+                /**/
+                variable_1 = Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
+                if (variable_1 == 0x05u)
+                {
+                    Popup_Request(POPUP1_BRAKE_SPACING_Y2);
+                    Popup_Clear(POPUT1_ASR_OPERATE);
+                    return;
+                }
+                else
+                {
+                    Popup_Delete(POPUP1_BRAKE_SPACING_Y2);
+                }
             }
             else
             {
@@ -179,6 +197,7 @@ void Popups_Polling(void)
                 Popup_Clear(POPUP1_BRAKE_SPACING_R);
                 Popup_Clear(POPUP1_BRAKE_SPACING_COLLISION);
                 Popup_Clear(POPUP1_BRAKE_SPACING_Y);
+                Popup_Clear(POPUP1_BRAKE_SPACING_Y2);
             }
 
             /*5.--4--ASR工作*/
@@ -1040,6 +1059,7 @@ void Popups_Polling(void)
             Popup_Clear(POPUP1_BRAKE_SPACING_R);         /*02.车间距警报-刹车(红字)*/
             Popup_Clear(POPUP1_BRAKE_SPACING_COLLISION); /*03.车间距警报-碰撞报警*/
             Popup_Clear(POPUP1_BRAKE_SPACING_Y);         /*04.车间距警报-刹车(黄字)*/
+            Popup_Clear(POPUP1_BRAKE_SPACING_Y2);        /**/
             Popup_Clear(POPUT1_ASR_OPERATE);             /*05.ASR工作*/
             Popup_Clear(POPUT2_PTO);                     /*06.PTO紧急警报-刹车*/
             Popup_Clear(POPUP2_PARKING_BRAKE);           /*07.忘记松手刹车*/

source/Application/Graphic/GUI/GUI.h

@@ -17,7 +17,7 @@
 #define FState_COilTimeOutNum 60u /*3S*/
 
 #define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10201)) /*硬件版本号   HV:01.02.00*/
-#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10103))   /*软件版本号   SV:01.01.03*/
+#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10104))   /*软件版本号   SV:01.01.03*/
 #define systemSupplierECUFlashInformationApp ((uint16_t)(13))         /*FLASH版本号 FV:00.13*/
 
 typedef struct
@@ -187,6 +187,7 @@ static const GUIGeneralPopupStruct GUIGeneralPopupTable[] =
     {SpriteSize,                 CN_Alarm_01_wenzi2,          SpriteSize,                 CN_Alarm_01_wenzi2,          SpriteSize},                /*02.      车间距警报-刹车(红字)*/
     {SpriteSize,                 CN_Alarm_01_wenzi5,          SpriteSize,                 CN_Alarm_01_wenzi5,          SpriteSize},                /*03.      车间距警报-碰撞报警*/
     {SpriteSize,                 CN_Alarm_01_wenzi3,          SpriteSize,                 CN_Alarm_01_wenzi3,          SpriteSize},                /*04.      车间距警报-刹车(黄字)*/
+    {SpriteSize,                 CN_Alarm_01_wenzi3,          SpriteSize,                 CN_Alarm_01_wenzi3,          SpriteSize},                /*         车间距警报-刹车(黄字)*/
     {CN_Alarm_drive_04_image,    CN_Alarm_drive_04_wenzi,     SpriteSize,                 CN_Alarm_drive_04_wenzi,     SpriteSize},                /*05.      ASR工作*/
     {CN_Alarm_drive_05_image,    CN_Alarm_drive_05_wenzi,     SpriteSize,                 SpriteSize,                  SpriteSize},                /*06.第二组 PTO紧急警报-刹车*/
     {CN_Alarm_drive_06_image,    CN_Alarm_drive_06_wenzi,     SpriteSize,                 SpriteSize,                  SpriteSize},                /*07.      忘记松手刹车*/