aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2017-12-03 10:19:57 -0800
committerJack Humbert <jack.humb@gmail.com>2017-12-04 18:16:26 -0500
commit95e68c4ae8d5e1858523e98bb9f90e645608a34e (patch)
treebba4109b8cc219903662b4b93bf80203b4293c9a
parentd299d0e72dd96b73b745cad12977a719a0d71cd4 (diff)
downloadqmk_firmware-95e68c4ae8d5e1858523e98bb9f90e645608a34e.tar.gz
qmk_firmware-95e68c4ae8d5e1858523e98bb9f90e645608a34e.zip
Fix Audio chime overrides in split keyboards
Diffstat
-rw-r--r--keyboards/iris/rev1/rev1.c17
-rw-r--r--keyboards/iris/rev2/rev2.c17
-rw-r--r--keyboards/lets_split/rev1/rev1.c17
-rw-r--r--keyboards/lets_split/rev2/rev2.c16
-rw-r--r--keyboards/lets_split/sockets/sockets.c17
-rw-r--r--keyboards/levinson/rev1/rev1.c16
-rw-r--r--keyboards/levinson/rev2/rev2.c17
-rw-r--r--keyboards/viterbi/rev1/rev1.c17
8 files changed, 0 insertions, 134 deletions
diff --git a/keyboards/iris/rev1/rev1.c b/keyboards/iris/rev1/rev1.c
index 99bd781d5..609c479eb 100644
--- a/keyboards/iris/rev1/rev1.c
+++ b/keyboards/iris/rev1/rev1.c
@@ -1,9 +1,5 @@
1#include "rev1.h" 1#include "rev1.h"
2 2
3#ifdef AUDIO_ENABLE
4 float tone_startup[][2] = SONG(STARTUP_SOUND);
5 float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
6#endif
7 3
8#ifdef SSD1306OLED 4#ifdef SSD1306OLED
9void led_set_kb(uint8_t usb_led) { 5void led_set_kb(uint8_t usb_led) {
@@ -14,11 +10,6 @@ void led_set_kb(uint8_t usb_led) {
14 10
15void matrix_init_kb(void) { 11void matrix_init_kb(void) {
16 12
17 #ifdef AUDIO_ENABLE
18 _delay_ms(20); // gets rid of tick
19 PLAY_SONG(tone_startup);
20 #endif
21
22 // // green led on 13 // // green led on
23 // DDRD |= (1<<5); 14 // DDRD |= (1<<5);
24 // PORTD &= ~(1<<5); 15 // PORTD &= ~(1<<5);
@@ -29,11 +20,3 @@ void matrix_init_kb(void) {
29 20
30 matrix_init_user(); 21 matrix_init_user();
31}; 22};
32
33void shutdown_user(void) {
34 #ifdef AUDIO_ENABLE
35 PLAY_SONG(tone_goodbye);
36 _delay_ms(150);
37 stop_all_notes();
38 #endif
39}
diff --git a/keyboards/iris/rev2/rev2.c b/keyboards/iris/rev2/rev2.c
index d0a3c771f..fb53f283e 100644
--- a/keyboards/iris/rev2/rev2.c
+++ b/keyboards/iris/rev2/rev2.c
@@ -1,10 +1,5 @@
1#include "rev2.h" 1#include "rev2.h"
2 2
3#ifdef AUDIO_ENABLE
4 float tone_startup[][2] = SONG(STARTUP_SOUND);
5 float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
6#endif
7
8#ifdef SSD1306OLED 3#ifdef SSD1306OLED
9void led_set_kb(uint8_t usb_led) { 4void led_set_kb(uint8_t usb_led) {
10 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here 5 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
@@ -14,11 +9,6 @@ void led_set_kb(uint8_t usb_led) {
14 9
15void matrix_init_kb(void) { 10void matrix_init_kb(void) {
16 11
17 #ifdef AUDIO_ENABLE
18 _delay_ms(20); // gets rid of tick
19 PLAY_SONG(tone_startup);
20 #endif
21
22 // // green led on 12 // // green led on
23 // DDRD |= (1<<5); 13 // DDRD |= (1<<5);
24 // PORTD &= ~(1<<5); 14 // PORTD &= ~(1<<5);
@@ -30,10 +20,3 @@ void matrix_init_kb(void) {
30 matrix_init_user(); 20 matrix_init_user();
31}; 21};
32 22
33void shutdown_user(void) {
34 #ifdef AUDIO_ENABLE
35 PLAY_SONG(tone_goodbye);
36 _delay_ms(150);
37 stop_all_notes();
38 #endif
39}
diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c
index 74eed277b..c243f71bc 100644
--- a/keyboards/lets_split/rev1/rev1.c
+++ b/keyboards/lets_split/rev1/rev1.c
@@ -1,17 +1,7 @@
1#include "lets_split.h" 1#include "lets_split.h"
2 2
3#ifdef AUDIO_ENABLE
4 float tone_startup[][2] = SONG(STARTUP_SOUND);
5 float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
6#endif
7
8void matrix_init_kb(void) { 3void matrix_init_kb(void) {
9 4
10 #ifdef AUDIO_ENABLE
11 _delay_ms(20); // gets rid of tick
12 PLAY_SONG(tone_startup);
13 #endif
14
15 // // green led on 5 // // green led on
16 // DDRD |= (1<<5); 6 // DDRD |= (1<<5);
17 // PORTD &= ~(1<<5); 7 // PORTD &= ~(1<<5);
@@ -23,10 +13,3 @@ void matrix_init_kb(void) {
23 matrix_init_user(); 13 matrix_init_user();
24}; 14};
25 15
26void shutdown_user(void) {
27 #ifdef AUDIO_ENABLE
28 PLAY_SONG(tone_goodbye);
29 _delay_ms(150);
30 stop_all_notes();
31 #endif
32}
diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c
index 88903f7f4..3ae967c07 100644
--- a/keyboards/lets_split/rev2/rev2.c
+++ b/keyboards/lets_split/rev2/rev2.c
@@ -1,9 +1,5 @@
1#include "lets_split.h" 1#include "lets_split.h"
2 2
3#ifdef AUDIO_ENABLE
4 float tone_startup[][2] = SONG(STARTUP_SOUND);
5 float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
6#endif
7 3
8#ifdef SSD1306OLED 4#ifdef SSD1306OLED
9void led_set_kb(uint8_t usb_led) { 5void led_set_kb(uint8_t usb_led) {
@@ -14,11 +10,6 @@ void led_set_kb(uint8_t usb_led) {
14 10
15void matrix_init_kb(void) { 11void matrix_init_kb(void) {
16 12
17 #ifdef AUDIO_ENABLE
18 _delay_ms(20); // gets rid of tick
19 PLAY_SONG(tone_startup);
20 #endif
21
22 // // green led on 13 // // green led on
23 // DDRD |= (1<<5); 14 // DDRD |= (1<<5);
24 // PORTD &= ~(1<<5); 15 // PORTD &= ~(1<<5);
@@ -30,10 +21,3 @@ void matrix_init_kb(void) {
30 matrix_init_user(); 21 matrix_init_user();
31}; 22};
32 23
33void shutdown_user(void) {
34 #ifdef AUDIO_ENABLE
35 PLAY_SONG(tone_goodbye);
36 _delay_ms(150);
37 stop_all_notes();
38 #endif
39}
diff --git a/keyboards/lets_split/sockets/sockets.c b/keyboards/lets_split/sockets/sockets.c
index 88903f7f4..d50678560 100644
--- a/keyboards/lets_split/sockets/sockets.c
+++ b/keyboards/lets_split/sockets/sockets.c
@@ -1,9 +1,5 @@
1#include "lets_split.h" 1#include "lets_split.h"
2 2
3#ifdef AUDIO_ENABLE
4 float tone_startup[][2] = SONG(STARTUP_SOUND);
5 float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
6#endif
7 3
8#ifdef SSD1306OLED 4#ifdef SSD1306OLED
9void led_set_kb(uint8_t usb_led) { 5void led_set_kb(uint8_t usb_led) {
@@ -14,11 +10,6 @@ void led_set_kb(uint8_t usb_led) {
14 10
15void matrix_init_kb(void) { 11void matrix_init_kb(void) {
16 12
17 #ifdef AUDIO_ENABLE
18 _delay_ms(20); // gets rid of tick
19 PLAY_SONG(tone_startup);
20 #endif
21
22 // // green led on 13 // // green led on
23 // DDRD |= (1<<5); 14 // DDRD |= (1<<5);
24 // PORTD &= ~(1<<5); 15 // PORTD &= ~(1<<5);
@@ -29,11 +20,3 @@ void matrix_init_kb(void) {
29 20
30 matrix_init_user(); 21 matrix_init_user();
31}; 22};
32
33void shutdown_user(void) {
34 #ifdef AUDIO_ENABLE
35 PLAY_SONG(tone_goodbye);
36 _delay_ms(150);
37 stop_all_notes();
38 #endif
39}
diff --git a/keyboards/levinson/rev1/rev1.c b/keyboards/levinson/rev1/rev1.c
index f849b5c4e..edcfd9357 100644
--- a/keyboards/levinson/rev1/rev1.c
+++ b/keyboards/levinson/rev1/rev1.c
@@ -1,9 +1,5 @@
1#include "levinson.h" 1#include "levinson.h"
2 2
3#ifdef AUDIO_ENABLE
4 float tone_startup[][2] = SONG(STARTUP_SOUND);
5 float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
6#endif
7 3
8#ifdef SSD1306OLED 4#ifdef SSD1306OLED
9void led_set_kb(uint8_t usb_led) { 5void led_set_kb(uint8_t usb_led) {
@@ -14,11 +10,6 @@ void led_set_kb(uint8_t usb_led) {
14 10
15void matrix_init_kb(void) { 11void matrix_init_kb(void) {
16 12
17 #ifdef AUDIO_ENABLE
18 _delay_ms(20); // gets rid of tick
19 PLAY_SONG(tone_startup);
20 #endif
21
22 // // green led on 13 // // green led on
23 // DDRD |= (1<<5); 14 // DDRD |= (1<<5);
24 // PORTD &= ~(1<<5); 15 // PORTD &= ~(1<<5);
@@ -30,10 +21,3 @@ void matrix_init_kb(void) {
30 matrix_init_user(); 21 matrix_init_user();
31}; 22};
32 23
33void shutdown_user(void) {
34 #ifdef AUDIO_ENABLE
35 PLAY_SONG(tone_goodbye);
36 _delay_ms(150);
37 stop_all_notes();
38 #endif
39}
diff --git a/keyboards/levinson/rev2/rev2.c b/keyboards/levinson/rev2/rev2.c
index f849b5c4e..573fa787b 100644
--- a/keyboards/levinson/rev2/rev2.c
+++ b/keyboards/levinson/rev2/rev2.c
@@ -1,10 +1,5 @@
1#include "levinson.h" 1#include "levinson.h"
2 2
3#ifdef AUDIO_ENABLE
4 float tone_startup[][2] = SONG(STARTUP_SOUND);
5 float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
6#endif
7
8#ifdef SSD1306OLED 3#ifdef SSD1306OLED
9void led_set_kb(uint8_t usb_led) { 4void led_set_kb(uint8_t usb_led) {
10 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here 5 // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
@@ -14,11 +9,6 @@ void led_set_kb(uint8_t usb_led) {
14 9
15void matrix_init_kb(void) { 10void matrix_init_kb(void) {
16 11
17 #ifdef AUDIO_ENABLE
18 _delay_ms(20); // gets rid of tick
19 PLAY_SONG(tone_startup);
20 #endif
21
22 // // green led on 12 // // green led on
23 // DDRD |= (1<<5); 13 // DDRD |= (1<<5);
24 // PORTD &= ~(1<<5); 14 // PORTD &= ~(1<<5);
@@ -30,10 +20,3 @@ void matrix_init_kb(void) {
30 matrix_init_user(); 20 matrix_init_user();
31}; 21};
32 22
33void shutdown_user(void) {
34 #ifdef AUDIO_ENABLE
35 PLAY_SONG(tone_goodbye);
36 _delay_ms(150);
37 stop_all_notes();
38 #endif
39}
diff --git a/keyboards/viterbi/rev1/rev1.c b/keyboards/viterbi/rev1/rev1.c
index 760fdebf3..584837533 100644
--- a/keyboards/viterbi/rev1/rev1.c
+++ b/keyboards/viterbi/rev1/rev1.c
@@ -1,9 +1,5 @@
1#include "viterbi.h" 1#include "viterbi.h"
2 2
3#ifdef AUDIO_ENABLE
4 float tone_startup[][2] = SONG(STARTUP_SOUND);
5 float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
6#endif
7 3
8#ifdef SSD1306OLED 4#ifdef SSD1306OLED
9void led_set_kb(uint8_t usb_led) { 5void led_set_kb(uint8_t usb_led) {
@@ -14,11 +10,6 @@ void led_set_kb(uint8_t usb_led) {
14 10
15void matrix_init_kb(void) { 11void matrix_init_kb(void) {
16 12
17 #ifdef AUDIO_ENABLE
18 _delay_ms(20); // gets rid of tick
19 PLAY_NOTE_ARRAY(tone_startup, false, 0);
20 #endif
21
22 // // green led on 13 // // green led on
23 // DDRD |= (1<<5); 14 // DDRD |= (1<<5);
24 // PORTD &= ~(1<<5); 15 // PORTD &= ~(1<<5);
@@ -29,11 +20,3 @@ void matrix_init_kb(void) {
29 20
30 matrix_init_user(); 21 matrix_init_user();
31}; 22};
32
33void shutdown_user(void) {
34 #ifdef AUDIO_ENABLE
35 PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
36 _delay_ms(150);
37 stop_all_notes();
38 #endif
39}
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-22 14:43:32 +0000