diff options
| author |  IBNobody <ibnobody@gmail.com> | 2016-04-17 12:55:19 -0500 |
|---|---|---|
| committer | IBNobody <ibnobody@gmail.com> | 2016-04-17 12:55:19 -0500 |
| commit | 3103ea542f0039637a1a266df79a97a7a13fa6b4 (patch) | |
| tree | 24a840d4a80678ec24a0f5e5a51e1b217d0568fa /quantum/keymap_common.c | |
| parent | d5b72e7bde5ede25f7d5699b50b7d9eb6f31ba92 (diff) | |
| parent | a67d425f4d5278595e7ab785a0f246b83fb1a09f (diff) | |
| download | qmk_firmware-3103ea542f0039637a1a266df79a97a7a13fa6b4.tar.gz | |
Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck
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 ce1d007f3..c705b7a73 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c @@ -34,12 +34,14 @@ extern keymap_config_t keymap_config; #include <inttypes.h> #ifdef AUDIO_ENABLE #include "audio.h" - - float goodbye[][2] = { - {440.0*pow(2.0,(31)/12.0), 8}, - {440.0*pow(2.0,(24)/12.0), 8}, - {440.0*pow(2.0,(19)/12.0), 12}, - }; + #ifndef TONE_GOODBYE + #define TONE_GOODBYE { \ + {440.0*pow(2.0,(31)/12.0), 8}, \ + {440.0*pow(2.0,(24)/12.0), 8}, \ + {440.0*pow(2.0,(19)/12.0), 12}, \ + } + #endif + float tone_goodbye[][2] = TONE_GOODBYE; #endif static action_t keycode_to_action(uint16_t keycode); @@ -190,7 +192,7 @@ static action_t keycode_to_action(uint16_t keycode) case RESET: ; // RESET is 0x5000, which is why this is here clear_keyboard(); #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(goodbye, false, 0); + PLAY_NOTE_ARRAY(tone_goodbye, false, 0); #endif _delay_ms(250); #ifdef ATREUS_ASTAR |