aw/pentabug
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use melody code for music app

Browse Source
This commit is contained in:
Thammi 2013-08-29 23:25:46 +02:00
parent 1b962ea397
commit ff891a1d86
2 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
firmware/apps/music.c
View File

@ -1,36 +1,23 @@
#include <stdlib.h> #include <stdlib.h>
#include <pentabug/app.h>
#include <pentabug/music.h> #include <pentabug/music.h>
#include <pentabug/hal.h> #include <pentabug/hal.h>
#include <pentabug/helper.h>
#include <pentabug/app.h>
#define NOTE_BREAK 0xfffe #define NOTE_BREAK MLDY_LENGTH, 16, NOTE_PAUSE
#define NOTE_SHORT 0xfffd
static uint16_t notes[] = { static uint16_t notes[] = {
NOTE_C, NOTE_D, NOTE_E, NOTE_F, NOTE_SHORT, NOTE_G, NOTE_G, NOTE_BREAK, NOTE_C, NOTE_D, NOTE_E, NOTE_F, MLDY_LENGTH, 2, NOTE_G, MLDY_LENGTH, 2, NOTE_G, NOTE_BREAK,
NOTE_A, NOTE_A, NOTE_A, NOTE_A, NOTE_SHORT, NOTE_G, NOTE_BREAK, NOTE_A, NOTE_A, NOTE_A, NOTE_A, MLDY_LENGTH, 2, NOTE_G, NOTE_BREAK,
NOTE_A, NOTE_A, NOTE_A, NOTE_A, NOTE_SHORT, NOTE_G, NOTE_BREAK, NOTE_A, NOTE_A, NOTE_A, NOTE_A, MLDY_LENGTH, 2, NOTE_G, NOTE_BREAK,
NOTE_F, NOTE_F, NOTE_F, NOTE_F, NOTE_SHORT, NOTE_E, NOTE_E, NOTE_BREAK, NOTE_F, NOTE_F, NOTE_F, NOTE_F, MLDY_LENGTH, 2, NOTE_E, MLDY_LENGTH, 2, NOTE_E, NOTE_BREAK,
NOTE_D, NOTE_D, NOTE_D, NOTE_D, NOTE_SHORT, NOTE_C, NOTE_BREAK, NOTE_D, NOTE_D, NOTE_D, NOTE_D, MLDY_LENGTH, 1, NOTE_C, NOTE_BREAK,
NOTE_PAUSE, NOTE_PAUSE, NOTE_PAUSE, NOTE_PAUSE, NOTE_PAUSE, NOTE_PAUSE,
}; };
static void run(void) { static void music(void) {
size_t i; play_melody(notes, ARRAY_SIZE(notes), 4, 500);
for(i = 0; i < sizeof(notes) / sizeof(*notes); ++i) {
if(notes[i] == NOTE_BREAK) {
wait_ms(180);
} else if(notes[i] == NOTE_SHORT) {
wait_ms(30);
} else {
set_note(notes[i], 4);
wait_ms(500);
stop_note();
wait_ms(10);
}
}
} }
REG(run); REG(music);

1
firmware/lib/music.c
View File

@ -4,6 +4,7 @@
#include <pentabug/timer.h> #include <pentabug/timer.h>
#include <pentabug/lifecycle.h> #include <pentabug/lifecycle.h>
#include <pentabug/hal.h>
static void tune(void) { static void tune(void) {
PORTB ^= 1 << 7; PORTB ^= 1 << 7;