Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
IVECO_NS216
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
时昊
IVECO_NS216
Commits
8f81a582
Commit
8f81a582
authored
Jan 15, 2024
by
时昊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改声音频率为2hz
parent
59ddc9a5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
Sound_Alarm_User.c
source/Appliciation/Sound_Alarm_User.c
+3
-3
Sound_Alarm_handle.c
source/Appliciation/Sound_Alarm_handle.c
+1
-3
No files found.
source/Appliciation/Sound_Alarm_User.c
View file @
8f81a582
...
...
@@ -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
,
50
0U
},
{
846U
,
500U
,
50U
,
0U
,
25
0U
},
{
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
,
4
00U
,
SOUND_SOURCE_PLAY_TYPE_ONCE
,
0U
,
0U
,
1U
},
{
SOUND_SOURCE_4
,
300U
,
2
00U
,
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
},
};
...
...
source/Appliciation/Sound_Alarm_handle.c
View file @
8f81a582
...
...
@@ -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
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment