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) | |
| download | qmk_firmware-168d180a743737fb126ef6f508fda6ee1f81248f.tar.gz qmk_firmware-168d180a743737fb126ef6f508fda6ee1f81248f.zip | |
Add macro to play All Star chorus and print lyrics, fixes issues #3345, #3346, #3347, #3348, #3349, #3350 (#3372)
| -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 a05f741a7..e00351331 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] = { | |||
| 76 | 76 | ||
| 77 | [_LOWER] = LAYOUT_kc_ortho_4x12( | 77 | [_LOWER] = LAYOUT_kc_ortho_4x12( |
| 78 | //,----+----+----+----+----+----. ,----+----+----+----+----+----. | 78 | //,----+----+----+----+----+----. ,----+----+----+----+----+----. |
| 79 | , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , , | 79 | ASTR, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , , |
| 80 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 80 | //|----+----+----+----+----+----| |----+----+----+----+----+----| |
| 81 | DEL ,CAPP,LEFT,RGHT, UP ,LBRC, RBRC, P4 , P5 , P6 ,PLUS,PIPE, | 81 | DEL ,CAPP,LEFT,RGHT, UP ,LBRC, RBRC, P4 , P5 , P6 ,PLUS,PIPE, |
| 82 | //|----+----+----+----+----+----| |----+----+----+----+----+----| | 82 | //|----+----+----+----+----+----| |----+----+----+----+----+----| |
| @@ -135,6 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 135 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); | 135 | float tone_qwerty[][2] = SONG(QWERTY_SOUND); |
| 136 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); | 136 | float tone_dvorak[][2] = SONG(DVORAK_SOUND); |
| 137 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); | 137 | float tone_colemak[][2] = SONG(COLEMAK_SOUND); |
| 138 | float all_star_song[][2] = SONG(ALL_STAR); | ||
| 138 | #endif | 139 | #endif |
| 139 | 140 | ||
| 140 | void persistent_default_layer_set(uint16_t default_layer) { | 141 | void persistent_default_layer_set(uint16_t default_layer) { |
| @@ -199,6 +200,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 199 | } | 200 | } |
| 200 | return false; | 201 | return false; |
| 201 | break; | 202 | break; |
| 203 | case KC_ASTR: | ||
| 204 | if (record->event.pressed) { | ||
| 205 | #ifdef AUDIO_ENABLE | ||
| 206 | 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."); | ||
| 207 | PLAY_SONG(all_star_song); | ||
| 208 | #endif | ||
| 209 | } | ||
| 210 | return false; | ||
| 211 | break; | ||
| 202 | } | 212 | } |
| 203 | return true; | 213 | return true; |
| 204 | } | 214 | } |
diff --git a/layouts/community/ortho_4x12/bakingpy/rules.mk b/layouts/community/ortho_4x12/bakingpy/rules.mk index 02899eafe..80e5f82ee 100644 --- a/layouts/community/ortho_4x12/bakingpy/rules.mk +++ b/layouts/community/ortho_4x12/bakingpy/rules.mk | |||
| @@ -2,3 +2,4 @@ | |||
| 2 | ifeq ($(LAYOUTS_HAS_RGB),yes) | 2 | ifeq ($(LAYOUTS_HAS_RGB),yes) |
| 3 | RGBLIGHT_ENABLE = yes | 3 | RGBLIGHT_ENABLE = yes |
| 4 | endif | 4 | endif |
| 5 | AUDIO_ENABLE = yes | ||
diff --git a/quantum/audio/song_list.h b/quantum/audio/song_list.h index 8bcc1a922..01cc6f4ed 100644 --- a/quantum/audio/song_list.h +++ b/quantum/audio/song_list.h | |||
| @@ -435,4 +435,14 @@ | |||
| 435 | Q__NOTE(_AS5), \ | 435 | Q__NOTE(_AS5), \ |
| 436 | Q__NOTE(_C6), \ | 436 | Q__NOTE(_C6), \ |
| 437 | 437 | ||
| 438 | #define ALL_STAR \ | ||
| 439 | E__NOTE(_AS4), Q__NOTE(_FS4), S__NOTE(_FS4), S__NOTE(_DS4), E__NOTE(_FS4), Q__NOTE(_FS4), S__NOTE(_FS4), S__NOTE(_DS4), \ | ||
| 440 | E__NOTE(_FS4), Q__NOTE(_FS4), Q__NOTE(_FS4), QD_NOTE(_AS4), \ | ||
| 441 | E__NOTE(_AS4), Q__NOTE(_FS4), S__NOTE(_FS4), S__NOTE(_DS4), E__NOTE(_FS4), Q__NOTE(_FS4), S__NOTE(_FS4), S__NOTE(_DS4), \ | ||
| 442 | E__NOTE(_FS4), Q__NOTE(_FS4), Q__NOTE(_FS4), Q__NOTE(_AS4), E__NOTE(_REST),\ | ||
| 443 | Q__NOTE(_AS4), Q__NOTE(_CS5), E__NOTE(_B4), E__NOTE(_CS5), E__NOTE(_DS5), Q__NOTE(_FS5), \ | ||
| 444 | E__NOTE(_GS5), Q__NOTE(_GS5), E__NOTE(_FS4), E__NOTE(_FS4), E__NOTE(_GS4), E__NOTE(_FS4), \ | ||
| 445 | E__NOTE(_AS4), Q__NOTE(_GS4), Q__NOTE(_GS4), Q__NOTE(_FS4), Q__NOTE(_GS4), \ | ||
| 446 | E__NOTE(_AS4), HD_NOTE(_DS4) | ||
| 447 | |||
| 438 | #endif | 448 | #endif |
