diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-04-16 23:07:50 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-04-16 23:07:50 -0400 |
| commit | 8bbd064cf52a76508589579f19595607a1f3af21 (patch) | |
| tree | cb11676373bc7adafa99a16a2239250fcde5ced0 /quantum/keymap_common.c | |
| parent | 41cc35425ab32c9a9492006da8b667d01d32dfa6 (diff) | |
| download | qmk_firmware-8bbd064cf52a76508589579f19595607a1f3af21.tar.gz qmk_firmware-8bbd064cf52a76508589579f19595607a1f3af21.zip | |
changes to play_notes, goodbye
Diffstat (limited to 'quantum/keymap_common.c')
| -rw-r--r-- | quantum/keymap_common.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index 457f70a44..8f35521a2 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c | |||
| @@ -33,12 +33,14 @@ extern keymap_config_t keymap_config; | |||
| 33 | #include <inttypes.h> | 33 | #include <inttypes.h> |
| 34 | #ifdef AUDIO_ENABLE | 34 | #ifdef AUDIO_ENABLE |
| 35 | #include "audio.h" | 35 | #include "audio.h" |
| 36 | 36 | #ifndef GOODBYE_TUNE | |
| 37 | float goodbye[][2] = { | 37 | #define GOODBYE_TUNE { \ |
| 38 | {440.0*pow(2.0,(31)/12.0), 8}, | 38 | {440.0*pow(2.0,(31)/12.0), 8}, \ |
| 39 | {440.0*pow(2.0,(24)/12.0), 8}, | 39 | {440.0*pow(2.0,(24)/12.0), 8}, \ |
| 40 | {440.0*pow(2.0,(19)/12.0), 12}, | 40 | {440.0*pow(2.0,(19)/12.0), 12}, \ |
| 41 | }; | 41 | } |
| 42 | #endif | ||
| 43 | float goodbye_tune[][2] = GOODBYE_TUNE; | ||
| 42 | #endif | 44 | #endif |
| 43 | 45 | ||
| 44 | static action_t keycode_to_action(uint16_t keycode); | 46 | static action_t keycode_to_action(uint16_t keycode); |
| @@ -189,7 +191,7 @@ static action_t keycode_to_action(uint16_t keycode) | |||
| 189 | case RESET: ; // RESET is 0x5000, which is why this is here | 191 | case RESET: ; // RESET is 0x5000, which is why this is here |
| 190 | clear_keyboard(); | 192 | clear_keyboard(); |
| 191 | #ifdef AUDIO_ENABLE | 193 | #ifdef AUDIO_ENABLE |
| 192 | play_notes(&goodbye, 3, false, 0); | 194 | play_notes(&goodbye_tune, false, 0); |
| 193 | #endif | 195 | #endif |
| 194 | _delay_ms(250); | 196 | _delay_ms(250); |
| 195 | #ifdef ATREUS_ASTAR | 197 | #ifdef ATREUS_ASTAR |