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 qmk_firmware-3103ea542f0039637a1a266df79a97a7a13fa6b4.zip |
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; | |||
34 | #include <inttypes.h> | 34 | #include <inttypes.h> |
35 | #ifdef AUDIO_ENABLE | 35 | #ifdef AUDIO_ENABLE |
36 | #include "audio.h" | 36 | #include "audio.h" |
37 | 37 | #ifndef TONE_GOODBYE | |
38 | float goodbye[][2] = { | 38 | #define TONE_GOODBYE { \ |
39 | {440.0*pow(2.0,(31)/12.0), 8}, | 39 | {440.0*pow(2.0,(31)/12.0), 8}, \ |
40 | {440.0*pow(2.0,(24)/12.0), 8}, | 40 | {440.0*pow(2.0,(24)/12.0), 8}, \ |
41 | {440.0*pow(2.0,(19)/12.0), 12}, | 41 | {440.0*pow(2.0,(19)/12.0), 12}, \ |
42 | }; | 42 | } |
43 | #endif | ||
44 | float tone_goodbye[][2] = TONE_GOODBYE; | ||
43 | #endif | 45 | #endif |
44 | 46 | ||
45 | static action_t keycode_to_action(uint16_t keycode); | 47 | static action_t keycode_to_action(uint16_t keycode); |
@@ -190,7 +192,7 @@ static action_t keycode_to_action(uint16_t keycode) | |||
190 | case RESET: ; // RESET is 0x5000, which is why this is here | 192 | case RESET: ; // RESET is 0x5000, which is why this is here |
191 | clear_keyboard(); | 193 | clear_keyboard(); |
192 | #ifdef AUDIO_ENABLE | 194 | #ifdef AUDIO_ENABLE |
193 | PLAY_NOTE_ARRAY(goodbye, false, 0); | 195 | PLAY_NOTE_ARRAY(tone_goodbye, false, 0); |
194 | #endif | 196 | #endif |
195 | _delay_ms(250); | 197 | _delay_ms(250); |
196 | #ifdef ATREUS_ASTAR | 198 | #ifdef ATREUS_ASTAR |