masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Audio chime overrides in split keyboards

This commit is contained in:
Drashna Jael're 2017-12-03 10:19:57 -08:00 committed by Jack Humbert
parent d299d0e72d
commit 95e68c4ae8
8 changed files with 0 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
keyboards/iris/rev1/rev1.c
View File

@ -1,9 +1,5 @@
#include "rev1.h" #include "rev1.h"
#ifdef AUDIO_ENABLE
float tone_startup[][2] = SONG(STARTUP_SOUND);
float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
#endif
#ifdef SSD1306OLED #ifdef SSD1306OLED
void led_set_kb(uint8_t usb_led) { 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) { void matrix_init_kb(void) {
#ifdef AUDIO_ENABLE
_delay_ms(20); // gets rid of tick
PLAY_SONG(tone_startup);
#endif
// // green led on // // green led on
// DDRD |= (1<<5); // DDRD |= (1<<5);
// PORTD &= ~(1<<5); // PORTD &= ~(1<<5);
@ -29,11 +20,3 @@ void matrix_init_kb(void) {
matrix_init_user(); matrix_init_user();
}; };
void shutdown_user(void) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_goodbye);
_delay_ms(150);
stop_all_notes();
#endif
}

17
keyboards/iris/rev2/rev2.c
View File

@ -1,10 +1,5 @@
#include "rev2.h" #include "rev2.h"
#ifdef AUDIO_ENABLE
float tone_startup[][2] = SONG(STARTUP_SOUND);
float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
#endif
#ifdef SSD1306OLED #ifdef SSD1306OLED
void led_set_kb(uint8_t usb_led) { void led_set_kb(uint8_t usb_led) {
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here // 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) { void matrix_init_kb(void) {
#ifdef AUDIO_ENABLE
_delay_ms(20); // gets rid of tick
PLAY_SONG(tone_startup);
#endif
// // green led on // // green led on
// DDRD |= (1<<5); // DDRD |= (1<<5);
// PORTD &= ~(1<<5); // PORTD &= ~(1<<5);
@ -30,10 +20,3 @@ void matrix_init_kb(void) {
matrix_init_user(); matrix_init_user();
}; };
void shutdown_user(void) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_goodbye);
_delay_ms(150);
stop_all_notes();
#endif
}

17
keyboards/lets_split/rev1/rev1.c
View File

@ -1,17 +1,7 @@
#include "lets_split.h" #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) { void matrix_init_kb(void) {
#ifdef AUDIO_ENABLE
_delay_ms(20); // gets rid of tick
PLAY_SONG(tone_startup);
#endif
// // green led on // // green led on
// DDRD |= (1<<5); // DDRD |= (1<<5);
// PORTD &= ~(1<<5); // PORTD &= ~(1<<5);
@ -23,10 +13,3 @@ void matrix_init_kb(void) {
matrix_init_user(); matrix_init_user();
}; };
void shutdown_user(void) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_goodbye);
_delay_ms(150);
stop_all_notes();
#endif
}

16
keyboards/lets_split/rev2/rev2.c
View File

@ -1,9 +1,5 @@
#include "lets_split.h" #include "lets_split.h"
#ifdef AUDIO_ENABLE
float tone_startup[][2] = SONG(STARTUP_SOUND);
float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
#endif
#ifdef SSD1306OLED #ifdef SSD1306OLED
void led_set_kb(uint8_t usb_led) { 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) { void matrix_init_kb(void) {
#ifdef AUDIO_ENABLE
_delay_ms(20); // gets rid of tick
PLAY_SONG(tone_startup);
#endif
// // green led on // // green led on
// DDRD |= (1<<5); // DDRD |= (1<<5);
// PORTD &= ~(1<<5); // PORTD &= ~(1<<5);
@ -30,10 +21,3 @@ void matrix_init_kb(void) {
matrix_init_user(); matrix_init_user();
}; };
void shutdown_user(void) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_goodbye);
_delay_ms(150);
stop_all_notes();
#endif
}

17
keyboards/lets_split/sockets/sockets.c
View File

@ -1,9 +1,5 @@
#include "lets_split.h" #include "lets_split.h"
#ifdef AUDIO_ENABLE
float tone_startup[][2] = SONG(STARTUP_SOUND);
float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
#endif
#ifdef SSD1306OLED #ifdef SSD1306OLED
void led_set_kb(uint8_t usb_led) { 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) { void matrix_init_kb(void) {
#ifdef AUDIO_ENABLE
_delay_ms(20); // gets rid of tick
PLAY_SONG(tone_startup);
#endif
// // green led on // // green led on
// DDRD |= (1<<5); // DDRD |= (1<<5);
// PORTD &= ~(1<<5); // PORTD &= ~(1<<5);
@ -29,11 +20,3 @@ void matrix_init_kb(void) {
matrix_init_user(); matrix_init_user();
}; };
void shutdown_user(void) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_goodbye);
_delay_ms(150);
stop_all_notes();
#endif
}

16
keyboards/levinson/rev1/rev1.c
View File

@ -1,9 +1,5 @@
#include "levinson.h" #include "levinson.h"
#ifdef AUDIO_ENABLE
float tone_startup[][2] = SONG(STARTUP_SOUND);
float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
#endif
#ifdef SSD1306OLED #ifdef SSD1306OLED
void led_set_kb(uint8_t usb_led) { 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) { void matrix_init_kb(void) {
#ifdef AUDIO_ENABLE
_delay_ms(20); // gets rid of tick
PLAY_SONG(tone_startup);
#endif
// // green led on // // green led on
// DDRD |= (1<<5); // DDRD |= (1<<5);
// PORTD &= ~(1<<5); // PORTD &= ~(1<<5);
@ -30,10 +21,3 @@ void matrix_init_kb(void) {
matrix_init_user(); matrix_init_user();
}; };
void shutdown_user(void) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_goodbye);
_delay_ms(150);
stop_all_notes();
#endif
}

17
keyboards/levinson/rev2/rev2.c
View File

@ -1,10 +1,5 @@
#include "levinson.h" #include "levinson.h"
#ifdef AUDIO_ENABLE
float tone_startup[][2] = SONG(STARTUP_SOUND);
float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
#endif
#ifdef SSD1306OLED #ifdef SSD1306OLED
void led_set_kb(uint8_t usb_led) { void led_set_kb(uint8_t usb_led) {
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here // 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) { void matrix_init_kb(void) {
#ifdef AUDIO_ENABLE
_delay_ms(20); // gets rid of tick
PLAY_SONG(tone_startup);
#endif
// // green led on // // green led on
// DDRD |= (1<<5); // DDRD |= (1<<5);
// PORTD &= ~(1<<5); // PORTD &= ~(1<<5);
@ -30,10 +20,3 @@ void matrix_init_kb(void) {
matrix_init_user(); matrix_init_user();
}; };
void shutdown_user(void) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_goodbye);
_delay_ms(150);
stop_all_notes();
#endif
}

17
keyboards/viterbi/rev1/rev1.c
View File

@ -1,9 +1,5 @@
#include "viterbi.h" #include "viterbi.h"
#ifdef AUDIO_ENABLE
float tone_startup[][2] = SONG(STARTUP_SOUND);
float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
#endif
#ifdef SSD1306OLED #ifdef SSD1306OLED
void led_set_kb(uint8_t usb_led) { 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) { 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 // // green led on
// DDRD |= (1<<5); // DDRD |= (1<<5);
// PORTD &= ~(1<<5); // PORTD &= ~(1<<5);
@ -29,11 +20,3 @@ void matrix_init_kb(void) {
matrix_init_user(); matrix_init_user();
}; };
void shutdown_user(void) {
#ifdef AUDIO_ENABLE
PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
_delay_ms(150);
stop_all_notes();
#endif
}