Commit 8f81a582 authored by 时昊's avatar 时昊

修改声音频率为2hz

parent 59ddc9a5
......@@ -9,7 +9,7 @@ const Buzzer_Attribute_st_t stSoundSourceAttribute [ SOUND_SOURCE_MAX ] = {
{846U, 500U, 50U, 0U, 500U},
{520U, 500U, 50U, 0U, 500U},
/************************************************************/
{1385U, 500U, 50U, 0U, 500U},
{846U, 500U, 50U, 0U, 250U},
{2074U, 500U, 0U, 0xFFFFU, 0U},
{2074U, 500U, 500U, 500U, 0U},
{2074U, 500U, 250U, 250U, 0U},
......@@ -29,7 +29,7 @@ const Sound_Variety_Attribute_st_t stSoundVarietyAttribute [ SOUND_VARIETY_MAX ]
{SOUND_SOURCE_1, 600U, 400U, SOUND_SOURCE_PLAY_TYPE_ONCE, 0U, 0U, 1U},
{SOUND_SOURCE_2, 600U, 400U, SOUND_SOURCE_PLAY_TYPE_ONCE, 0U, 0U, 1U},
{SOUND_SOURCE_3, 600U, 400U, SOUND_SOURCE_PLAY_TYPE_ONCE, 0U, 0U, 1U},
{SOUND_SOURCE_4, 600U, 400U, SOUND_SOURCE_PLAY_TYPE_ONCE, 0U, 0U, 1U},
{SOUND_SOURCE_4, 300U, 200U, SOUND_SOURCE_PLAY_TYPE_ONCE, 0U, 0U, 1U},
{SOUND_SOURCE_RADAR_0, 0XFFFFFFFFUL, 0U, SOUND_SOURCE_PLAY_TYPE_LOOP, 0U, 0U, 1U},
{SOUND_SOURCE_RADAR_1, 1000U, 0U, SOUND_SOURCE_PLAY_TYPE_ONCE, 0U, 0U, 1U},
{SOUND_SOURCE_RADAR_2, 500U, 0U, SOUND_SOURCE_PLAY_TYPE_ONCE, 0U, 0U, 1U},
......@@ -98,7 +98,7 @@ const Sound_Alarm_Attribute_st_t stSoundAlarmAttribute [ SOUND_ALARM_MAX ] = {
/*SOUND_ALARM_TICK*/ {SOUND_VARIETY_TICK, 1U, SOUND_ALARM_TRIGGER_MULTI, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
/*SOUND_ALARM_TOCK*/ {SOUND_VARIETY_TOCK, 1U, SOUND_ALARM_TRIGGER_MULTI, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
/*SOUND_ALARM_LDWS*/ {SOUND_VARIETY_2, 0xFFU, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_RECOVER_CONTINUE, SOUND_ALARM_NUM_FINISH_RESET},
/*SOUND_ALARM_LDWS*/ {SOUND_VARIETY_4, 0xFFU, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_RECOVER_CONTINUE, SOUND_ALARM_NUM_FINISH_RESET},
/*SOUND_ALARM_LOW_OIL_PRESSURE*/ {SOUND_VARIETY_3, 3U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
};
......
......@@ -25,7 +25,7 @@ void Sound_Alarm_Trigger_LDWS(void)
( 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 )&&(Common_GetIgnOnTime( ) >= 10000))
if( u8PopAlarmLDWS )
{
Sound_Alarm_Request_Normal(SOUND_ALARM_LDWS);
}
......@@ -36,8 +36,6 @@ void Sound_Alarm_Trigger_LDWS(void)
}
else
{
CanReceive.Can_18FE5BE8 = 0;
CanReceive.Can_10F007E8 = 0;
Sound_Alarm_Delete_Normal(SOUND_ALARM_LDWS);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment