summaryrefslogtreecommitdiff
path: root/keyboard/planck
diff options
context:
space:
mode:
authorIBNobody <ibnobody@gmail.com>2016-04-16 20:37:44 -0500
committerIBNobody <ibnobody@gmail.com>2016-04-16 20:37:44 -0500
commit12a9b2b9aeb59a16602374dab202df2bbe256be4 (patch)
tree5f78fc2d6f030025142cb06e0d211c762b301a83 /keyboard/planck
parenta87522033d6385ecd2422f26f5bb6bdad9d44676 (diff)
parent41cc35425ab32c9a9492006da8b667d01d32dfa6 (diff)
downloadqmk_firmware-12a9b2b9aeb59a16602374dab202df2bbe256be4.tar.gz
qmk_firmware-12a9b2b9aeb59a16602374dab202df2bbe256be4.zip
Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck
Diffstat (limited to 'keyboard/planck')
-rw-r--r--keyboard/planck/keymaps/default/keymap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/keyboard/planck/keymaps/default/keymap.c b/keyboard/planck/keymaps/default/keymap.c
index ede08ad7f1..a6edefefd9 100644
--- a/keyboard/planck/keymaps/default/keymap.c
+++ b/keyboard/planck/keymaps/default/keymap.c
@@ -194,7 +194,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _QW:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
- play_notes(&tone_qw, 4, false);
+ play_notes(&tone_qw, 4, false, 0);
#endif
default_layer_set(1UL<<_QW);
}
@@ -202,7 +202,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _CM:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
- play_notes(&tone_cm, 6, false);
+ play_notes(&tone_cm, 6, false, 0);
#endif
default_layer_set(1UL<<_CM);
}
@@ -210,7 +210,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _DV:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
- play_notes(&tone_dv, 8, false);
+ play_notes(&tone_dv, 8, false, 0);
#endif
default_layer_set(1UL<<_DV);
}
@@ -254,7 +254,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
audio_on();
- play_notes(&start_up, 5, false);
+ play_notes(&start_up, 5, false, 0);
#endif
}
break;
@@ -265,6 +265,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
void matrix_init_user(void) {
#ifdef AUDIO_ENABLE
init_notes();
- play_notes(&start_up, 5, false);
+ play_notes(&start_up, 5, false, 0);
#endif
}