aboutsummaryrefslogtreecommitdiff
path: root/keyboards/atomic
diff options
context:
space:
mode:
authorJoe Wasson <jwasson+github@gmail.com>2017-08-19 23:04:16 -0700
committerJack Humbert <jack.humb@gmail.com>2017-08-20 12:32:20 -0400
commitfe60cbd928f2535a5cbc0b29c29397374ec91ac1 (patch)
treee01c40906374bf36d653c691160f74fd84f0e36b /keyboards/atomic
parentf94963e6b7e285a3e9ce6a807da77fad508791a4 (diff)
downloadqmk_firmware-fe60cbd928f2535a5cbc0b29c29397374ec91ac1.tar.gz
qmk_firmware-fe60cbd928f2535a5cbc0b29c29397374ec91ac1.zip
Remove PLAY_NOTE_ARRAY usages to get rid of warning.
Diffstat (limited to 'keyboards/atomic')
-rw-r--r--keyboards/atomic/keymaps/pvc/keymap.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/keyboards/atomic/keymaps/pvc/keymap.c b/keyboards/atomic/keymaps/pvc/keymap.c
index c324078dd..4a7cc863e 100644
--- a/keyboards/atomic/keymaps/pvc/keymap.c
+++ b/keyboards/atomic/keymaps/pvc/keymap.c
@@ -471,7 +471,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
471 else 471 else
472 { 472 {
473 audio_on(); 473 audio_on();
474 PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO); 474 PLAY_SONG(tone_audio_on);
475 } 475 }
476 } 476 }
477 break; 477 break;
@@ -486,7 +486,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
486 } 486 }
487 else 487 else
488 { 488 {
489 PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO); 489 PLAY_SONG(tone_music_on);
490 layer_on(LAYER_MUSIC); 490 layer_on(LAYER_MUSIC);
491 } 491 }
492 } 492 }
@@ -496,7 +496,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
496 { 496 {
497 #ifdef AUDIO_ENABLE 497 #ifdef AUDIO_ENABLE
498 voice_iterate(); 498 voice_iterate();
499 PLAY_NOTE_ARRAY(music_scale, false, STACCATO); 499 PLAY_SONG(music_scale);
500 #endif 500 #endif
501 } 501 }
502 break; 502 break;
@@ -506,7 +506,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
506 { 506 {
507 #ifdef AUDIO_ENABLE 507 #ifdef AUDIO_ENABLE
508 voice_deiterate(); 508 voice_deiterate();
509 PLAY_NOTE_ARRAY(music_scale, false, STACCATO); 509 PLAY_SONG(music_scale);
510 #endif 510 #endif
511 } 511 }
512 break; 512 break;
@@ -550,32 +550,32 @@ void led_set_user(uint8_t usb_led)
550 if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK))) 550 if ((usb_led & (1<<USB_LED_CAPS_LOCK)) && !(old_usb_led & (1<<USB_LED_CAPS_LOCK)))
551 { 551 {
552 // If CAPS LK LED is turning on... 552 // If CAPS LK LED is turning on...
553 PLAY_NOTE_ARRAY(tone_caps_on, false, LEGATO); 553 PLAY_SONG(tone_caps_on);
554 } 554 }
555 else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK))) 555 else if (!(usb_led & (1<<USB_LED_CAPS_LOCK)) && (old_usb_led & (1<<USB_LED_CAPS_LOCK)))
556 { 556 {
557 // If CAPS LK LED is turning off... 557 // If CAPS LK LED is turning off...
558 PLAY_NOTE_ARRAY(tone_caps_off, false, LEGATO); 558 PLAY_SONG(tone_caps_off);
559 } 559 }
560 else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK))) 560 else if ((usb_led & (1<<USB_LED_NUM_LOCK)) && !(old_usb_led & (1<<USB_LED_NUM_LOCK)))
561 { 561 {
562 // If NUM LK LED is turning on... 562 // If NUM LK LED is turning on...
563 PLAY_NOTE_ARRAY(tone_numlk_on, false, LEGATO); 563 PLAY_SONG(tone_numlk_on);
564 } 564 }
565 else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK))) 565 else if (!(usb_led & (1<<USB_LED_NUM_LOCK)) && (old_usb_led & (1<<USB_LED_NUM_LOCK)))
566 { 566 {
567 // If NUM LED is turning off... 567 // If NUM LED is turning off...
568 PLAY_NOTE_ARRAY(tone_numlk_off, false, LEGATO); 568 PLAY_SONG(tone_numlk_off);
569 } 569 }
570 else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK))) 570 else if ((usb_led & (1<<USB_LED_SCROLL_LOCK)) && !(old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
571 { 571 {
572 // If SCROLL LK LED is turning on... 572 // If SCROLL LK LED is turning on...
573 PLAY_NOTE_ARRAY(tone_scroll_on, false, LEGATO); 573 PLAY_SONG(tone_scroll_on);
574 } 574 }
575 else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK))) 575 else if (!(usb_led & (1<<USB_LED_SCROLL_LOCK)) && (old_usb_led & (1<<USB_LED_SCROLL_LOCK)))
576 { 576 {
577 // If SCROLL LED is turning off... 577 // If SCROLL LED is turning off...
578 PLAY_NOTE_ARRAY(tone_scroll_off, false, LEGATO); 578 PLAY_SONG(tone_scroll_off);
579 } 579 }
580 } 580 }
581 581
@@ -586,29 +586,29 @@ void led_set_user(uint8_t usb_led)
586void startup_user() 586void startup_user()
587{ 587{
588 _delay_ms(10); // gets rid of tick 588 _delay_ms(10); // gets rid of tick
589 PLAY_NOTE_ARRAY(tone_my_startup, false, STACCATO); 589 PLAY_SONG(tone_my_startup);
590} 590}
591 591
592void shutdown_user() 592void shutdown_user()
593{ 593{
594 PLAY_NOTE_ARRAY(tone_my_goodbye, false, STACCATO); 594 PLAY_SONG(tone_my_goodbye);
595 _delay_ms(2000); 595 _delay_ms(2000);
596 stop_all_notes(); 596 stop_all_notes();
597} 597}
598 598
599void audio_on_user(void) 599void audio_on_user(void)
600{ 600{
601 PLAY_NOTE_ARRAY(tone_audio_on, false, STACCATO); 601 PLAY_SONG(tone_audio_on);
602} 602}
603 603
604void music_on_user(void) 604void music_on_user(void)
605{ 605{
606 PLAY_NOTE_ARRAY(tone_music_on, false, STACCATO); 606 PLAY_SONG(tone_music_on);
607} 607}
608 608
609void music_scale_user(void) 609void music_scale_user(void)
610{ 610{
611 PLAY_NOTE_ARRAY(music_scale, false, STACCATO); 611 PLAY_SONG(music_scale);
612} 612}
613 613
614#endif /* AUDIO_ENABLE */ \ No newline at end of file 614#endif /* AUDIO_ENABLE */ \ No newline at end of file