1.优化ldws指示灯,声音,弹窗报警功能

source/Appliciation/DataProcess.h

@@ -426,12 +426,13 @@ typedef struct
   uint8_t  Can_0A18A006: 1;
   uint8_t  Can_0CF00400: 1;
   uint8_t  Can_18FF2100: 1;
-
   uint8_t  Can_18FEEE00: 1;
+  
   uint8_t  Can_18FEF100: 1;
   uint8_t  Can_18FD0700: 1;
   uint8_t  Can_18FEFF00: 1;
   uint8_t  Can_18FEE400: 1;
+
   uint8_t  Can_18FECA00: 1; 
   uint8_t  Can_18FD7C00: 1;
   uint8_t  Can_18FF4C00: 1;
@@ -439,14 +440,17 @@ typedef struct
   //uint8_t  Can_18FEFC17: 1;
   //uint8_t  Can_18FEC1EE: 1;
   uint8_t  Can_10FF1021: 1;
+
   uint8_t  Can_10FF7521: 1;
   uint8_t  Can_18FEF433: 1;
   uint8_t  Can_18FF9CF1: 1;
   uint8_t  Can_18FECA03: 1;
+
   uint8_t  Can_18FF4453: 1;
   uint8_t  Can_18FFA8EE: 1;
   uint8_t  Can_18FFB078: 1;
   uint8_t  Can_18FE4A03: 1;
+
   uint8_t  Can_18F00503: 1;
   uint8_t  Can_18FF9DF1: 1;
   uint8_t  Can_18FE5BE8: 1;

source/Appliciation/Popup_Alarm.h

@@ -78,6 +78,7 @@ typedef enum
 typedef enum
 {
 	POP_TYPE_0 = 0U,
+	POP_TYPE_1,
 	POP_TYPE_MAX, /*最大值*/
 } Pop_Alarm_Type_en_t;
 /*可查询的报警隐藏队列枚举,需根据不同项目而修改*/

source/Appliciation/Popup_Alarm_user.c

@@ -10,6 +10,7 @@ const Popup_Alarm_Group_Attribute_st_t stPopAlarmGroupAttribute [ POP_GROUP_MAX
 #pragma alignvar(8)
 const Popup_Alarm_Type_Attribute_st_t stPopAlarmTypeAttribute [ POP_TYPE_MAX ] = {
     {POPUP_DISPLAY_CYCLY, POPUP_DISPLAY_FIX, POP_DELAY_MIN, POP_RECOVER_CYCLE, POP_SORTORD_FIRST, 10, 30, 30, 0, POP_ALLOW_HIDE_FIRST_CYCLE},
+    {POPUP_DISPLAY_CYCLY, POPUP_DISPLAY_FIX, POP_DELAY_MIN, POP_RECOVER_CYCLE, POP_SORTORD_FIRST, 10, 30, 0, 0, POP_ALLOW_HIDE_FIRST_CYCLE},
 };
 
 #pragma alignvar(8)
@@ -52,10 +53,10 @@ const Popup_Alarm_Attribute_st_t stPopAlarmAttribute [ POP_ALARM_MAX ] = {
     /* POP_ALARM_RADAR_FAILURE 			  */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_RADAR_FAILURE, POP_ALARM_RADAR_FAILURE + POP_ALARM_MAX, 0xFFU},
     /* POP_ALARM_GEARBOX_CAUTION 		  */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_GEARBOX_CAUTION, POP_ALARM_GEARBOX_CAUTION + POP_ALARM_MAX, SOUND_ALARM_GEARBOX_CAUTION},
     /* POP_ALARM_GEARBOX_HIGH_TEMP 		  */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_GEARBOX_HIGH_TEMP, POP_ALARM_GEARBOX_HIGH_TEMP + POP_ALARM_MAX, 0xFFU},
-    /* POP_ALARM_LDWS_CLOSE 	 		  */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_LDWS_CLOSE,   POP_ALARM_LDWS_CLOSE + POP_ALARM_MAX, 0xFFU},
-    /* POP_ALARM_LDWS_FAILURE	 		  */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_LDWS_FAILURE, POP_ALARM_LDWS_FAILURE + POP_ALARM_MAX, 0xFFU},
-    /* POP_ALARM_LDWS_ATCIVE	 		  */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_LDWS_ATCIVE,  POP_ALARM_LDWS_ATCIVE + POP_ALARM_MAX, 0xFFU},
-    /* POP_ALARM_LDWS_L_R		 		  */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_LDWS_L_R,     POP_ALARM_LDWS_L_R + POP_ALARM_MAX, SOUND_ALARM_LDWS},
+    /* POP_ALARM_LDWS_CLOSE 	 		  */ {POP_GROUP_0, POP_TYPE_1, POP_ALARM_LDWS_CLOSE,   POP_ALARM_LDWS_CLOSE + POP_ALARM_MAX, 0xFFU},
+    /* POP_ALARM_LDWS_FAILURE	 		  */ {POP_GROUP_0, POP_TYPE_1, POP_ALARM_LDWS_FAILURE, POP_ALARM_LDWS_FAILURE + POP_ALARM_MAX, 0xFFU},
+    /* POP_ALARM_LDWS_ATCIVE	 		  */ {POP_GROUP_0, POP_TYPE_1, POP_ALARM_LDWS_ATCIVE,  POP_ALARM_LDWS_ATCIVE + POP_ALARM_MAX, 0xFFU},
+    /* POP_ALARM_LDWS_L_R		 		  */ {POP_GROUP_0, POP_TYPE_1, POP_ALARM_LDWS_L_R,     POP_ALARM_LDWS_L_R + POP_ALARM_MAX, SOUND_ALARM_LDWS},
     /* POP_ALARM_HILL_HOLD_MALF 	      */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_HILL_HOLD_MALF, POP_ALARM_HILL_HOLD_MALF + POP_ALARM_MAX, SOUND_ALARM_HILL_HOLD_MALF},
     /* POP_ALARM_POSITION_LIGHT 		  */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_POSITION_LIGHT, POP_ALARM_POSITION_LIGHT + POP_ALARM_MAX, 0xFFU},
     /* POP_ALARM_KEY 				      */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_KEY, POP_ALARM_KEY + POP_ALARM_MAX, 0xFFU},

source/Appliciation/Sound_Alarm_handle.c

@@ -21,18 +21,9 @@ void Sound_Alarm_Trigger_LDWS(void)
 {
     if (( SYS_OPR_STAT_IGN_ON )&&(Get_NodeConfig_LWDS() == 1))
     {
-        if(( CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_can18FE5BE8_Msg_Count) == CAN_SIG_NORMAL )&&
-           ( CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_can10F007E8_Msg_Count) == CAN_SIG_NORMAL )&&
-           (CanReceive.Can_18FE5BE8 == 1)&&(CanReceive.Can_10F007E8 == 1))
+        if( u8PopAlarmLDWS )
         {
-            if( u8PopAlarmLDWS )
-            {
-                Sound_Alarm_Request_Normal(SOUND_ALARM_LDWS);
-            }
-            else
-            {
-                Sound_Alarm_Delete_Normal(SOUND_ALARM_LDWS);
-            }
+            //Sound_Alarm_Request_Normal(SOUND_ALARM_LDWS);
         }
         else
         {

source/Appliciation/Telltales_user.c

@@ -1803,6 +1803,10 @@ Tellib_uint16_t LED_LDWS_Lamp_Judge(void)
                             {
                                 res = 0u;
                             }
+                            else
+                            {
+                                res = 0u;
+                            }
                         }
                     }
                 }