diff options
| author | Danny <nooges@users.noreply.github.com> | 2018-07-11 14:19:09 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-07-11 14:19:09 -0400 |
| commit | 168d180a743737fb126ef6f508fda6ee1f81248f (patch) | |
| tree | 2d72ce67891a1a91c30568829e32d619db7551f6 | |
| parent | 7ebed894a8a99b340a3ffc9f6caffe1ac20d59ef (diff) | |
Add macro to play All Star chorus and print lyrics, fixes issues #3345, #3346, #3347, #3348, #3349, #3350 (#3372)0.6.59
| -rw-r--r-- | layouts/community/ortho_4x12/bakingpy/keymap.c | 12 | ||||
| -rw-r--r-- | layouts/community/ortho_4x12/bakingpy/rules.mk | 1 | ||||
| -rw-r--r-- | quantum/audio/song_list.h | 10 |
3 files changed, 22 insertions, 1 deletions
diff --git a/layouts/community/ortho_4x12/bakingpy/keymap.c b/layouts/community/ortho_4x12/bakingpy/keymap.c index a05f741a72..e003513317 100644 --- a/layouts/community/ortho_4x12/bakingpy/keymap.c +++ b/layouts/community/ortho_4x12/bakingpy/keymap.c @@ -76,7 +76,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_LOWER] = LAYOUT_kc_ortho_4x12( //,----+----+----+----+----+----. ,----+----+----+----+----+----. - , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , , + ASTR, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , , //|----+----+----+----+----+----| |----+----+----+----+----+----| DEL ,CAPP,LEFT,RGHT, UP ,LBRC, RBRC, P4 , P5 , P6 ,PLUS,PIPE, //|----+----+----+----+----+----| |----+----+----+----+----+----| @@ -135,6 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { float tone_qwerty[][2] = SONG(QWERTY_SOUND); float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); +float all_star_song[][2] = SONG(ALL_STAR); #endif void persistent_default_layer_set(uint16_t default_layer) { @@ -199,6 +200,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; break; + case KC_ASTR: + if (record->event.pressed) { + #ifdef AUDIO_ENABLE + SEND_STRING("Hey now, you're an all-star, get your game on, go play. Hey now, you're a rock star, get the show on, get paid. All that glitters is gold. Only shooting stars break the mold."); + PLAY_SONG(all_star_song); + #endif + } + return false; + break; } return true; } diff --git a/layouts/community/ortho_4x12/bakingpy/rules.mk b/layouts/community/ortho_4x12/bakingpy/rules.mk index 02899eafeb..80e5f82eef 100644 --- a/layouts/community/ortho_4x12/bakingpy/rules.mk +++ b/layouts/community/ortho_4x12/bakingpy/rules.mk @@ -2,3 +2,4 @@ ifeq ($(LAYOUTS_HAS_RGB),yes) RGBLIGHT_ENABLE = yes endif +AUDIO_ENABLE = yes diff --git a/quantum/audio/song_list.h b/quantum/audio/song_list.h index 8bcc1a9220..01cc6f4ed1 100644 --- a/quantum/audio/song_list.h +++ b/quantum/audio/song_list.h @@ -435,4 +435,14 @@ Q__NOTE(_AS5), \ Q__NOTE(_C6), \ +#define ALL_STAR \ + E__NOTE(_AS4), Q__NOTE(_FS4), S__NOTE(_FS4), S__NOTE(_DS4), E__NOTE(_FS4), Q__NOTE(_FS4), S__NOTE(_FS4), S__NOTE(_DS4), \ + E__NOTE(_FS4), Q__NOTE(_FS4), Q__NOTE(_FS4), QD_NOTE(_AS4), \ + E__NOTE(_AS4), Q__NOTE(_FS4), S__NOTE(_FS4), S__NOTE(_DS4), E__NOTE(_FS4), Q__NOTE(_FS4), S__NOTE(_FS4), S__NOTE(_DS4), \ + E__NOTE(_FS4), Q__NOTE(_FS4), Q__NOTE(_FS4), Q__NOTE(_AS4), E__NOTE(_REST),\ + Q__NOTE(_AS4), Q__NOTE(_CS5), E__NOTE(_B4), E__NOTE(_CS5), E__NOTE(_DS5), Q__NOTE(_FS5), \ + E__NOTE(_GS5), Q__NOTE(_GS5), E__NOTE(_FS4), E__NOTE(_FS4), E__NOTE(_GS4), E__NOTE(_FS4), \ + E__NOTE(_AS4), Q__NOTE(_GS4), Q__NOTE(_GS4), Q__NOTE(_FS4), Q__NOTE(_GS4), \ + E__NOTE(_AS4), HD_NOTE(_DS4) + #endif |