Merge branch 'liang_buf' into '依维柯216变更后'

追加历史问题

See merge request !40

source/Appliciation/DataProcess.c

@@ -90,7 +90,7 @@ void Can_Receive_Init(void)
 	CanReceive.Can_18FECA03 = 0;
 	CanReceive.Can_18FF4453 = 0;
 	CanReceive.Can_18FFA8EE = 0;
-	CanReceive.Can_18FFB078 = 0;
+	// CanReceive.Can_18FFB078 = 0;
 	CanReceive.Can_18FE4A03 = 0;
 	CanReceive.Can_18F00503 = 0;
 	CanReceive.Can_18FF9DF1 = 0;
@@ -98,7 +98,10 @@ void Can_Receive_Init(void)
 	CanReceive.Can_10F007E8 = 0;
 }
 
-
+void Can_18FFB078_Receive_Init(void)
+{
+	CanReceive.Can_18FFB078 = 0;
+}
 void Can_18FEEE00_Receive(void)
 {
 	CanReceive.Can_18FEEE00 = 1;

source/Appliciation/DataProcess.h

@@ -540,6 +540,7 @@ void Can_18F00503_Receive(void);
 void Can_18FF9DF1_Receive(void);
 void Can_18FE5BE8_Receive(void);
 void Can_10F007E8_Receive(void);
+void Can_18FFB078_Receive_Init(void);
 void Damping_Data_Renew_Mode(uint8_t Valid, uint8_t FastModeDurtion, uint16_t *FastModeTimeCnt,  uint8_t *Mode);
 void Data_Coolant_Display(void);
 uint16_t Get_InsFuel_Value(void);

source/Appliciation/PowerManag_user.c

@@ -111,6 +111,7 @@ void PoMa_KL30_Init(void)
     Data_AverageSpeed_KL30_Init( );
     Data_TPMS_30_15KL_Processing( );
     Display_Ctrl_Init( );
+    Can_18FFB078_Receive_Init();
 }
 void PoMa_IG_OFF_Init(void)
 {
@@ -182,6 +183,8 @@ void PoMa_Wakeup_Init(void)
     Line_In_KL15_ON_Init( );
     COM_CAN_Init( );
     Display_Ctrl_Init( );
+    Buzzer_Volume_Set(MenuData.Sound );
+    Can_18FFB078_Receive_Init();
 }
 void PoMa_Sleep_Init(void)
 {

source/Appliciation/Sound_Alarm_handle.c

@@ -108,8 +108,11 @@ void Sound_Alarm_Trigger_RADAR(void)
 {
     if ( SYS_OPR_STAT_IGN_ON )
     {
-        if ( Get_CAN_CH0_ID_10FF1021_Sig_ReverseSts( ) == 1U )
+        if ( Get_CAN_CH0_ID_10FF1021_Sig_ReverseSts( ) == 1U  \
+        && (CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_can18FFB078_Msg_Count) != CAN_SIG_LOST)  \
+        && CanReceive.Can_18FFB078 == 1)
         {
+
             uint16_t u16SdRadar = 0;
             if ( Get_CAN_CH0_ID_18FFB078_Sig_PAM_Voice( ) == 5U )
             {
@@ -159,7 +162,15 @@ void Sound_Alarm_Trigger_RADAR(void)
             }
             if ( u16SdRadar == 0 )
             {
-                Sound_Alarm_Request_Normal(SOUND_ALARM_RADAR_0);
+                if(Get_CAN_CH0_ID_18FFB078_Sig_PAM_Voice( ) == 0U)
+                {
+                    Sound_Alarm_Request_Normal(SOUND_ALARM_RADAR_0);
+                }
+                else
+                {
+                    Sound_Alarm_Delete_Normal(SOUND_ALARM_RADAR_0);
+                }
+                
             }
             else
             {
@@ -168,6 +179,7 @@ void Sound_Alarm_Trigger_RADAR(void)
         }
         else
         {
+            CanReceive.Can_18FFB078 = 0; 
             Sound_Alarm_Delete_Normal(SOUND_ALARM_RADAR_LOOP);
             Sound_Alarm_Delete_Normal(SOUND_ALARM_RADAR_8);
             Sound_Alarm_Delete_Normal(SOUND_ALARM_RADAR_4);

source/Driver/Sound/Buzzer_Play_User.c

@@ -23,7 +23,7 @@ Buzzer_Operate_Type_en_t Buzzer_Positive_Handle_Operate(Buzzer_uint8_t u8BuzzerO
     {
     	switch (BuzzerVolume)
     	{
-    	default:
+    	// default:
     	case 3:
     		Buzzer_CT_X1_OUT = 1U;
     		Buzzer_CT_X2_OUT = 0U;
@@ -39,6 +39,11 @@ Buzzer_Operate_Type_en_t Buzzer_Positive_Handle_Operate(Buzzer_uint8_t u8BuzzerO
     		Buzzer_CT_X2_OUT = 0U;
     		Buzzer_CT_X3_OUT = 1U;
     		break;
+        default://非音量等级时切换为默认等级
+            Buzzer_CT_X1_OUT = 1U;
+    		Buzzer_CT_X2_OUT = 0U;
+    		Buzzer_CT_X3_OUT = 0U;
+            break;
     	}
     }
     else