Remove PLAY_NOTE_ARRAY usages to get rid of warning.

hid_api
Joe Wasson 7 years ago committed by Jack Humbert
parent f94963e6b7
commit fe60cbd928

@ -179,7 +179,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -188,7 +188,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -197,7 +197,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }

@ -471,7 +471,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
else else
{ {
audio_on(); audio_on();
PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO); PLAY_SONG(tone_audio_on);
} }
} }
break; break;
@ -486,7 +486,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
} }
else else
{ {
PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO); PLAY_SONG(tone_music_on);
layer_on(LAYER_MUSIC); layer_on(LAYER_MUSIC);
} }
} }
@ -496,7 +496,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
{ {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
voice_iterate(); voice_iterate();
PLAY_NOTE_ARRAY(music_scale, false, STACCATO); PLAY_SONG(music_scale);
#endif #endif
} }
break; break;
@ -506,7 +506,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
{ {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
voice_deiterate(); voice_deiterate();
PLAY_NOTE_ARRAY(music_scale, false, STACCATO); PLAY_SONG(music_scale);
#endif #endif
} }
break; break;
@ -550,32 +550,32 @@ void led_set_user(uint8_t usb_led)
if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK))) if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
{ {
// If CAPS LK LED is turning on... // If CAPS LK LED is turning on...
PLAY_NOTE_ARRAY(tone_caps_on, false, LEGATO); PLAY_SONG(tone_caps_on);
} }
else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK))) else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
{ {
// If CAPS LK LED is turning off... // If CAPS LK LED is turning off...
PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO); PLAY_SONG(tone_caps_off);
} }
else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK))) else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
{ {
// If NUM LK LED is turning on... // If NUM LK LED is turning on...
PLAY_NOTE_ARRAY(tone_numlk_on, false, LEGATO); PLAY_SONG(tone_numlk_on);
} }
else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK))) else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
{ {
// If NUM LED is turning off... // If NUM LED is turning off...
PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO); PLAY_SONG(tone_numlk_off);
} }
else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK))) else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
{ {
// If SCROLL LK LED is turning on... // If SCROLL LK LED is turning on...
PLAY_NOTE_ARRAY(tone_scroll_on, false, LEGATO); PLAY_SONG(tone_scroll_on);
} }
else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK))) else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
{ {
// If SCROLL LED is turning off... // If SCROLL LED is turning off...
PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO); PLAY_SONG(tone_scroll_off);
} }
} }
@ -586,29 +586,29 @@ void led_set_user(uint8_t usb_led)
void startup_user() void startup_user()
{ {
_delay_ms(10); // gets rid of tick _delay_ms(10); // gets rid of tick
PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO); PLAY_SONG(tone_my_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO); PLAY_SONG(tone_my_goodbye);
_delay_ms(2000); _delay_ms(2000);
stop_all_notes(); stop_all_notes();
} }
void audio_on_user(void) void audio_on_user(void)
{ {
PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO); PLAY_SONG(tone_audio_on);
} }
void music_on_user(void) void music_on_user(void)
{ {
PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO); PLAY_SONG(tone_music_on);
} }
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, STACCATO); PLAY_SONG(music_scale);
} }
#endif /* AUDIO_ENABLE */ #endif /* AUDIO_ENABLE */

@ -36,13 +36,13 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
if (record->event.pressed) { if (record->event.pressed) {
switch (id) { switch (id) {
case 0: case 0:
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
break; break;
case 1: case 1:
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
break; break;
case 2: case 2:
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
break; break;
} }
} }

@ -153,7 +153,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistant_default_layer_set(1UL<<_QWERTY); persistant_default_layer_set(1UL<<_QWERTY);
} }
@ -194,12 +194,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -211,7 +211,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -79,7 +79,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | ` | Ctrl | Alt | GUI |Lower |Space | 0 | . | = |Space |Raise | Left | Down | Up |Right | * | ` | Ctrl | Alt | GUI |Lower |Space | 0 | . | = |Space |Raise | Left | Down | Up |Right |
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_QWERTY] = KEYMAP( [_QWERTY] = KEYMAP(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL,\ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL,\
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_P7, KC_P8, KC_P9, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_P7, KC_P8, KC_P9, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_P4, KC_P5, KC_P6, KC_H, KC_J, KC_K, KC_L,LT_MC(KC_SCLN), KC_QUOT, \ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_P4, KC_P5, KC_P6, KC_H, KC_J, KC_K, KC_L,LT_MC(KC_SCLN), KC_QUOT, \
@ -100,7 +100,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | ` | Ctrl | Alt | GUI |Lower |Space | 0 | . | = |Space |Raise | Left | Down | Up |Right | * | ` | Ctrl | Alt | GUI |Lower |Space | 0 | . | = |Space |Raise | Left | Down | Up |Right |
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_COLEMAK] = KEYMAP( [_COLEMAK] = KEYMAP(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL,\ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL,\
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_P7, KC_P8, KC_P9, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_P7, KC_P8, KC_P9, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \
KC_LCTRL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_P4, KC_P5, KC_P6, KC_H, KC_N, KC_E, KC_I, LT_MC(KC_O), KC_QUOT, \ KC_LCTRL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_P4, KC_P5, KC_P6, KC_H, KC_N, KC_E, KC_I, LT_MC(KC_O), KC_QUOT, \
@ -121,14 +121,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | ` | Ctrl | Alt | GUI |Lower |Space | 0 | . | = |Space |Raise | Left | Down | Up |Right | * | ` | Ctrl | Alt | GUI |Lower |Space | 0 | . | = |Space |Raise | Left | Down | Up |Right |
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_DVORAK] = KEYMAP( [_DVORAK] = KEYMAP(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL,\ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL,\
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_P7, KC_P8, KC_P9, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_P7, KC_P8, KC_P9, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \
KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_P4, KC_P5, KC_P6, KC_D, KC_H, KC_T, KC_N, LT_MC(KC_S), KC_SLSH, \ KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_P4, KC_P5, KC_P6, KC_D, KC_H, KC_T, KC_N, LT_MC(KC_S), KC_SLSH, \
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_P1, KC_P2, KC_P3, KC_B, KC_M, KC_W, KC_V, KC_Z, CTL_ENT, \ KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_P1, KC_P2, KC_P3, KC_B, KC_M, KC_W, KC_V, KC_Z, CTL_ENT, \
KC_GRV, KC_LCTRL, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_P0, KC_DOT, KC_EQL, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ KC_GRV, KC_LCTRL, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_P0, KC_DOT, KC_EQL, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
), ),
/* Lower /* Lower
* ,------+------+------+------+------+------------------------------------------------. * ,------+------+------+------+------+------------------------------------------------.
* | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
@ -142,14 +142,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | Next | Vol- | Vol+ | Play | * | | | | | | | | | | | | Next | Vol- | Vol+ | Play |
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_LOWER] = KEYMAP( [_LOWER] = KEYMAP(
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, \ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, \
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, KC_F6, KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_PIPE, \ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, KC_F6, KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_PIPE, \
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, _______, KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______, _______, \ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, _______, KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
), ),
/* Raise /* Raise
* ,------+------+------+------+------+------------------------------------------------. * ,------+------+------+------+------+------------------------------------------------.
* | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - |
@ -163,14 +163,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | Next | Vol- | Vol+ | Play | * | | | | | | | | | | | | Next | Vol- | Vol+ | Play |
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_RAISE] = KEYMAP( [_RAISE] = KEYMAP(
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, _______, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, _______, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \
_______, _______, _______, _______, _______, KC_SPC, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ _______, _______, _______, _______, _______, KC_SPC, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
), ),
/* Mouse Layer (semi-col) /* Mouse Layer (semi-col)
* ,------+------+------+------+------+------------------------------------------------. * ,------+------+------+------+------+------------------------------------------------.
* | ACCL0| ACCL1| ACCL2| | | | | | | | | | * | ACCL0| ACCL1| ACCL2| | | | | | | | | |
@ -184,15 +184,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | BTN1 | | | | BTN1 | | | | | | * | | | | | | BTN1 | | | | BTN1 | | | | | |
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_MOUSECURSOR] = KEYMAP( [_MOUSECURSOR] = KEYMAP(
KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_WH_L, KC_MS_U, KC_WH_R,DEMOMACRO,_______, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_WH_L, KC_MS_U, KC_WH_R,DEMOMACRO,_______, \
_______, _______, _______, _______, _______, _______, _______, _______, KC_END , KC_PGDN, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_END , KC_PGDN, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5, _______, _______, \
_______, _______, _______, _______, _______, KC_BTN1, _______, _______, _______, KC_BTN1, _______, _______, _______, _______, _______ \ _______, _______, _______, _______, _______, KC_BTN1, _______, _______, _______, KC_BTN1, _______, _______, _______, _______, _______ \
), ),
/* Adjust (Lower + Raise) /* Adjust (Lower + Raise)
* ,------+------+------+------+------+------------------------------------------------. * ,------+------+------+------+------+------------------------------------------------.
* | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - |
@ -206,14 +206,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | |
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_ADJUST] = KEYMAP( [_ADJUST] = KEYMAP(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \
RESET, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL, \ RESET, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL, \
_______, _______, _______, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, AG_SWAP, QWERTY, COLEMAK, _______, _______, _______, \ _______, _______, _______, AU_ON, AU_OFF, AG_NORM, _______, _______, _______, AG_SWAP, QWERTY, COLEMAK, _______, _______, _______, \
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, BL_DEC, BL_INC, BL_STEP, BL_TOGG, \ _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, BL_DEC, BL_INC, BL_STEP, BL_TOGG, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______\ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______\
) )
}; };
@ -255,7 +255,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistant_default_layer_set(1UL<<_QWERTY); persistant_default_layer_set(1UL<<_QWERTY);
} }
@ -264,7 +264,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistant_default_layer_set(1UL<<_COLEMAK); persistant_default_layer_set(1UL<<_COLEMAK);
} }
@ -366,12 +366,12 @@ void matrix_scan_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{cc {cc
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -383,7 +383,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif
@ -397,11 +397,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
eeconfig_init(); eeconfig_init();
} }
switch (id) { switch (id) {
case KC_DEMOMACRO: case KC_DEMOMACRO:
if (record->event.pressed){ if (record->event.pressed){
return MACRO (I(1), T(H),T(E),T(L), T(L), T(O), T(SPACE), T(W), T(O), T(R), T(L), T(D), END); return MACRO (I(1), T(H),T(E),T(L), T(L), T(O), T(SPACE), T(W), T(O), T(R), T(L), T(D), END);
} }
} }
return MACRO_NONE; return MACRO_NONE;
@ -483,7 +483,7 @@ void iota_gfx_task_user(void) {
default: default:
matrix_write(&matrix, buf); matrix_write(&matrix, buf);
} }
// Host Keyboard LED Status // Host Keyboard LED Status
char led[40]; char led[40];
snprintf(led, sizeof(led), "\n%s %s %s", snprintf(led, sizeof(led), "\n%s %s %s",

@ -81,14 +81,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | ~ | Ctrl | Alt | GUI |Lower |Space |Space |Raise | RAlt | Ins | Del |NumLay| 0 | . | ENT | * | ~ | Ctrl | Alt | GUI |Lower |Space |Space |Raise | RAlt | Ins | Del |NumLay| 0 | . | ENT |
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_QWERTY] = KEYMAP( [_QWERTY] = KEYMAP(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,\ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,\
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_P7, KC_P8, KC_P9, \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_P7, KC_P8, KC_P9, \
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT_MC(KC_SCLN), CTL_ENT, KC_P4, KC_P5, KC_P6, \ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT_MC(KC_SCLN), CTL_ENT, KC_P4, KC_P5, KC_P6, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_EQL, KC_P1, KC_P2, KC_P3, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_EQL, KC_P1, KC_P2, KC_P3, \
KC_GRV, KC_RCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_RALT, KC_INS, KC_DEL, TG_NUMLAY, KC_P0, KC_PDOT, KC_PENT \ KC_GRV, KC_RCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_RALT, KC_INS, KC_DEL, TG_NUMLAY, KC_P0, KC_PDOT, KC_PENT \
), ),
/* Lower /* Lower
* ,-----------------------------------------------------------------------------------. * ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | | * | | | | | | | | | | | | |
@ -102,14 +102,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | Next | Vol- | Vol+ | Play | | | | * | | | | | | | | | Next | Vol- | Vol+ | Play | | | |
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_LOWER] = KEYMAP( [_LOWER] = KEYMAP(
KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, KC_BSLS, _______, _______, _______, \ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_GRV, KC_BSLS, _______, _______, _______, \
KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_EQL, KC_LBRC, KC_RBRC, KC_PIPE, _______, _______, _______, \ KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_EQL, KC_LBRC, KC_RBRC, KC_PIPE, _______, _______, _______, \
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_LCBR, KC_RCBR, _______, _______, _______, _______, \ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_LCBR, KC_RCBR, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______\ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______\
), ),
/* Raise /* Raise
* ,-----------------------------------------------------------------------------------. * ,-----------------------------------------------------------------------------------.
* | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | * | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |
@ -123,14 +123,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | |Space | 0 | | Left | Down | Right| | | | | * | | | | | |Space | 0 | | Left | Down | Right| | | | |
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_RAISE] = KEYMAP( [_RAISE] = KEYMAP(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PLUS, KC_BSLS, _______, _______, _______, \ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PLUS, KC_BSLS, _______, _______, _______, \
_______, KC_A, KC_UP, KC_D, KC_PSCR, _______, KC_4, KC_5, KC_6, KC_PAST, KC_COLN, KC_QUOT, _______, _______, _______, \ _______, KC_A, KC_UP, KC_D, KC_PSCR, _______, KC_4, KC_5, KC_6, KC_PAST, KC_COLN, KC_QUOT, _______, _______, _______, \
_______, KC_LEFT, KC_DOWN, KC_RIGHT, KC__MUTE, _______, KC_1, KC_2, KC_3, KC_UP, KC_SLSH, _______, _______, _______, _______, \ _______, KC_LEFT, KC_DOWN, KC_RIGHT, KC__MUTE, _______, KC_1, KC_2, KC_3, KC_UP, KC_SLSH, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, KC_SPC, KC_0, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______ \ _______, _______, _______, _______, _______, KC_SPC, KC_0, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______ \
), ),
/* FN layer on Esc key /* FN layer on Esc key
* ,-----------------------------------------------------------------------------------. * ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | | * | | | | | | | | | | | | |
@ -144,14 +144,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | Next | Vol- | Vol+ | Play | | | | * | | | | | | | | | Next | Vol- | Vol+ | Play | | | |
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_FNLAYER] = KEYMAP( [_FNLAYER] = KEYMAP(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
_______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS, _______, _______, _______, \ _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS, _______, _______, _______, \
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_EQL, KC_LBRC, KC_RBRC, KC_QUOT, _______, _______, _______, \ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_EQL, KC_LBRC, KC_RBRC, KC_QUOT, _______, _______, _______, \
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS), S(KC_NUBS), KC_LCBR, KC_RCBR, _______, _______, _______, _______, \ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS), S(KC_NUBS), KC_LCBR, KC_RCBR, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______ \ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______ \
), ),
/* Num Layer /* Num Layer
* ,-----------------------------------------------------------------------------------. * ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | | * | | | | | | | | | | | | |
@ -165,14 +165,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | Exit | Left | Down | Rght | * | | | | | | | | | | | | Exit | Left | Down | Rght |
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_NUMLAY] = KEYMAP( [_NUMLAY] = KEYMAP(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_HOME, KC_PGUP, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_HOME, KC_PGUP, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PMNS, KC_UP, KC_PPLS, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PMNS, KC_UP, KC_PPLS, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT \
), ),
/* Mouse Layer (semi-col) /* Mouse Layer (semi-col)
* ,-----------------------------------------------------------------------------------. * ,-----------------------------------------------------------------------------------.
* | |ACCL0| ACCL1| ACCL2 | | | | | | | | | * | |ACCL0| ACCL1| ACCL2 | | | | | | | | |
@ -186,17 +186,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | BTN1 | | | | BTN1 | | | | | | * | | | | | | BTN1 | | | | BTN1 | | | | | |
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_MOUSECURSOR] = KEYMAP( [_MOUSECURSOR] = KEYMAP(
_______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______, _______, _______, _______, _______,\ _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______, _______, _______, _______, _______,\
_______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_WH_L, KC_MS_U, KC_WH_R, DEMOMACRO, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_WH_L, KC_MS_U, KC_WH_R, DEMOMACRO, _______, _______, _______, _______, \
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_END , KC_PGDN, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, \ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_END , KC_PGDN, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, \
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5, _______, _______, _______, _______, _______, \ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, _______, _______, _______ \ _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, _______, _______, _______ \
), ),
/* Adjust (Lower + Raise) /* Adjust (Lower + Raise)
* ,-----------------------------------------------------------------------------------. * ,-----------------------------------------------------------------------------------.
* | Reset| | | | | | | | | VolD | VolU | Mute | * | Reset| | | | | | | | | VolD | VolU | Mute |
* |------+------+------+------+------+------+------+------+------+------+------+------+--------------------. * |------+------+------+------+------+------+------+------+------+------+------+------+--------------------.
@ -209,14 +209,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | |
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_ADJUST] = KEYMAP( [_ADJUST] = KEYMAP(
RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_VOLU, KC_MUTE, \ RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLD, KC_VOLU, KC_MUTE, \
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_DEL, _______, _______, _______, \ _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_DEL, _______, _______, _______, \
_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______, _______, _______, _______, \
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, BL_DEC, BL_INC, BL_STEP, BL_TOGG, _______, _______, _______, \ _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, BL_DEC, BL_INC, BL_STEP, BL_TOGG, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
) )
}; };
@ -257,7 +257,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistant_default_layer_set(1UL<<_QWERTY); persistant_default_layer_set(1UL<<_QWERTY);
} }
@ -332,7 +332,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
rgblight_mode(4); rgblight_mode(4);
layer_on(_NUMLAY); layer_on(_NUMLAY);
} else { } else {
rgblight_mode(RGB_current_mode); rgblight_mode(RGB_current_mode);
layer_off(_NUMLAY); } layer_off(_NUMLAY); }
} }
return false; return false;
@ -376,12 +376,12 @@ void matrix_scan_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{cc {cc
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -393,7 +393,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif
@ -407,11 +407,11 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
eeconfig_init(); eeconfig_init();
} }
switch (id) { switch (id) {
case KC_DEMOMACRO: case KC_DEMOMACRO:
if (record->event.pressed){ if (record->event.pressed){
return MACRO (I(1), T(H),T(E),T(L), T(L), T(O), T(SPACE), T(W), T(O), T(R), T(L), T(D), END); return MACRO (I(1), T(H),T(E),T(L), T(L), T(O), T(SPACE), T(W), T(O), T(R), T(L), T(D), END);
} }
} }
return MACRO_NONE; return MACRO_NONE;
@ -493,7 +493,7 @@ void iota_gfx_task_user(void) {
default: default:
matrix_write(&matrix, buf); matrix_write(&matrix, buf);
} }
// Host Keyboard LED Status // Host Keyboard LED Status
char led[40]; char led[40];
snprintf(led, sizeof(led), "\n%s %s %s", snprintf(led, sizeof(led), "\n%s %s %s",

@ -19,7 +19,7 @@ QWR,
CDH, CDH,
SYM, SYM,
MOV, MOV,
NUM, NUM,
TRAN TRAN
}; };
@ -52,11 +52,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | tab | q | w | e | r | t | y | u | i | o | p | [ | ] | \ | | * | tab | q | w | e | r | t | y | u | i | o | p | [ | ] | \ | |
* -------------------------------------------------------------------------------' * -------------------------------------------------------------------------------'
* |Bak/Mov| a | s | d | f | g | h | j | k | l | ; | ' | enter |PgUp| * |Bak/Mov| a | s | d | f | g | h | j | k | l | ; | ' | enter |PgUp|
* -------------------------------------------------------------------------------- * --------------------------------------------------------------------------------
* |Lsft | z | x | c | v | b | n | m | , | . | / | Rsft| Up| PgDn| * |Lsft | z | x | c | v | b | n | m | , | . | / | Rsft| Up| PgDn|
* --------------------------------------------------------------------------------- * ---------------------------------------------------------------------------------
* |Lctl |Lgui |Lalt | Space/Sym | GUI | Sym | Rctl |Left|Down|Rght| * |Lctl |Lgui |Lalt | Space/Sym | GUI | Sym | Rctl |Left|Down|Rght|
* --------------------------------------------------------------------------------- * ---------------------------------------------------------------------------------
*/ */
[_QWR] = KEYMAP( \ [_QWR] = KEYMAP( \
@ -88,11 +88,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | ESC: | ^ | { | } | @ | % | | [ | ( | ) | _ | [ | ] | \ | | * | ESC: | ^ | { | } | @ | % | | [ | ( | ) | _ | [ | ] | \ | |
* -------------------------------------------------------------------------------' * -------------------------------------------------------------------------------'
* |Bak/Mov| ! | # | 0 | = | { | } | - | 1 | + | ] | ` | enter |PgUp| * |Bak/Mov| ! | # | 0 | = | { | } | - | 1 | + | ] | ` | enter |PgUp|
* -------------------------------------------------------------------------------- * --------------------------------------------------------------------------------
* |Lsft | ; | ~ | : | ~ | "|"| $ | * | | . | / | Rsft| Up| PgDn| * |Lsft | ; | ~ | : | ~ | "|"| $ | * | | . | / | Rsft| Up| PgDn|
* --------------------------------------------------------------------------------- * ---------------------------------------------------------------------------------
* |Lctl |Lgui |Lalt | Space/Sym | GUI | Sym | Rctl |Left|Down|Rght| * |Lctl |Lgui |Lalt | Space/Sym | GUI | Sym | Rctl |Left|Down|Rght|
* --------------------------------------------------------------------------------- * ---------------------------------------------------------------------------------
*/ */
[_SYM] = KEYMAP (\ [_SYM] = KEYMAP (\
@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
____, KC_SCLN, KC_TILDE, KC_COLN, KC_TILDE, KC_PIPE, KC_DLR, KC_ASTR, ____, KC_DOT , KC_SLSH, ____, ____, ____,\ ____, KC_SCLN, KC_TILDE, KC_COLN, KC_TILDE, KC_PIPE, KC_DLR, KC_ASTR, ____, KC_DOT , KC_SLSH, ____, ____, ____,\
____, ____, ____, ____, ____, ____, ____, ____, ____, ____ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____
), ),
/* /*
* |ESC | MAC| Win|RdLn| VI | | | | | | | | | | | | * |ESC | MAC| Win|RdLn| VI | | | | | | | | | | | |
* -------------------------------------------------------------------------------' * -------------------------------------------------------------------------------'
* | | | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Bakspace| Del| * | | | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Bakspace| Del|
@ -111,11 +111,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | tab | | |Find| |pTab |DSOL|DelW| Up |DelW|DEOL| [ | ] | \ | | * | tab | | |Find| |pTab |DSOL|DelW| Up |DelW|DEOL| [ | ] | \ | |
* -------------------------------------------------------------------------------' * -------------------------------------------------------------------------------'
* |Bak/Mov| | | | |nTab |GSOL| <- | Dwn | -> | EOL | ' | enter |PgUp| * |Bak/Mov| | | | |nTab |GSOL| <- | Dwn | -> | EOL | ' | enter |PgUp|
* -------------------------------------------------------------------------------- * --------------------------------------------------------------------------------
* |Lsft |Undo| Cut|Copy|Pste| | | | | | / | Rsft| Up| PgDn| * |Lsft |Undo| Cut|Copy|Pste| | | | | | / | Rsft| Up| PgDn|
* --------------------------------------------------------------------------------- * ---------------------------------------------------------------------------------
* |Lctl |Lgui |Lalt | Space/Sym | GUI | Sym | Rctl |Left|Down|Rght| * |Lctl |Lgui |Lalt | Space/Sym | GUI | Sym | Rctl |Left|Down|Rght|
* --------------------------------------------------------------------------------- * ---------------------------------------------------------------------------------
*/ */
[_MOV] = KEYMAP (\ [_MOV] = KEYMAP (\
@ -134,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
____, ____, ____, ____, ____, ____, ____, ____, ____, ____ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____
) )
}; };
const uint16_t PROGMEM fn_actions[] = { const uint16_t PROGMEM fn_actions[] = {
@ -155,23 +155,23 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWR: case QWR:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
layer_off(_CDH); layer_off(_CDH);
} }
return false; return false;
break; break;
case CDH: case CDH:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
layer_on(_CDH); layer_on(_CDH);
} }
return false; return false;
break; break;
case SYM: case SYM:
if (record->event.pressed) { if (record->event.pressed) {
layer_on(_SYM); layer_on(_SYM);
@ -180,12 +180,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return false; return false;
break; break;
} }
return true; return true;
} }
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
{ {
@ -195,7 +195,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if( id >= BABL_START_NUM && id < (BABL_START_NUM + BABL_NUM_MACROS ) ) { if( id >= BABL_START_NUM && id < (BABL_START_NUM + BABL_NUM_MACROS ) ) {
if (record->event.pressed) { // is there a case where this isn't desired? if (record->event.pressed) { // is there a case where this isn't desired?
babblePaste ( record, id ); babblePaste ( record, id );
return MACRO_NONE; return MACRO_NONE;
} }
@ -215,7 +215,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
/* Colemak mod-dh moves the D key to the qwerty V position /* Colemak mod-dh moves the D key to the qwerty V position
This hack makes apple-V_position do what I mean */ This hack makes apple-V_position do what I mean */
case DHPASTE: case DHPASTE:
if(keyboard_report->mods & MOD_BIT(KC_LGUI) ) { if(keyboard_report->mods & MOD_BIT(KC_LGUI) ) {
if (record->event.pressed) { if (record->event.pressed) {
clear_keyboard_but_mods(); clear_keyboard_but_mods();
@ -228,15 +228,15 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
register_code(KC_D); register_code(KC_D);
} else { } else {
unregister_code(KC_D); unregister_code(KC_D);
} }
} }
break; break;
case VIBRK: // vi esc: case VIBRK: // vi esc:
if (record->event.pressed) { if (record->event.pressed) {
return MACRO( T(ESC),D(LSFT),T(SCLN),U(LSFT), END ); return MACRO( T(ESC),D(LSFT),T(SCLN),U(LSFT), END );
} }
break; break;

@ -157,7 +157,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -166,7 +166,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -175,7 +175,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -227,12 +227,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -244,7 +244,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -196,7 +196,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -205,7 +205,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -214,7 +214,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -266,12 +266,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -283,7 +283,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -206,7 +206,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -215,7 +215,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -224,7 +224,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -296,14 +296,14 @@ void matrix_init_user(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
startup_user(); startup_user();
#endif #endif
RGB_current_mode = rgblight_config.mode; RGB_current_mode = rgblight_config.mode;
} }
//SSD1306 OLED init and update loop, make sure to add #define SSD1306OLED in config.h //SSD1306 OLED init and update loop, make sure to add #define SSD1306OLED in config.h
#ifdef SSD1306OLED #ifdef SSD1306OLED
void matrix_master_OLED_init (void) { void matrix_master_OLED_init (void) {
TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 800000)); TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 800000));
iota_gfx_init(); // turns on the display iota_gfx_init(); // turns on the display
} }
void matrix_scan_user(void) { void matrix_scan_user(void) {
@ -316,12 +316,12 @@ void matrix_scan_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -333,7 +333,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif
@ -352,7 +352,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if (record->event.pressed){ if (record->event.pressed){
return MACRO (I(10), T(H), T(E), T(L), T(L), T(O), T(SPACE), T(W), T(O), T(R), T(L), T(D), END); return MACRO (I(10), T(H), T(E), T(L), T(L), T(O), T(SPACE), T(W), T(O), T(R), T(L), T(D), END);
} }
} }
return MACRO_NONE; return MACRO_NONE;
@ -435,7 +435,7 @@ void iota_gfx_task_user(void) {
default: default:
matrix_write(&matrix, buf); matrix_write(&matrix, buf);
} }
// Host Keyboard LED Status // Host Keyboard LED Status
char led[40]; char led[40];
snprintf(led, sizeof(led), "\n%s %s %s", snprintf(led, sizeof(led), "\n%s %s %s",

@ -157,7 +157,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -166,7 +166,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -175,7 +175,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }

@ -1,4 +1,4 @@
// Can't Remember Sh*t Keymap for Let's Split // Can't Remember Sh*t Keymap for Let's Split
// Trying to fit as many characters as possible on the default layer // Trying to fit as many characters as possible on the default layer
// as its easier for me to remember logical functions than characters // as its easier for me to remember logical functions than characters
// Also, I like me some numpad // Also, I like me some numpad
@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
), ),
/* Lower (switched to # because KP# were weird in terminal emulators) /* Lower (switched to # because KP# were weird in terminal emulators)
* ,-----------------------------------------------------------------------------------. * ,-----------------------------------------------------------------------------------.
* | Del | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | * | Del | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
* |------+------+------+------+------+-------------+------+------+------+------+------| * |------+------+------+------+------+-------------+------+------+------+------+------|
@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, _______, _______, _______, _______, _______, KC_0, _______, _______, _______, KC_PLUS, _______ \ KC_ESC, _______, _______, _______, _______, _______, KC_0, _______, _______, _______, KC_PLUS, _______ \
), ),
/* Raise /* Raise
* ,-----------------------------------------------------------------------------------. * ,-----------------------------------------------------------------------------------.
* | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del |
* |------+------+------+------+------+-------------+------+------+------+------+------| * |------+------+------+------+------+-------------+------+------+------+------+------|
@ -164,7 +164,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistant_default_layer_set(1UL<<_QWERTY); persistant_default_layer_set(1UL<<_QWERTY);
} }
@ -173,14 +173,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case GAME: case GAME:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
#endif #endif
persistant_default_layer_set(1UL<<_GAME); persistant_default_layer_set(1UL<<_GAME);
} }
return false; return false;
break; break;
case LOWER: case LOWER:
if (record->event.pressed) { if (record->event.pressed) {
layer_on(_LOWER); layer_on(_LOWER);
@ -227,12 +227,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -244,7 +244,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -157,7 +157,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -166,7 +166,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -175,7 +175,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }

@ -157,7 +157,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -166,7 +166,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -175,7 +175,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }

@ -164,7 +164,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -173,7 +173,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -182,7 +182,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }

@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
,CPYP, , ,DOWN,LCBR, RCBR, P1 , P2 , P3 ,MINS, , ,CPYP, , ,DOWN,LCBR, RCBR, P1 , P2 , P3 ,MINS, ,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
, , , , , , DEL , , P0 ,PDOT, , , , , , , , DEL , , P0 ,PDOT, ,
//`----+----+----+----+----+----' `----+----+----+----+----+----' //`----+----+----+----+----+----' `----+----+----+----+----+----'
), ),
@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
MUTE,MSTP,MPLY,VOLD,PGDN,MINS, PLUS,END , , , , , MUTE,MSTP,MPLY,VOLD,PGDN,MINS, PLUS,END , , , , ,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
, , , , , , , , , , , , , , , , , , , , , ,
//`----+----+----+----+----+----' `----+----+----+----+----+----' //`----+----+----+----+----+----' `----+----+----+----+----+----'
), ),
@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
, , , , , , , , , , , , , , , , , , , , , , , ,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
, , , , , , , , , , , , , , , , , , , , , ,
//`----+----+----+----+----+----' `----+----+----+----+----+----' //`----+----+----+----+----+----' `----+----+----+----+----+----'
), ),
@ -148,7 +148,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -157,7 +157,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -166,7 +166,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }

@ -178,7 +178,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -187,7 +187,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -196,7 +196,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }

@ -162,7 +162,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -171,7 +171,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -180,7 +180,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }

@ -9,7 +9,7 @@ void matrix_init_kb(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
#endif #endif
// // green led on // // green led on
@ -25,7 +25,7 @@ void matrix_init_kb(void) {
void shutdown_user(void) { void shutdown_user(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
#endif #endif

@ -16,7 +16,7 @@ void matrix_init_kb(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
#endif #endif
// // green led on // // green led on
@ -32,7 +32,7 @@ void matrix_init_kb(void) {
void shutdown_user(void) { void shutdown_user(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
#endif #endif

@ -129,7 +129,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistant_default_layer_set(1UL<<_QWERTY); persistant_default_layer_set(1UL<<_QWERTY);
} }

@ -175,7 +175,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -184,7 +184,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -193,7 +193,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }

@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
,CPYP, , ,DOWN,LCBR, RCBR, P1 , P2 , P3 ,MINS, , ,CPYP, , ,DOWN,LCBR, RCBR, P1 , P2 , P3 ,MINS, ,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
, , , , , , DEL , , P0 ,PDOT, , , , , , , , DEL , , P0 ,PDOT, ,
//`----+----+----+----+----+----' `----+----+----+----+----+----' //`----+----+----+----+----+----' `----+----+----+----+----+----'
), ),
@ -105,7 +105,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
MUTE,MSTP,MPLY,VOLD,PGDN,MINS, PLUS,END , , , , , MUTE,MSTP,MPLY,VOLD,PGDN,MINS, PLUS,END , , , , ,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
, , , , , , , , , , , , , , , , , , , , , ,
//`----+----+----+----+----+----' `----+----+----+----+----+----' //`----+----+----+----+----+----' `----+----+----+----+----+----'
), ),
@ -119,7 +119,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
, , , , , , , , , , , , , , , , , , , , , , , ,
//|----+----+----+----+----+----| |----+----+----+----+----+----| //|----+----+----+----+----+----| |----+----+----+----+----+----|
, , , , , , , , , , , , , , , , , , , , , ,
//`----+----+----+----+----+----' `----+----+----+----+----+----' //`----+----+----+----+----+----' `----+----+----+----+----+----'
), ),
@ -161,7 +161,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -170,7 +170,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -179,7 +179,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }

@ -16,7 +16,7 @@ void matrix_init_kb(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
#endif #endif
// // green led on // // green led on
@ -32,7 +32,7 @@ void matrix_init_kb(void) {
void shutdown_user(void) { void shutdown_user(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
#endif #endif

@ -96,7 +96,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -105,7 +105,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -114,7 +114,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }

@ -30,7 +30,7 @@ void matrix_init_kb(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
#endif #endif
// // green led on // // green led on
@ -46,7 +46,7 @@ void matrix_init_kb(void) {
void shutdown_user(void) { void shutdown_user(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
#endif #endif

@ -250,7 +250,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistant_default_layer_set(1UL<<_QWERTY); persistant_default_layer_set(1UL<<_QWERTY);
} }
@ -274,7 +274,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistant_default_layer_set(1UL<<_COLEMAK); persistant_default_layer_set(1UL<<_COLEMAK);
} }
@ -283,7 +283,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistant_default_layer_set(1UL<<_DVORAK); persistant_default_layer_set(1UL<<_DVORAK);
} }
@ -324,7 +324,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
stop_all_notes(); stop_all_notes();
PLAY_NOTE_ARRAY(tone_plover, false, 0); PLAY_SONG(tone_plover);
#endif #endif
layer_off(_RAISE); layer_off(_RAISE);
layer_off(_LOWER); layer_off(_LOWER);
@ -342,7 +342,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EXT_PLV: case EXT_PLV:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_plover_gb, false, 0); PLAY_SONG(tone_plover_gb);
#endif #endif
layer_off(_PLOVER); layer_off(_PLOVER);
} }
@ -363,12 +363,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -380,7 +380,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
{_______, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, _______, _______}, {_______, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, _______, _______},
{_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______} {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
}, },
/* LOCK /* LOCK
* ,-----------------------------------------------------------------------------------. * ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | | * | | | | | | | | | | | | |
@ -164,7 +164,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
{XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QWERTY, DVORAK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}, {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QWERTY, DVORAK, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
{RESET, XXXXXXX, LOCK, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX} {RESET, XXXXXXX, LOCK, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX}
} }
}; };
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
@ -182,7 +182,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { if (record->event.pressed) {
if (IS_LAYER_ON(_DVORAK)) { if (IS_LAYER_ON(_DVORAK)) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
layer_off(_DVORAK); layer_off(_DVORAK);
} }
@ -193,7 +193,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { if (record->event.pressed) {
if (!IS_LAYER_ON(_DVORAK)) { if (!IS_LAYER_ON(_DVORAK)) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
layer_on(_DVORAK); layer_on(_DVORAK);
} }
@ -235,12 +235,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -252,7 +252,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
}, },
/* Lower (switched to # because KP# were weird in terminal emulators) /* Lower (switched to # because KP# were weird in terminal emulators)
* ,-----------------------------------------------------------------------------------. * ,-----------------------------------------------------------------------------------.
* | Del | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | * | Del | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
* |------+------+------+------+------+-------------+------+------+------+------+------| * |------+------+------+------+------+-------------+------+------+------+------+------|
@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
{KC_ESC, _______, _______, _______, _______, KC_0, KC_0, _______, _______, _______, KC_PLUS, _______} {KC_ESC, _______, _______, _______, _______, KC_0, KC_0, _______, _______, _______, KC_PLUS, _______}
}, },
/* Raise /* Raise
* ,-----------------------------------------------------------------------------------. * ,-----------------------------------------------------------------------------------.
* | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del |
* |------+------+------+------+------+-------------+------+------+------+------+------| * |------+------+------+------+------+-------------+------+------+------+------+------|
@ -164,7 +164,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistant_default_layer_set(1UL<<_QWERTY); persistant_default_layer_set(1UL<<_QWERTY);
} }
@ -173,14 +173,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case GAME: case GAME:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
#endif #endif
persistant_default_layer_set(1UL<<_GAME); persistant_default_layer_set(1UL<<_GAME);
} }
return false; return false;
break; break;
case LOWER: case LOWER:
if (record->event.pressed) { if (record->event.pressed) {
layer_on(_LOWER); layer_on(_LOWER);
@ -227,12 +227,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -244,7 +244,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -159,7 +159,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -211,12 +211,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -228,7 +228,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -216,7 +216,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -225,7 +225,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -234,7 +234,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -283,7 +283,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (!record->event.pressed) { if (!record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
stop_all_notes(); stop_all_notes();
PLAY_NOTE_ARRAY(tone_plover, false, 0); PLAY_SONG(tone_plover);
#endif #endif
layer_on(_PLOVER); layer_on(_PLOVER);
} }
@ -292,7 +292,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EXT_PLV: case EXT_PLV:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_plover_gb, false, 0); PLAY_SONG(tone_plover_gb);
#endif #endif
layer_off(_PLOVER); layer_off(_PLOVER);
} }
@ -364,12 +364,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -381,7 +381,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -196,7 +196,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistant_default_layer_set(1UL<<_QWERTY); persistant_default_layer_set(1UL<<_QWERTY);
} }
@ -205,7 +205,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistant_default_layer_set(1UL<<_COLEMAK); persistant_default_layer_set(1UL<<_COLEMAK);
} }
@ -214,7 +214,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
/*case DVORAK:*/ /*case DVORAK:*/
/*if (record->event.pressed) {*/ /*if (record->event.pressed) {*/
/*#ifdef AUDIO_ENABLE*/ /*#ifdef AUDIO_ENABLE*/
/*PLAY_NOTE_ARRAY(tone_dvorak, false, 0);*/ /*PLAY_SONG(tone_dvorak);*/
/*#endif*/ /*#endif*/
/*persistant_default_layer_set(1UL<<_DVORAK);*/ /*persistant_default_layer_set(1UL<<_DVORAK);*/
/*}*/ /*}*/
@ -255,7 +255,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
/*if (record->event.pressed) {*/ /*if (record->event.pressed) {*/
/*#ifdef AUDIO_ENABLE*/ /*#ifdef AUDIO_ENABLE*/
/*stop_all_notes();*/ /*stop_all_notes();*/
/*PLAY_NOTE_ARRAY(tone_plover, false, 0);*/ /*PLAY_SONG(tone_plover);*/
/*#endif*/ /*#endif*/
/*layer_off(_RAISE);*/ /*layer_off(_RAISE);*/
/*layer_off(_LOWER);*/ /*layer_off(_LOWER);*/
@ -273,7 +273,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
/*case EXT_PLV:*/ /*case EXT_PLV:*/
/*if (record->event.pressed) {*/ /*if (record->event.pressed) {*/
/*#ifdef AUDIO_ENABLE*/ /*#ifdef AUDIO_ENABLE*/
/*PLAY_NOTE_ARRAY(tone_plover_gb, false, 0);*/ /*PLAY_SONG(tone_plover_gb);*/
/*#endif*/ /*#endif*/
/*layer_off(_PLOVER);*/ /*layer_off(_PLOVER);*/
/*}*/ /*}*/
@ -294,12 +294,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -311,7 +311,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -174,7 +174,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case WORKMAN: case WORKMAN:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_workman, false, 0); PLAY_SONG(tone_workman);
#endif #endif
persistent_default_layer_set(1UL<<_WORKMAN); persistent_default_layer_set(1UL<<_WORKMAN);
} }
@ -183,7 +183,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -192,7 +192,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case PLOVER: case PLOVER:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_plover, false, 0); PLAY_SONG(tone_plover);
#endif #endif
if (!eeconfig_is_enabled()) { if (!eeconfig_is_enabled()) {
eeconfig_init(); eeconfig_init();
@ -219,12 +219,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -236,7 +236,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -280,7 +280,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
default_layer_set(1UL<<_QWERTY); default_layer_set(1UL<<_QWERTY);
} }
@ -289,7 +289,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
default_layer_set(1UL<<_COLEMAK); default_layer_set(1UL<<_COLEMAK);
} }
@ -298,7 +298,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
default_layer_set(1UL<<_DVORAK); default_layer_set(1UL<<_DVORAK);
} }
@ -339,7 +339,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
stop_all_notes(); stop_all_notes();
PLAY_NOTE_ARRAY(tone_plover, false, 0); PLAY_SONG(tone_plover);
#endif #endif
layer_off(_RAISE); layer_off(_RAISE);
layer_off(_LOWER); layer_off(_LOWER);
@ -357,7 +357,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EXT_PLV: case EXT_PLV:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_plover_gb, false, 0); PLAY_SONG(tone_plover_gb);
#endif #endif
layer_off(_PLOVER); layer_off(_PLOVER);
} }
@ -436,12 +436,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -453,7 +453,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -193,7 +193,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case WORKMAN: case WORKMAN:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_workman, false, 0); PLAY_SONG(tone_workman);
#endif #endif
persistent_default_layer_set(1UL<<_WORKMAN); persistent_default_layer_set(1UL<<_WORKMAN);
} }
@ -210,7 +210,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -240,7 +240,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
stop_all_notes(); stop_all_notes();
PLAY_NOTE_ARRAY(tone_plover, false, 0); PLAY_SONG(tone_plover);
#endif #endif
layer_off(_RAISE); layer_off(_RAISE);
layer_off(_LOWER); layer_off(_LOWER);
@ -258,7 +258,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EXT_PLV: case EXT_PLV:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_plover_gb, false, 0); PLAY_SONG(tone_plover_gb);
#endif #endif
layer_off(_PLOVER); layer_off(_PLOVER);
} }
@ -291,12 +291,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -308,7 +308,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -249,7 +249,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -258,7 +258,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -267,7 +267,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -308,7 +308,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
stop_all_notes(); stop_all_notes();
PLAY_NOTE_ARRAY(tone_plover, false, 0); PLAY_SONG(tone_plover);
#endif #endif
layer_off(_RAISE); layer_off(_RAISE);
layer_off(_LOWER); layer_off(_LOWER);
@ -326,7 +326,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EXT_PLV: case EXT_PLV:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_plover_gb, false, 0); PLAY_SONG(tone_plover_gb);
#endif #endif
layer_off(_PLOVER); layer_off(_PLOVER);
} }
@ -347,12 +347,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -364,7 +364,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -239,12 +239,12 @@ void matrix_init_user(void)
void startup_user() void startup_user()
{ {
_delay_ms(100); // gets rid of tick _delay_ms(100); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -256,7 +256,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -131,7 +131,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case NERD: case NERD:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_nerd, false, 0); PLAY_SONG(tone_nerd);
#endif #endif
persistent_default_layer_set(1UL<<_NERD); persistent_default_layer_set(1UL<<_NERD);
} }
@ -172,12 +172,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -189,7 +189,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -154,7 +154,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _QWERTY: case _QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -162,7 +162,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _COLEMAK: case _COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -170,7 +170,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _DVORAK: case _DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -211,7 +211,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
unregister_code(KC_RCTL); unregister_code(KC_RCTL);
unregister_code(KC_RALT); unregister_code(KC_RALT);
unregister_code(KC_RGUI); unregister_code(KC_RGUI);
} }
break; break;
case _OS: case _OS:
if (record->event.pressed) { if (record->event.pressed) {
@ -229,7 +229,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
layer_off(currentOs); layer_off(currentOs);
currentOs = id; currentOs = id;
} }
break; break;
} }
return MACRO_NONE; return MACRO_NONE;
}; };
@ -237,14 +237,14 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
void matrix_init_user(void) { void matrix_init_user(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
_delay_ms(20); // stops the tick _delay_ms(20); // stops the tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
#endif #endif
} }
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
void play_goodbye_tone() void play_goodbye_tone()
{ {
PLAY_NOTE_ARRAY(goodbye, false, 0); PLAY_SONG(goodbye);
_delay_ms(150); _delay_ms(150);
} }

@ -110,7 +110,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -119,7 +119,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -128,7 +128,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -169,7 +169,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
stop_all_notes(); stop_all_notes();
PLAY_NOTE_ARRAY(tone_plover, false, 0); PLAY_SONG(tone_plover);
#endif #endif
layer_off(_RAISE); layer_off(_RAISE);
layer_off(_LOWER); layer_off(_LOWER);
@ -187,7 +187,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EXT_PLV: case EXT_PLV:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_plover_gb, false, 0); PLAY_SONG(tone_plover_gb);
#endif #endif
layer_off(_PLOVER); layer_off(_PLOVER);
} }
@ -208,12 +208,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -225,7 +225,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -527,32 +527,32 @@ void led_set_user(uint8_t usb_led)
if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK))) if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
{ {
// If CAPS LK LED is turning on... // If CAPS LK LED is turning on...
PLAY_NOTE_ARRAY(tone_caps_on, false, LEGATO); PLAY_SONG(tone_caps_on);
} }
else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK))) else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
{ {
// If CAPS LK LED is turning off... // If CAPS LK LED is turning off...
PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO); PLAY_SONG(tone_caps_off);
} }
else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK))) else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
{ {
// If NUM LK LED is turning on... // If NUM LK LED is turning on...
PLAY_NOTE_ARRAY(tone_numlk_on, false, LEGATO); PLAY_SONG(tone_numlk_on);
} }
else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK))) else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
{ {
// If NUM LED is turning off... // If NUM LED is turning off...
PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO); PLAY_SONG(tone_numlk_off);
} }
else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK))) else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
{ {
// If SCROLL LK LED is turning on... // If SCROLL LK LED is turning on...
PLAY_NOTE_ARRAY(tone_scroll_on, false, LEGATO); PLAY_SONG(tone_scroll_on);
} }
else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK))) else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
{ {
// If SCROLL LED is turning off... // If SCROLL LED is turning off...
PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO); PLAY_SONG(tone_scroll_off);
} }
old_usb_led = usb_led; old_usb_led = usb_led;
} }
@ -561,29 +561,29 @@ void led_set_user(uint8_t usb_led)
void startup_user() void startup_user()
{ {
_delay_ms(10); // gets rid of tick _delay_ms(10); // gets rid of tick
PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO); PLAY_SONG(tone_my_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO); PLAY_SONG(tone_my_goodbye);
_delay_ms(2000); _delay_ms(2000);
stop_all_notes(); stop_all_notes();
} }
void audio_on_user(void) void audio_on_user(void)
{ {
PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO); PLAY_SONG(tone_audio_on);
} }
void music_on_user(void) void music_on_user(void)
{ {
PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO); PLAY_SONG(tone_music_on);
} }
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, STACCATO); PLAY_SONG(music_scale);
} }
#endif /* AUDIO_ENABLE */ #endif /* AUDIO_ENABLE */

@ -149,7 +149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -158,7 +158,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -210,12 +210,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -227,7 +227,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -172,7 +172,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -181,7 +181,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -190,7 +190,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -242,12 +242,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -259,7 +259,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -193,7 +193,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -202,7 +202,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -211,7 +211,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -252,7 +252,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
stop_all_notes(); stop_all_notes();
PLAY_NOTE_ARRAY(tone_plover, false, 0); PLAY_SONG(tone_plover);
#endif #endif
layer_off(_RAISE); layer_off(_RAISE);
layer_off(_LOWER); layer_off(_LOWER);
@ -270,7 +270,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EXT_PLV: case EXT_PLV:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_plover_gb, false, 0); PLAY_SONG(tone_plover_gb);
#endif #endif
layer_off(_PLOVER); layer_off(_PLOVER);
} }
@ -291,12 +291,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -308,7 +308,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -220,7 +220,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _QWERTY: case _QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -228,7 +228,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _COLEMAK: case _COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -236,7 +236,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _DVORAK: case _DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -273,7 +273,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
stop_all_notes(); stop_all_notes();
PLAY_NOTE_ARRAY(tone_plover, false, 0); PLAY_SONG(tone_plover);
#endif #endif
layer_off(_RAISE); layer_off(_RAISE);
layer_off(_LOWER); layer_off(_LOWER);
@ -290,7 +290,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case 13: case 13:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_plover_gb, false, 0); PLAY_SONG(tone_plover_gb);
#endif #endif
layer_off(_PLOVER); layer_off(_PLOVER);
} }
@ -315,12 +315,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -332,7 +332,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -169,7 +169,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -178,7 +178,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -187,7 +187,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -239,12 +239,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -256,7 +256,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -110,7 +110,7 @@ void dance_lower_lift(qk_tap_dance_state_t *state, void *user_data){ // Called o
update_tri_layer(_LOWER, _RAISE, _ADJUST); update_tri_layer(_LOWER, _RAISE, _ADJUST);
layer_on(_UNICODES); layer_on(_UNICODES);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_ctrl_mod, false, 0); PLAY_SONG(tone_ctrl_mod);
#endif #endif
break; break;
} }
@ -202,7 +202,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if(record->event.pressed){ if(record->event.pressed){
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
} }
return false; return false;
@ -211,7 +211,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if(record->event.pressed){ if(record->event.pressed){
persistent_default_layer_set(1UL<<_SWCOLE); persistent_default_layer_set(1UL<<_SWCOLE);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_swcole, false, 0); PLAY_SONG(tone_swcole);
#endif #endif
} }
return false; return false;
@ -236,7 +236,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return false; return false;
break; break;
case SHFT_CAP: case SHFT_CAP:
if(record->event.pressed){ if(record->event.pressed){
key_timer = timer_read(); // if the key is being pressed, we start the timer. key_timer = timer_read(); // if the key is being pressed, we start the timer.
register_code(KC_LSHIFT); register_code(KC_LSHIFT);
@ -246,12 +246,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if(caps_status == 0){ if(caps_status == 0){
caps_status = 1; caps_status = 1;
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_capslock_on, false, 0); PLAY_SONG(tone_capslock_on);
#endif #endif
} else { } else {
caps_status = 0; caps_status = 0;
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_capslock_off, false, 0); PLAY_SONG(tone_capslock_off);
#endif #endif
} }
} }
@ -267,7 +267,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (timer_elapsed(key_timer) < 152) { // Time in ms, the threshold we pick for counting something as a tap. if (timer_elapsed(key_timer) < 152) { // Time in ms, the threshold we pick for counting something as a tap.
tap(KC_B); tap(KC_B);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_ctrl_mod, false, 0); PLAY_SONG(tone_ctrl_mod);
#endif #endif
#ifdef BACKLIGHT_BREATHING #ifdef BACKLIGHT_BREATHING
breathing_speed_set(2); breathing_speed_set(2);
@ -287,14 +287,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
tap(KC_C); tap(KC_C);
unregister_code(KC_LCTL); unregister_code(KC_LCTL);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_copy, false, 0); PLAY_SONG(tone_copy);
#endif #endif
} else { // Tap, paste } else { // Tap, paste
register_code(KC_LCTL); register_code(KC_LCTL);
tap(KC_V); tap(KC_V);
unregister_code(KC_LCTL); unregister_code(KC_LCTL);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_paste, false, 0); PLAY_SONG(tone_paste);
#endif #endif
} }
} }
@ -305,7 +305,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if(record->event.pressed){ if(record->event.pressed){
set_unicode_input_mode(UC_WIN); set_unicode_input_mode(UC_WIN);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(uniwin, false, 0); PLAY_SONG(uniwin);
#endif #endif
} }
return false; return false;
@ -314,7 +314,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if(record->event.pressed){ if(record->event.pressed){
set_unicode_input_mode(UC_LNX); set_unicode_input_mode(UC_LNX);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(unilin, false, 0); PLAY_SONG(unilin);
#endif #endif
} }
return false; return false;
@ -419,28 +419,28 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
void matrix_init_user(void){ // Run once at startup void matrix_init_user(void){ // Run once at startup
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
_delay_ms(50); // gets rid of tick _delay_ms(50); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
#endif #endif
} }
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
void play_goodbye_tone(void){ void play_goodbye_tone(void){
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
} }
void shutdown_user(){ void shutdown_user(){
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
void music_on_user(void){ // Run when the music layer is turned on void music_on_user(void){ // Run when the music layer is turned on
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void music_off_user(void){ // Run when music is turned off void music_off_user(void){ // Run when music is turned off
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
} }
#endif #endif

@ -109,10 +109,10 @@ float music_scale[][2] = SONG(MUSIC_SCALE_SOUND);
void startup_user() { void startup_user() {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() { void shutdown_user() {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -121,7 +121,7 @@ void music_on_user(void) {
music_scale_user(); music_scale_user();
} }
void music_scale_user(void) { void music_scale_user(void) {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif
@ -144,7 +144,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -152,7 +152,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case GAME: case GAME:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_game, false, STACCATO); PLAY_SONG(tone_game);
#endif #endif
persistent_default_layer_set(1UL<<_GAME); persistent_default_layer_set(1UL<<_GAME);
} }

@ -236,7 +236,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _QWERTY: case _QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -244,7 +244,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _COLEMAK: case _COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -252,7 +252,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _DVORAK: case _DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -260,7 +260,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _GAME: case _GAME:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_GAME); persistent_default_layer_set(1UL<<_GAME);
} }
@ -268,7 +268,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _NUMPAD: case _NUMPAD:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_NUMPAD); persistent_default_layer_set(1UL<<_NUMPAD);
} }
@ -276,7 +276,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
case _ARROW: case _ARROW:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_LOWER); persistent_default_layer_set(1UL<<_LOWER);
} }
@ -317,7 +317,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
void matrix_init_user(void) { void matrix_init_user(void) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(start_up, false, 0); PLAY_SONG(start_up);
#endif #endif
} }
@ -325,7 +325,7 @@ void matrix_init_user(void) {
void play_goodbye_tone(void) void play_goodbye_tone(void)
{ {
PLAY_NOTE_ARRAY(goodbye, false, 0); PLAY_SONG(goodbye);
_delay_ms(150); _delay_ms(150);
} }

@ -203,7 +203,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -212,7 +212,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -221,7 +221,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -273,12 +273,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -290,7 +290,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -270,12 +270,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -287,7 +287,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -102,12 +102,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -119,7 +119,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }

@ -146,7 +146,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -198,12 +198,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -215,7 +215,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -193,7 +193,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -202,7 +202,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -211,7 +211,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -263,12 +263,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -280,7 +280,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -187,7 +187,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -196,7 +196,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -205,7 +205,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -257,12 +257,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -274,7 +274,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -110,7 +110,7 @@ void dance_lower_lift(qk_tap_dance_state_t *state, void *user_data){ // Called o
update_tri_layer(_LOWER, _RAISE, _ADJUST); update_tri_layer(_LOWER, _RAISE, _ADJUST);
layer_on(_UNICODES); layer_on(_UNICODES);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_ctrl_mod, false, 0); PLAY_SONG(tone_ctrl_mod);
#endif #endif
break; break;
} }
@ -202,7 +202,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if(record->event.pressed){ if(record->event.pressed){
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
} }
return false; return false;
@ -211,7 +211,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if(record->event.pressed){ if(record->event.pressed){
persistent_default_layer_set(1UL<<_SWCOLE); persistent_default_layer_set(1UL<<_SWCOLE);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_swcole, false, 0); PLAY_SONG(tone_swcole);
#endif #endif
} }
return false; return false;
@ -236,7 +236,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return false; return false;
break; break;
case SHFT_CAP: case SHFT_CAP:
if(record->event.pressed){ if(record->event.pressed){
key_timer = timer_read(); // if the key is being pressed, we start the timer. key_timer = timer_read(); // if the key is being pressed, we start the timer.
register_code(KC_LSHIFT); register_code(KC_LSHIFT);
@ -246,12 +246,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if(caps_status == 0){ if(caps_status == 0){
caps_status = 1; caps_status = 1;
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_capslock_on, false, 0); PLAY_SONG(tone_capslock_on);
#endif #endif
} else { } else {
caps_status = 0; caps_status = 0;
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_capslock_off, false, 0); PLAY_SONG(tone_capslock_off);
#endif #endif
} }
} }
@ -267,7 +267,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (timer_elapsed(key_timer) < 152) { // Time in ms, the threshold we pick for counting something as a tap. if (timer_elapsed(key_timer) < 152) { // Time in ms, the threshold we pick for counting something as a tap.
tap(KC_B); tap(KC_B);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_ctrl_mod, false, 0); PLAY_SONG(tone_ctrl_mod);
#endif #endif
#ifdef BACKLIGHT_BREATHING #ifdef BACKLIGHT_BREATHING
breathing_speed_set(2); breathing_speed_set(2);
@ -287,14 +287,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
tap(KC_C); tap(KC_C);
unregister_code(KC_LCTL); unregister_code(KC_LCTL);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_copy, false, 0); PLAY_SONG(tone_copy);
#endif #endif
} else { // Tap, paste } else { // Tap, paste
register_code(KC_LCTL); register_code(KC_LCTL);
tap(KC_V); tap(KC_V);
unregister_code(KC_LCTL); unregister_code(KC_LCTL);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_paste, false, 0); PLAY_SONG(tone_paste);
#endif #endif
} }
} }
@ -305,7 +305,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if(record->event.pressed){ if(record->event.pressed){
set_unicode_input_mode(UC_WIN); set_unicode_input_mode(UC_WIN);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(uniwin, false, 0); PLAY_SONG(uniwin);
#endif #endif
} }
return false; return false;
@ -314,7 +314,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if(record->event.pressed){ if(record->event.pressed){
set_unicode_input_mode(UC_LNX); set_unicode_input_mode(UC_LNX);
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(unilin, false, 0); PLAY_SONG(unilin);
#endif #endif
} }
return false; return false;
@ -419,28 +419,28 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
void matrix_init_user(void){ // Run once at startup void matrix_init_user(void){ // Run once at startup
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
_delay_ms(50); // gets rid of tick _delay_ms(50); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
#endif #endif
} }
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
void play_goodbye_tone(void){ void play_goodbye_tone(void){
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
} }
void shutdown_user(){ void shutdown_user(){
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
void music_on_user(void){ // Run when the music layer is turned on void music_on_user(void){ // Run when the music layer is turned on
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void music_off_user(void){ // Run when music is turned off void music_off_user(void){ // Run when music is turned off
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
} }
#endif #endif

@ -187,7 +187,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -196,7 +196,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -205,7 +205,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }
@ -257,12 +257,12 @@ void matrix_init_user(void) {
void startup_user() void startup_user()
{ {
_delay_ms(20); // gets rid of tick _delay_ms(20); // gets rid of tick
PLAY_NOTE_ARRAY(tone_startup, false, 0); PLAY_SONG(tone_startup);
} }
void shutdown_user() void shutdown_user()
{ {
PLAY_NOTE_ARRAY(tone_goodbye, false, 0); PLAY_SONG(tone_goodbye);
_delay_ms(150); _delay_ms(150);
stop_all_notes(); stop_all_notes();
} }
@ -274,7 +274,7 @@ void music_on_user(void)
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, 0); PLAY_SONG(music_scale);
} }
#endif #endif

@ -559,32 +559,32 @@ void led_set_user(uint8_t usb_led)
if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK))) if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
{ {
// If CAPS LK LED is turning on... // If CAPS LK LED is turning on...
PLAY_NOTE_ARRAY(tone_caps_on, false, LEGATO); PLAY_SONG(tone_caps_on);
} }
else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK))) else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
{ {
// If CAPS LK LED is turning off... // If CAPS LK LED is turning off...
PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO); PLAY_SONG(tone_caps_off);
} }
else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK))) else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
{ {
// If NUM LK LED is turning on... // If NUM LK LED is turning on...
PLAY_NOTE_ARRAY(tone_numlk_on, false, LEGATO); PLAY_SONG(tone_numlk_on);
} }
else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK))) else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
{ {
// If NUM LED is turning off... // If NUM LED is turning off...
PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO); PLAY_SONG(tone_numlk_off);
} }
else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK))) else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
{ {
// If SCROLL LK LED is turning on... // If SCROLL LK LED is turning on...
PLAY_NOTE_ARRAY(tone_scroll_on, false, LEGATO); PLAY_SONG(tone_scroll_on);
} }
else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK))) else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
{ {
// If SCROLL LED is turning off... // If SCROLL LED is turning off...
PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO); PLAY_SONG(tone_scroll_off);
} }
} }
@ -594,29 +594,29 @@ void led_set_user(uint8_t usb_led)
void startup_user() void startup_user()
{ {
_delay_ms(10); // gets rid of tick _delay_ms(10); // gets rid of tick
// PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO); // PLAY_SONG(tone_my_startup);
} }
void shutdown_user() void shutdown_user()
{ {
// PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO); // PLAY_SONG(tone_my_goodbye);
_delay_ms(2000); _delay_ms(2000);
stop_all_notes(); stop_all_notes();
} }
void audio_on_user(void) void audio_on_user(void)
{ {
PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO); PLAY_SONG(tone_audio_on);
} }
void music_on_user(void) void music_on_user(void)
{ {
PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO); PLAY_SONG(tone_music_on);
} }
void music_scale_user(void) void music_scale_user(void)
{ {
PLAY_NOTE_ARRAY(music_scale, false, STACCATO); PLAY_SONG(music_scale);
} }
#endif /* AUDIO_ENABLE */ #endif /* AUDIO_ENABLE */

@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `--------------------------------------------------------------------------------------------------------' * `--------------------------------------------------------------------------------------------------------'
*/ */
[_DVORAK] = { [_DVORAK] = {
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }, { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
{ HPR_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, _______, _______, _______, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC }, { HPR_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, _______, _______, _______, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC },
{ CTL_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, _______, _______, _______, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH }, { CTL_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, _______, _______, _______, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH },
{ SFT_BSP, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, _______, _______, _______, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_ENT }, { SFT_BSP, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, _______, _______, _______, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_ENT },
@ -180,7 +180,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case QWERTY: case QWERTY:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_qwerty, false, 0); PLAY_SONG(tone_qwerty);
#endif #endif
persistent_default_layer_set(1UL<<_QWERTY); persistent_default_layer_set(1UL<<_QWERTY);
} }
@ -189,7 +189,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case COLEMAK: case COLEMAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_colemak, false, 0); PLAY_SONG(tone_colemak);
#endif #endif
persistent_default_layer_set(1UL<<_COLEMAK); persistent_default_layer_set(1UL<<_COLEMAK);
} }
@ -198,7 +198,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case DVORAK: case DVORAK:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_dvorak, false, 0); PLAY_SONG(tone_dvorak);
#endif #endif
persistent_default_layer_set(1UL<<_DVORAK); persistent_default_layer_set(1UL<<_DVORAK);
} }

Loading…
Cancel
Save