summaryrefslogtreecommitdiff
path: root/keyboards/meira/keymaps/default
diff options
context:
space:
mode:
authorCole Markham <github@themarkhams.us>2018-04-18 23:57:24 -0500
committerJack Humbert <jack.humb@gmail.com>2018-04-19 00:57:24 -0400
commitb4bdebab9a48546160465d64000724a07617054e (patch)
tree418021491d61b5c6039383d7bcdcd7d449d4dbe7 /keyboards/meira/keymaps/default
parent3d3c093173f6e9a838671bd7484b3a11dc564c1a (diff)
Meira updates for bluetooth and audio (#2731)
* Add audio output * Update Miera to fix bluetooth issues, bootloader definition. * Added keymap with audio example * Cleanup Meira audio code
Diffstat (limited to 'keyboards/meira/keymaps/default')
-rw-r--r--keyboards/meira/keymaps/default/config.h10
-rw-r--r--keyboards/meira/keymaps/default/keymap.c11
2 files changed, 21 insertions, 0 deletions
diff --git a/keyboards/meira/keymaps/default/config.h b/keyboards/meira/keymaps/default/config.h
index 97210115b9..5f5844a70a 100644
--- a/keyboards/meira/keymaps/default/config.h
+++ b/keyboards/meira/keymaps/default/config.h
@@ -20,5 +20,15 @@
#include "../../config.h"
// place overrides here
+#define MUSIC_MASK (keycode != KC_NO)
+#ifdef AUDIO_ENABLE
+ #define STARTUP_SONG SONG(PLANCK_SOUND)
+ // #define STARTUP_SONG SONG(NO_SOUND)
+
+ #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+ SONG(COLEMAK_SOUND), \
+ SONG(DVORAK_SOUND) \
+ }
+#endif
#endif
diff --git a/keyboards/meira/keymaps/default/keymap.c b/keyboards/meira/keymaps/default/keymap.c
index dd55859a58..4bbd014cb7 100644
--- a/keyboards/meira/keymaps/default/keymap.c
+++ b/keyboards/meira/keymaps/default/keymap.c
@@ -37,6 +37,17 @@ enum custom_keycodes {
ADJUST,
};
+#ifdef AUDIO_ENABLE
+
+float tone_my_startup[][2] = SONG(ODE_TO_JOY);
+float tone_my_goodbye[][2] = SONG(ROCK_A_BYE_BABY);
+
+float tone_qwerty[][2] = SONG(QWERTY_SOUND);
+float tone_dvorak[][2] = SONG(DVORAK_SOUND);
+float tone_colemak[][2] = SONG(COLEMAK_SOUND);
+
+#endif /* AUDIO_ENABLE */
+
// define variables for reactive RGB
bool TOG_STATUS = false;
int RGB_current_mode;