From 95e68c4ae8d5e1858523e98bb9f90e645608a34e Mon Sep 17 00:00:00 2001 From: Drashna Jael're Date: Sun, 3 Dec 2017 10:19:57 -0800 Subject: [PATCH] Fix Audio chime overrides in split keyboards --- keyboards/iris/rev1/rev1.c | 17 ----------------- keyboards/iris/rev2/rev2.c | 17 ----------------- keyboards/lets_split/rev1/rev1.c | 17 ----------------- keyboards/lets_split/rev2/rev2.c | 16 ---------------- keyboards/lets_split/sockets/sockets.c | 17 ----------------- keyboards/levinson/rev1/rev1.c | 16 ---------------- keyboards/levinson/rev2/rev2.c | 17 ----------------- keyboards/viterbi/rev1/rev1.c | 17 ----------------- 8 files changed, 134 deletions(-) diff --git a/keyboards/iris/rev1/rev1.c b/keyboards/iris/rev1/rev1.c index 99bd781d..609c479e 100644 --- a/keyboards/iris/rev1/rev1.c +++ b/keyboards/iris/rev1/rev1.c @@ -1,9 +1,5 @@ #include "rev1.h" -#ifdef AUDIO_ENABLE - float tone_startup[][2] = SONG(STARTUP_SOUND); - float tone_goodbye[][2] = SONG(GOODBYE_SOUND); -#endif #ifdef SSD1306OLED void led_set_kb(uint8_t usb_led) { @@ -14,11 +10,6 @@ void led_set_kb(uint8_t usb_led) { void matrix_init_kb(void) { - #ifdef AUDIO_ENABLE - _delay_ms(20); // gets rid of tick - PLAY_SONG(tone_startup); - #endif - // // green led on // DDRD |= (1<<5); // PORTD &= ~(1<<5); @@ -29,11 +20,3 @@ void matrix_init_kb(void) { matrix_init_user(); }; - -void shutdown_user(void) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_goodbye); - _delay_ms(150); - stop_all_notes(); - #endif -} diff --git a/keyboards/iris/rev2/rev2.c b/keyboards/iris/rev2/rev2.c index d0a3c771..fb53f283 100644 --- a/keyboards/iris/rev2/rev2.c +++ b/keyboards/iris/rev2/rev2.c @@ -1,10 +1,5 @@ #include "rev2.h" -#ifdef AUDIO_ENABLE - float tone_startup[][2] = SONG(STARTUP_SOUND); - float tone_goodbye[][2] = SONG(GOODBYE_SOUND); -#endif - #ifdef SSD1306OLED void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here @@ -14,11 +9,6 @@ void led_set_kb(uint8_t usb_led) { void matrix_init_kb(void) { - #ifdef AUDIO_ENABLE - _delay_ms(20); // gets rid of tick - PLAY_SONG(tone_startup); - #endif - // // green led on // DDRD |= (1<<5); // PORTD &= ~(1<<5); @@ -30,10 +20,3 @@ void matrix_init_kb(void) { matrix_init_user(); }; -void shutdown_user(void) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_goodbye); - _delay_ms(150); - stop_all_notes(); - #endif -} diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c index 74eed277..c243f71b 100644 --- a/keyboards/lets_split/rev1/rev1.c +++ b/keyboards/lets_split/rev1/rev1.c @@ -1,17 +1,7 @@ #include "lets_split.h" -#ifdef AUDIO_ENABLE - float tone_startup[][2] = SONG(STARTUP_SOUND); - float tone_goodbye[][2] = SONG(GOODBYE_SOUND); -#endif - void matrix_init_kb(void) { - #ifdef AUDIO_ENABLE - _delay_ms(20); // gets rid of tick - PLAY_SONG(tone_startup); - #endif - // // green led on // DDRD |= (1<<5); // PORTD &= ~(1<<5); @@ -23,10 +13,3 @@ void matrix_init_kb(void) { matrix_init_user(); }; -void shutdown_user(void) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_goodbye); - _delay_ms(150); - stop_all_notes(); - #endif -} diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c index 88903f7f..3ae967c0 100644 --- a/keyboards/lets_split/rev2/rev2.c +++ b/keyboards/lets_split/rev2/rev2.c @@ -1,9 +1,5 @@ #include "lets_split.h" -#ifdef AUDIO_ENABLE - float tone_startup[][2] = SONG(STARTUP_SOUND); - float tone_goodbye[][2] = SONG(GOODBYE_SOUND); -#endif #ifdef SSD1306OLED void led_set_kb(uint8_t usb_led) { @@ -14,11 +10,6 @@ void led_set_kb(uint8_t usb_led) { void matrix_init_kb(void) { - #ifdef AUDIO_ENABLE - _delay_ms(20); // gets rid of tick - PLAY_SONG(tone_startup); - #endif - // // green led on // DDRD |= (1<<5); // PORTD &= ~(1<<5); @@ -30,10 +21,3 @@ void matrix_init_kb(void) { matrix_init_user(); }; -void shutdown_user(void) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_goodbye); - _delay_ms(150); - stop_all_notes(); - #endif -} diff --git a/keyboards/lets_split/sockets/sockets.c b/keyboards/lets_split/sockets/sockets.c index 88903f7f..d5067856 100644 --- a/keyboards/lets_split/sockets/sockets.c +++ b/keyboards/lets_split/sockets/sockets.c @@ -1,9 +1,5 @@ #include "lets_split.h" -#ifdef AUDIO_ENABLE - float tone_startup[][2] = SONG(STARTUP_SOUND); - float tone_goodbye[][2] = SONG(GOODBYE_SOUND); -#endif #ifdef SSD1306OLED void led_set_kb(uint8_t usb_led) { @@ -14,11 +10,6 @@ void led_set_kb(uint8_t usb_led) { void matrix_init_kb(void) { - #ifdef AUDIO_ENABLE - _delay_ms(20); // gets rid of tick - PLAY_SONG(tone_startup); - #endif - // // green led on // DDRD |= (1<<5); // PORTD &= ~(1<<5); @@ -29,11 +20,3 @@ void matrix_init_kb(void) { matrix_init_user(); }; - -void shutdown_user(void) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_goodbye); - _delay_ms(150); - stop_all_notes(); - #endif -} diff --git a/keyboards/levinson/rev1/rev1.c b/keyboards/levinson/rev1/rev1.c index f849b5c4..edcfd935 100644 --- a/keyboards/levinson/rev1/rev1.c +++ b/keyboards/levinson/rev1/rev1.c @@ -1,9 +1,5 @@ #include "levinson.h" -#ifdef AUDIO_ENABLE - float tone_startup[][2] = SONG(STARTUP_SOUND); - float tone_goodbye[][2] = SONG(GOODBYE_SOUND); -#endif #ifdef SSD1306OLED void led_set_kb(uint8_t usb_led) { @@ -14,11 +10,6 @@ void led_set_kb(uint8_t usb_led) { void matrix_init_kb(void) { - #ifdef AUDIO_ENABLE - _delay_ms(20); // gets rid of tick - PLAY_SONG(tone_startup); - #endif - // // green led on // DDRD |= (1<<5); // PORTD &= ~(1<<5); @@ -30,10 +21,3 @@ void matrix_init_kb(void) { matrix_init_user(); }; -void shutdown_user(void) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_goodbye); - _delay_ms(150); - stop_all_notes(); - #endif -} diff --git a/keyboards/levinson/rev2/rev2.c b/keyboards/levinson/rev2/rev2.c index f849b5c4..573fa787 100644 --- a/keyboards/levinson/rev2/rev2.c +++ b/keyboards/levinson/rev2/rev2.c @@ -1,10 +1,5 @@ #include "levinson.h" -#ifdef AUDIO_ENABLE - float tone_startup[][2] = SONG(STARTUP_SOUND); - float tone_goodbye[][2] = SONG(GOODBYE_SOUND); -#endif - #ifdef SSD1306OLED void led_set_kb(uint8_t usb_led) { // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here @@ -14,11 +9,6 @@ void led_set_kb(uint8_t usb_led) { void matrix_init_kb(void) { - #ifdef AUDIO_ENABLE - _delay_ms(20); // gets rid of tick - PLAY_SONG(tone_startup); - #endif - // // green led on // DDRD |= (1<<5); // PORTD &= ~(1<<5); @@ -30,10 +20,3 @@ void matrix_init_kb(void) { matrix_init_user(); }; -void shutdown_user(void) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_goodbye); - _delay_ms(150); - stop_all_notes(); - #endif -} diff --git a/keyboards/viterbi/rev1/rev1.c b/keyboards/viterbi/rev1/rev1.c index 760fdebf..58483753 100644 --- a/keyboards/viterbi/rev1/rev1.c +++ b/keyboards/viterbi/rev1/rev1.c @@ -1,9 +1,5 @@ #include "viterbi.h" -#ifdef AUDIO_ENABLE - float tone_startup[][2] = SONG(STARTUP_SOUND); - float tone_goodbye[][2] = SONG(GOODBYE_SOUND); -#endif #ifdef SSD1306OLED void led_set_kb(uint8_t usb_led) { @@ -14,11 +10,6 @@ void led_set_kb(uint8_t usb_led) { void matrix_init_kb(void) { - #ifdef AUDIO_ENABLE - _delay_ms(20); // gets rid of tick - PLAY_NOTE_ARRAY(tone_startup, false, 0); - #endif - // // green led on // DDRD |= (1<<5); // PORTD &= ~(1<<5); @@ -29,11 +20,3 @@ void matrix_init_kb(void) { matrix_init_user(); }; - -void shutdown_user(void) { - #ifdef AUDIO_ENABLE - PLAY_NOTE_ARRAY(tone_goodbye, false, 0); - _delay_ms(150); - stop_all_notes(); - #endif -}