Skip to content

Commit f512654

Browse files
committed
Remove MUSIC_GetTimerAlarm as it is only called once
1 parent e2f935e commit f512654

3 files changed

Lines changed: 3 additions & 8 deletions

File tree

src/music.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,6 @@ u16 MUSIC_GetTelemetryAlarm(enum Music music) {
250250
return music;
251251
}
252252

253-
u16 MUSIC_GetTimerAlarm(enum Music music) {
254-
if ( Model.voice.timer[music - MUSIC_ALARM1].music > 0 )
255-
return Model.voice.timer[music - MUSIC_ALARM1].music;
256-
return music;
257-
}
258-
259253
void MUSIC_PlayValue(u16 music, s32 value, u8 unit, u8 prec)
260254
{
261255
u32 i;

src/music.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ struct AudioQueue {
114114
};
115115

116116
u16 MUSIC_GetTelemetryAlarm(enum Music music);
117-
u16 MUSIC_GetTimerAlarm(enum Music music);
118117
void MUSIC_PlayValue(u16 music, s32 value, u8 unit, u8 prec);
119118

120119
#endif //HAS_EXTENDED_AUDIO

src/timer.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,9 @@ void TIMER_Update()
172172
}
173173
if (timer_state[i]) {
174174
#if HAS_EXTENDED_AUDIO
175-
unsigned timer_music = MUSIC_GetTimerAlarm(MUSIC_ALARM1 + i);
175+
unsigned timer_music = MUSIC_ALARM1 + i;
176+
if (Model.voice.timer[i].music)
177+
timer_music = Model.voice.timer[i].music;
176178
#endif
177179
s32 delta = t - last_time[i];
178180
s32 warn_time;

0 commit comments

Comments
 (0)