diff options
| author | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-04-18 08:03:22 +0200 |
|---|---|---|
| committer | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-04-18 08:03:22 +0200 |
| commit | 9cc39156f7ac696c4561a8fa4e01bbcc9addc53e (patch) | |
| tree | af166a966b16bb1714551265965b3660fa0c26ba /quantum/keymap_common.c | |
| parent | 6732d6cf1a3268ece981c6b0c07a1b9e0f61adbe (diff) | |
| parent | d94960be5b32b6a4019b822550ae09cf802bfcd7 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/keymap_common.c')
| -rw-r--r-- | quantum/keymap_common.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index d38e6fdb20..2001438b90 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c @@ -26,6 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "backlight.h" #include "keymap_midi.h" #include "bootloader.h" +#include "eeconfig.h" extern keymap_config_t keymap_config; @@ -33,15 +34,13 @@ extern keymap_config_t keymap_config; #include <inttypes.h> #ifdef AUDIO_ENABLE #include "audio.h" + #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 + #define TONE_GOODBYE OLKB_GOODBYE + #endif /*! TONE_GOODBYE */ + + float tone_goodbye[][2] = SONG(TONE_GOODBYE); +#endif /* AUDIO_ENABLE */ static action_t keycode_to_action(uint16_t keycode); |