some sounds

This commit is contained in:
Wolfgang Hottgenroth 2024-04-15 17:10:33 +02:00
parent 9674bc8ef5
commit 2711f5fb4b
Signed by: wn
GPG Key ID: 836E9E1192A6B132
6 changed files with 23 additions and 6 deletions

View File

@ -31,11 +31,6 @@ int main() {
__enable_interrupt();
playMelodyTetris();
schAdd(playTusch1, NULL, 5000, 0);
schAdd(mute, NULL, 10000, 0);
schAdd(unMute, NULL, 12000, 0);
while (1) {
schExec();
}

View File

@ -932,4 +932,8 @@ void playMelodyTetris() {
sequencerPlayMelodies(&tetrisTheme);
}
void stopMelodyTetris() {
sequencerStopMelodies(&tetrisTheme);
}

View File

@ -3,6 +3,7 @@
void playMelodyTetris();
void stopMelodyTetris();
#endif // _MELODY_TETRIS_H_

View File

@ -116,3 +116,7 @@ uint16_t sequencerPlayMelodies(t_melodies *melodies) {
return melodies->taskId;
}
void sequencerStopMelodies(t_melodies *melodies) {
schDel(melodies->taskId);
}

View File

@ -62,6 +62,6 @@ typedef struct {
void sequencerInit();
uint16_t sequencerPlayMelodies(t_melodies *melodies);
void sequencerStopMelodies(t_melodies *melodies);
#endif // _SEQUENCER_H_

View File

@ -4,6 +4,11 @@
#include "spi.h"
#include "../game-ctrl/sound.h"
#include "scheduler.h"
#include "psg.h"
#include "mute.h"
#include "melody_tetris.h"
#include "melody_tusch1.h"
volatile t_SoundCmd cmd;
@ -45,12 +50,16 @@ void spiCmdHandler(void *handle) {
switch (cmdShadow) {
case e_SOUND_MUTE:
mute();
break;
case e_SOUND_UNMUTE:
unMute();
break;
case e_SOUND_START_BACKGROUND:
playMelodyTetris();
break;
case e_SOUND_STOP_BACKGROUND:
stopMelodyTetris();
break;
case e_SOUND_START_GAMEOVER:
break;
@ -59,12 +68,16 @@ void spiCmdHandler(void *handle) {
case e_SOUND_SPEED_UP:
break;
case e_SOUND_FANFARE_1:
playTusch1();
break;
case e_SOUND_FANFARE_2:
playTusch1();
break;
case e_SOUND_FANFARE_3:
playTusch1();
break;
case e_SOUND_FANFARE_4:
playTusch1();
break;
case e_SOUND_STONE_LOCKED:
break;