1
0
Fork 0

Remove PLAY_NOTE_ARRAY usages to get rid of warning.

This commit is contained in:
Joe Wasson 2017-08-19 23:04:16 -07:00 committed by Jack Humbert
parent f94963e6b7
commit fe60cbd928
59 changed files with 403 additions and 403 deletions
keyboards
amj40/keymaps/fabian
atomic/keymaps/pvc
cluecard/keymaps/default
eco/keymaps/that_canadian
hadron/keymaps
default
side_numpad
handwired
MS_sculpt_mobile/keymaps/milestogo
atreus50/keymaps/default
ortho5x13/keymaps/default
lets_split
keymaps
OLED_sample
dale
default
ergodoxish
fabian
hexwire
khord
smt
rev1
rev2
minidox/keymaps/default
nyquist
keymaps
default
hexwire
rev1
orthodox
keymaps/default
rev1
planck/keymaps
chance
circuit
dale
dbroqua
experimental
handwired_binaryplease
impossible
jeebak
jhenahan
khord
lae3
originerd
pete
premek
pvc
sgoodwin
smt
thermal_printer
unicode
xyverz
zach
preonic/keymaps
subatomic/keymaps/default
vision_division/keymaps/default
xd75/keymaps/fabian

View file

@ -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);
} }

View file

@ -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 */

View file

@ -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;
} }
} }

View file

@ -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

View file

@ -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

View file

@ -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);
} }
@ -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

View file

@ -155,7 +155,7 @@ 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);
} }
@ -165,7 +165,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
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);
} }

View file

@ -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

View file

@ -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

View file

@ -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);
} }
@ -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

View file

@ -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);
} }

View file

@ -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,7 +173,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(music_scale, false, 0); PLAY_SONG(music_scale);
#endif #endif
persistant_default_layer_set(1UL<<_GAME); persistant_default_layer_set(1UL<<_GAME);
} }
@ -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

View file

@ -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);
} }

View file

@ -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);
} }

View file

@ -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);
} }

View file

@ -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);
} }

View file

@ -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);
} }

View file

@ -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);
} }

View file

@ -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

View file

@ -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

View file

@ -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);
} }

View file

@ -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);
} }

View file

@ -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);
} }

View file

@ -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

View file

@ -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);
} }

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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,7 +173,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(music_scale, false, 0); PLAY_SONG(music_scale);
#endif #endif
persistant_default_layer_set(1UL<<_GAME); persistant_default_layer_set(1UL<<_GAME);
} }
@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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);
} }
@ -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);
} }

View file

@ -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

View file

@ -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 */

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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;
@ -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

View file

@ -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);
} }

View file

@ -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);
} }

View file

@ -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

View file

@ -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

View file

@ -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);
} }

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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;
@ -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

View file

@ -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

View file

@ -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 */

View file

@ -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);
} }