diff options
| author | DDRnJn <dhruv.ranjan@gmail.com> | 2019-03-11 16:53:22 -0400 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-03-11 13:53:22 -0700 |
| commit | fe89aef77476d76f3bfe4682b0e9c8a54c8b5329 (patch) | |
| tree | c188d41d5e85d5c392265efa71c5afb08bf41e3b /quantum | |
| parent | e88a75904b0c345d75b02bbf333dd171d31399ae (diff) | |
| download | qmk_firmware-fe89aef77476d76f3bfe4682b0e9c8a54c8b5329.tar.gz qmk_firmware-fe89aef77476d76f3bfe4682b0e9c8a54c8b5329.zip | |
Add 3 new songs and add new note type (#5351)
* Added 3 new songs and added new note type to musical_notes.h
Added Megalovania from Undertale, Kataware Doki from Kimi no Na Wa and La Campanella by Lizst to song_list.h
Added the breve (double whole note) and dotted breve note types to musical_notes.h. I included this because the default tempo is quite high, so I thought a note with higher
duration was needed
* Fixed indentation for new notes in musical_notes.h
Changed tabs to spaces in indentation
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/audio/musical_notes.h | 4 | ||||
| -rw-r--r-- | quantum/audio/song_list.h | 44 |
2 files changed, 47 insertions, 1 deletions
diff --git a/quantum/audio/musical_notes.h b/quantum/audio/musical_notes.h index ce8d47d1c..cd54af38d 100644 --- a/quantum/audio/musical_notes.h +++ b/quantum/audio/musical_notes.h | |||
| @@ -26,12 +26,14 @@ | |||
| 26 | 26 | ||
| 27 | // Note Types | 27 | // Note Types |
| 28 | #define MUSICAL_NOTE(note, duration) {(NOTE##note), duration} | 28 | #define MUSICAL_NOTE(note, duration) {(NOTE##note), duration} |
| 29 | #define BREVE_NOTE(note) MUSICAL_NOTE(note, 128) | ||
| 29 | #define WHOLE_NOTE(note) MUSICAL_NOTE(note, 64) | 30 | #define WHOLE_NOTE(note) MUSICAL_NOTE(note, 64) |
| 30 | #define HALF_NOTE(note) MUSICAL_NOTE(note, 32) | 31 | #define HALF_NOTE(note) MUSICAL_NOTE(note, 32) |
| 31 | #define QUARTER_NOTE(note) MUSICAL_NOTE(note, 16) | 32 | #define QUARTER_NOTE(note) MUSICAL_NOTE(note, 16) |
| 32 | #define EIGHTH_NOTE(note) MUSICAL_NOTE(note, 8) | 33 | #define EIGHTH_NOTE(note) MUSICAL_NOTE(note, 8) |
| 33 | #define SIXTEENTH_NOTE(note) MUSICAL_NOTE(note, 4) | 34 | #define SIXTEENTH_NOTE(note) MUSICAL_NOTE(note, 4) |
| 34 | 35 | ||
| 36 | #define BREVE_DOT_NOTE(note) MUSICAL_NOTE(note, 128+64) | ||
| 35 | #define WHOLE_DOT_NOTE(note) MUSICAL_NOTE(note, 64+32) | 37 | #define WHOLE_DOT_NOTE(note) MUSICAL_NOTE(note, 64+32) |
| 36 | #define HALF_DOT_NOTE(note) MUSICAL_NOTE(note, 32+16) | 38 | #define HALF_DOT_NOTE(note) MUSICAL_NOTE(note, 32+16) |
| 37 | #define QUARTER_DOT_NOTE(note) MUSICAL_NOTE(note, 16+8) | 39 | #define QUARTER_DOT_NOTE(note) MUSICAL_NOTE(note, 16+8) |
| @@ -40,11 +42,13 @@ | |||
| 40 | 42 | ||
| 41 | // Note Type Shortcuts | 43 | // Note Type Shortcuts |
| 42 | #define M__NOTE(note, duration) MUSICAL_NOTE(note, duration) | 44 | #define M__NOTE(note, duration) MUSICAL_NOTE(note, duration) |
| 45 | #define B__NOTE(n) BREVE_NOTE(n) | ||
| 43 | #define W__NOTE(n) WHOLE_NOTE(n) | 46 | #define W__NOTE(n) WHOLE_NOTE(n) |
| 44 | #define H__NOTE(n) HALF_NOTE(n) | 47 | #define H__NOTE(n) HALF_NOTE(n) |
| 45 | #define Q__NOTE(n) QUARTER_NOTE(n) | 48 | #define Q__NOTE(n) QUARTER_NOTE(n) |
| 46 | #define E__NOTE(n) EIGHTH_NOTE(n) | 49 | #define E__NOTE(n) EIGHTH_NOTE(n) |
| 47 | #define S__NOTE(n) SIXTEENTH_NOTE(n) | 50 | #define S__NOTE(n) SIXTEENTH_NOTE(n) |
| 51 | #define BD_NOTE(n) BREVE_DOT_NOTE(n) | ||
| 48 | #define WD_NOTE(n) WHOLE_DOT_NOTE(n) | 52 | #define WD_NOTE(n) WHOLE_DOT_NOTE(n) |
| 49 | #define HD_NOTE(n) HALF_DOT_NOTE(n) | 53 | #define HD_NOTE(n) HALF_DOT_NOTE(n) |
| 50 | #define QD_NOTE(n) QUARTER_DOT_NOTE(n) | 54 | #define QD_NOTE(n) QUARTER_DOT_NOTE(n) |
diff --git a/quantum/audio/song_list.h b/quantum/audio/song_list.h index 126c0e594..350983044 100644 --- a/quantum/audio/song_list.h +++ b/quantum/audio/song_list.h | |||
| @@ -533,5 +533,47 @@ | |||
| 533 | H__NOTE(_C4 ), \ | 533 | H__NOTE(_C4 ), \ |
| 534 | W__NOTE(_REST), \ | 534 | W__NOTE(_REST), \ |
| 535 | QD_NOTE(_F4 ), \ | 535 | QD_NOTE(_F4 ), \ |
| 536 | M__NOTE(_BF4, 128), | 536 | M__NOTE(_BF4, 128), |
| 537 | |||
| 538 | #define KATAWARE_DOKI \ | ||
| 539 | W__NOTE(_G5), HD_NOTE(_G5), Q__NOTE(_G5), H__NOTE(_G5), H__NOTE(_E5), H__NOTE(_D5), Q__NOTE(_D5), Q__NOTE(_C5), \ | ||
| 540 | B__NOTE(_E5), H__NOTE(_C5), W__NOTE(_G5), HD_NOTE(_G5), Q__NOTE(_C5), H__NOTE(_C6), Q__NOTE(_B5), \ | ||
| 541 | Q__NOTE(_A5), H__NOTE(_G5), Q__NOTE(_G5), Q__NOTE(_A5), W__NOTE(_G5), QD_NOTE(_E5), \ | ||
| 542 | QD_NOTE(_F5), Q__NOTE(_E5), WD_NOTE(_D5), H__NOTE(_C5), W__NOTE(_G5), HD_NOTE(_G5), Q__NOTE(_G5), \ | ||
| 543 | H__NOTE(_G5), H__NOTE(_E5), H__NOTE(_D5), Q__NOTE(_D5), Q__NOTE(_C5), B__NOTE(_E5), H__NOTE(_G4), \ | ||
| 544 | Q__NOTE(_C5), Q__NOTE(_D5), Q__NOTE(_E5), H__NOTE(_D5), Q__NOTE(_C5), Q__NOTE(_C5), \ | ||
| 545 | Q__NOTE(_A4), H__NOTE(_C5), Q__NOTE(_C5), W__NOTE(_C5), Q__NOTE(_F4), Q__NOTE(_C5), \ | ||
| 546 | Q__NOTE(_D5), Q__NOTE(_E5), H__NOTE(_D5), H__NOTE(_C5), Q__NOTE(_C5), H__NOTE(_G5), \ | ||
| 547 | Q__NOTE(_C5), HD_NOTE(_D5), H__NOTE(_G4), Q__NOTE(_C5), Q__NOTE(_D5), Q__NOTE(_E5), \ | ||
| 548 | H__NOTE(_D5), Q__NOTE(_C5), Q__NOTE(_C5), Q__NOTE(_A4), H__NOTE(_C5), Q__NOTE(_C5), \ | ||
| 549 | W__NOTE(_C5), Q__NOTE(_F4), Q__NOTE(_C5), Q__NOTE(_D5), Q__NOTE(_E5), H__NOTE(_D5), \ | ||
| 550 | H__NOTE(_C5), Q__NOTE(_C5), H__NOTE(_G5), Q__NOTE(_C5), HD_NOTE(_D5), \ | ||
| 551 | HD_NOTE(_G4), Q__NOTE(_C5), Q__NOTE(_D5), BD_NOTE(_C5), | ||
| 552 | |||
| 553 | #define CAMPANELLA \ | ||
| 554 | Q__NOTE(_DS4), E__NOTE(_DS4), E__NOTE(_DS5), Q__NOTE(_DS5), E__NOTE(_DS5), E__NOTE(_DS6), Q__NOTE(_DS5), E__NOTE(_DS5), \ | ||
| 555 | E__NOTE(_DS6), Q__NOTE(_CS5), E__NOTE(_CS5), E__NOTE(_DS6), Q__NOTE(_B4), E__NOTE(_B4), E__NOTE(_DS6), \ | ||
| 556 | Q__NOTE(_B4), E__NOTE(_B4), E__NOTE(_DS6), Q__NOTE(_AS4), E__NOTE(_AS4), E__NOTE(_DS6), Q__NOTE(_GS4), \ | ||
| 557 | E__NOTE(_GS4), E__NOTE(_DS6), Q__NOTE(_G4), E__NOTE(_G4), E__NOTE(_DS6), Q__NOTE(_GS4), E__NOTE(_GS4), \ | ||
| 558 | E__NOTE(_DS6), Q__NOTE(_AS4), E__NOTE(_AS4), E__NOTE(_DS6), Q__NOTE(_DS4), E__NOTE(_DS4), E__NOTE(_DS6), \ | ||
| 559 | Q__NOTE(_DS5), E__NOTE(_DS5), E__NOTE(_DS6), Q__NOTE(_E5), E__NOTE(_E5), E__NOTE(_DS6), Q__NOTE(_DS5), \ | ||
| 560 | E__NOTE(_DS5), E__NOTE(_DS6), Q__NOTE(_CS5), E__NOTE(_CS5), E__NOTE(_DS6), Q__NOTE(_B4), E__NOTE(_B4), \ | ||
| 561 | E__NOTE(_DS6), Q__NOTE(_B4), E__NOTE(_B4), E__NOTE(_DS6), Q__NOTE(_AS4), E__NOTE(_AS4), E__NOTE(_DS6), \ | ||
| 562 | Q__NOTE(_GS4), E__NOTE(_GS4), E__NOTE(_DS6), Q__NOTE(_G4), E__NOTE(_G4), E__NOTE(_DS6), Q__NOTE(_GS4), \ | ||
| 563 | E__NOTE(_GS4), E__NOTE(_DS6), Q__NOTE(_AS4), E__NOTE(_AS4), E__NOTE(_DS6), Q__NOTE(_DS4), E__NOTE(_DS4), \ | ||
| 564 | E__NOTE(_DS5), Q__NOTE(_DS5), E__NOTE(_DS5), E__NOTE(_DS6), Q__NOTE(_DS6), E__NOTE(_DS6), E__NOTE(_DS7), \ | ||
| 565 | Q__NOTE(_DS6), E__NOTE(_DS6), E__NOTE(_DS7), Q__NOTE(_CS6), E__NOTE(_CS6), E__NOTE(_DS7), Q__NOTE(_B5), \ | ||
| 566 | E__NOTE(_B5), E__NOTE(_DS7), Q__NOTE(_B5), E__NOTE(_B5), E__NOTE(_DS7), Q__NOTE(_AS5), E__NOTE(_AS5), \ | ||
| 567 | E__NOTE(_DS7), Q__NOTE(_GS5), E__NOTE(_GS5), E__NOTE(_DS7), Q__NOTE(_G5), E__NOTE(_G5), E__NOTE(_DS7), \ | ||
| 568 | Q__NOTE(_GS5), E__NOTE(_GS5), E__NOTE(_DS7), Q__NOTE(_AS5), E__NOTE(_AS5), E__NOTE(_DS7), Q__NOTE(_DS5), \ | ||
| 569 | E__NOTE(_DS5), E__NOTE(_DS7), W__NOTE(_DS6), W__NOTE(_GS5), | ||
| 570 | |||
| 571 | #define MEGALOVANIA \ | ||
| 572 | Q__NOTE(_D4), Q__NOTE(_D4), H__NOTE(_D5), HD_NOTE(_A4), H__NOTE(_AF4), H__NOTE(_G4), H__NOTE(_F4), \ | ||
| 573 | Q__NOTE(_D4), Q__NOTE(_F4), Q__NOTE(_G4), Q__NOTE(_C4), Q__NOTE(_C4), H__NOTE(_D5), HD_NOTE(_A4), \ | ||
| 574 | H__NOTE(_AF4), H__NOTE(_G4), H__NOTE(_F4), Q__NOTE(_D4), Q__NOTE(_F4), Q__NOTE(_G4), \ | ||
| 575 | Q__NOTE(_B3), Q__NOTE(_B3), H__NOTE(_D5), HD_NOTE(_A4), H__NOTE(_AF4), H__NOTE(_G4), H__NOTE(_F4), \ | ||
| 576 | Q__NOTE(_D4), Q__NOTE(_F4), Q__NOTE(_G4), Q__NOTE(_BF3), Q__NOTE(_BF3), H__NOTE(_D5), \ | ||
| 577 | HD_NOTE(_A4), H__NOTE(_AF4), H__NOTE(_G4), H__NOTE(_F4), Q__NOTE(_D4), Q__NOTE(_F4), \ | ||
| 578 | Q__NOTE(_G4), | ||
| 537 | #endif | 579 | #endif |
