summaryrefslogtreecommitdiff
path: root/keyboard
diff options
context:
space:
mode:
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/planck/keymaps/default/keymap.c10
-rw-r--r--keyboard/preonic/keymaps/default/keymap.c16
2 files changed, 13 insertions, 13 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
}
diff --git a/keyboard/preonic/keymaps/default/keymap.c b/keyboard/preonic/keymaps/default/keymap.c
index 6b62623180..1223793cfa 100644
--- a/keyboard/preonic/keymaps/default/keymap.c
+++ b/keyboard/preonic/keymaps/default/keymap.c
@@ -242,7 +242,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _QWERTY:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
- play_notes(&tone_qwerty, 4, false);
+ play_notes(&tone_qwerty, 4, false, 0);
#endif
persistant_default_layer_set(1UL<<_QWERTY);
}
@@ -250,7 +250,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _COLEMAK:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
- play_notes(&tone_colemak, 6, false);
+ play_notes(&tone_colemak, 6, false, 1);
#endif
persistant_default_layer_set(1UL<<_COLEMAK);
}
@@ -258,7 +258,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _DVORAK:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
- play_notes(&tone_dvorak, 8, false);
+ play_notes(&tone_dvorak, 8, false, 10);
#endif
persistant_default_layer_set(1UL<<_DVORAK);
}
@@ -302,7 +302,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, 4, false);
+ play_notes(&start_up, 4, false, 0);
#endif
}
break;
@@ -317,7 +317,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case 9:
if (record->event.pressed) {
#ifdef AUDIO_ENABLE
- play_notes(&tone_music, 8, false);
+ play_notes(&tone_music, 8, false, 0);
layer_on(_MUSIC);
#endif
}
@@ -333,9 +333,9 @@ void process_action_user(keyrecord_t *record) {
if (IS_LAYER_ON(_MUSIC)) {
if (record->event.pressed) {
- play_note(((double)261.626)*pow(2.0, -3.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF);
+ play_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)), 0xF);
} else {
- stop_note(((double)261.626)*pow(2.0, -3.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
+ stop_note(((double)220.0)*pow(2.0, -4.0)*pow(2.0,(starting_note + SCALE[record->event.key.col + offset])/12.0+(MATRIX_ROWS - record->event.key.row)));
}
}
@@ -344,6 +344,6 @@ void process_action_user(keyrecord_t *record) {
void matrix_init_user(void) {
#ifdef AUDIO_ENABLE
init_notes();
- play_notes(&start_up, 4, false);
+ play_notes(&start_up, 4, false, 0);
#endif
}