summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2024-08-04 02:07:02 +0100
committerGitHub <noreply@github.com>2024-08-04 02:07:02 +0100
commit0fbe15030357a9dca7d6d3d9de4facea5a7b4bcc (patch)
treeaaf1fbe5ee0ccf6258009dfaadfece2992f905be
parent0b4065b50cbcb1760c7e81d3c550c2dfdacd9d83 (diff)
Remove unnecessary RGB Matrix shutdown hooks (#24238)
-rw-r--r--keyboards/geekboards/macropad_v2/macropad_v2.c9
-rw-r--r--keyboards/geekboards/tester/keyboard.json3
-rw-r--r--keyboards/geekboards/tester/tester.c10
-rw-r--r--keyboards/handwired/colorlice/colorlice.c14
-rw-r--r--keyboards/handwired/p65rgb/p65rgb.c31
-rw-r--r--keyboards/kbdfans/kbdmini/kbdmini.c10
-rwxr-xr-xkeyboards/kprepublic/bm40hsrgb/rev1/rev1.c10
-rw-r--r--keyboards/latincompass/latin60rgb/latin60rgb.c10
-rw-r--r--keyboards/melgeek/mj61/rev1/rev1.c9
-rw-r--r--keyboards/melgeek/mj61/rev2/rev2.c9
-rw-r--r--keyboards/melgeek/mj63/rev1/rev1.c9
-rw-r--r--keyboards/melgeek/mj63/rev2/rev2.c9
-rw-r--r--keyboards/melgeek/mj64/rev1/rev1.c9
-rw-r--r--keyboards/melgeek/mj64/rev2/rev2.c9
-rw-r--r--keyboards/melgeek/mj64/rev3/rev3.c9
-rw-r--r--keyboards/melgeek/mj65/rev3/rev3.c10
-rw-r--r--keyboards/melgeek/mojo75/rev1/rev1.c10
-rw-r--r--keyboards/percent/canoe_gen2/canoe_gen2.c9
-rw-r--r--keyboards/phase_studio/titan65/hotswap/hotswap.c9
-rw-r--r--keyboards/phase_studio/titan65/hotswap/keyboard.json3
-rw-r--r--keyboards/planck/light/keyboard.json3
-rw-r--r--keyboards/planck/light/light.c12
-rw-r--r--keyboards/sowbug/68keys/68keys.c9
-rw-r--r--keyboards/sowbug/68keys/keyboard.json3
-rw-r--r--keyboards/sowbug/ansi_tkl/ansi_tkl.c9
-rw-r--r--keyboards/sowbug/ansi_tkl/keyboard.json3
26 files changed, 10 insertions, 230 deletions
diff --git a/keyboards/geekboards/macropad_v2/macropad_v2.c b/keyboards/geekboards/macropad_v2/macropad_v2.c
index 191290d3fa..ba65697988 100644
--- a/keyboards/geekboards/macropad_v2/macropad_v2.c
+++ b/keyboards/geekboards/macropad_v2/macropad_v2.c
@@ -53,13 +53,4 @@ led_config_t g_led_config = { {
53 2, 2, 2 53 2, 2, 2
54} }; 54} };
55 55
56void suspend_power_down_kb(void) {
57 rgb_matrix_set_suspend_state(true);
58 suspend_power_down_user();
59}
60
61void suspend_wakeup_init_kb(void) {
62 rgb_matrix_set_suspend_state(false);
63 suspend_wakeup_init_user();
64}
65#endif 56#endif
diff --git a/keyboards/geekboards/tester/keyboard.json b/keyboards/geekboards/tester/keyboard.json
index 60c6b34e00..743e5e2392 100644
--- a/keyboards/geekboards/tester/keyboard.json
+++ b/keyboards/geekboards/tester/keyboard.json
@@ -50,7 +50,8 @@
50 "solid_reactive_nexus": true, 50 "solid_reactive_nexus": true,
51 "solid_reactive_multinexus": true 51 "solid_reactive_multinexus": true
52 }, 52 },
53 "driver": "is31fl3731" 53 "driver": "is31fl3731",
54 "sleep": true
54 }, 55 },
55 "features": { 56 "features": {
56 "bootmagic": true, 57 "bootmagic": true,
diff --git a/keyboards/geekboards/tester/tester.c b/keyboards/geekboards/tester/tester.c
index 11d2eb4db2..4daa4ef062 100644
--- a/keyboards/geekboards/tester/tester.c
+++ b/keyboards/geekboards/tester/tester.c
@@ -29,13 +29,3 @@ led_config_t g_led_config = {
29 4, 4, 4, 4, 4, 4, 4, 4 29 4, 4, 4, 4, 4, 4, 4, 4
30} 30}
31}; 31};
32
33void suspend_power_down_kb(void) {
34 rgb_matrix_set_suspend_state(true);
35 suspend_power_down_user();
36}
37
38void suspend_wakeup_init_kb(void) {
39 rgb_matrix_set_suspend_state(false);
40 suspend_wakeup_init_user();
41}
diff --git a/keyboards/handwired/colorlice/colorlice.c b/keyboards/handwired/colorlice/colorlice.c
index 92914b79bc..81e87d8c7a 100644
--- a/keyboards/handwired/colorlice/colorlice.c
+++ b/keyboards/handwired/colorlice/colorlice.c
@@ -37,17 +37,3 @@ led_config_t g_led_config = { {
37 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 37 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
38} }; 38} };
39#endif 39#endif
40
41#ifdef RGB_MATRIX_ENABLE
42void suspend_power_down_kb(void)
43{
44 rgb_matrix_set_suspend_state(true);
45 suspend_power_down_user();
46}
47
48void suspend_wakeup_init_kb(void)
49{
50 rgb_matrix_set_suspend_state(false);
51 suspend_wakeup_init_user();
52}
53#endif
diff --git a/keyboards/handwired/p65rgb/p65rgb.c b/keyboards/handwired/p65rgb/p65rgb.c
deleted file mode 100644
index 3d7185f9d1..0000000000
--- a/keyboards/handwired/p65rgb/p65rgb.c
+++ /dev/null
@@ -1,31 +0,0 @@
1/* Copyright 2019 marhalloweenvt
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include "quantum.h"
18
19#ifdef RGB_MATRIX_ENABLE
20void suspend_power_down_kb(void)
21{
22 rgb_matrix_set_suspend_state(true);
23 suspend_power_down_user();
24}
25
26void suspend_wakeup_init_kb(void)
27{
28 rgb_matrix_set_suspend_state(false);
29 suspend_wakeup_init_user();
30}
31#endif
diff --git a/keyboards/kbdfans/kbdmini/kbdmini.c b/keyboards/kbdfans/kbdmini/kbdmini.c
index 7aec00cbdc..18acc21da4 100644
--- a/keyboards/kbdfans/kbdmini/kbdmini.c
+++ b/keyboards/kbdfans/kbdmini/kbdmini.c
@@ -76,13 +76,3 @@ led_config_t g_led_config = {
76 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 76 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
77 } 77 }
78}; 78};
79
80void suspend_power_down_kb(void) {
81 rgb_matrix_set_suspend_state(true);
82 suspend_power_down_user();
83}
84
85void suspend_wakeup_init_kb(void) {
86 rgb_matrix_set_suspend_state(false);
87 suspend_wakeup_init_user();
88}
diff --git a/keyboards/kprepublic/bm40hsrgb/rev1/rev1.c b/keyboards/kprepublic/bm40hsrgb/rev1/rev1.c
index 16e515042d..f6df97ebf1 100755
--- a/keyboards/kprepublic/bm40hsrgb/rev1/rev1.c
+++ b/keyboards/kprepublic/bm40hsrgb/rev1/rev1.c
@@ -40,14 +40,4 @@ led_config_t g_led_config = {
40 } 40 }
41}; 41};
42 42
43
44void suspend_power_down_kb(void) {
45 rgb_matrix_set_suspend_state(true);
46 suspend_power_down_user();
47}
48
49void suspend_wakeup_init_kb(void) {
50 rgb_matrix_set_suspend_state(false);
51 suspend_wakeup_init_user();
52}
53#endif 43#endif
diff --git a/keyboards/latincompass/latin60rgb/latin60rgb.c b/keyboards/latincompass/latin60rgb/latin60rgb.c
index 305aaff5f2..78052eccb6 100644
--- a/keyboards/latincompass/latin60rgb/latin60rgb.c
+++ b/keyboards/latincompass/latin60rgb/latin60rgb.c
@@ -83,16 +83,6 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
83 { 0, SW11_CS13, SW10_CS13, SW12_CS13 } 83 { 0, SW11_CS13, SW10_CS13, SW12_CS13 }
84}; 84};
85 85
86void suspend_power_down_kb(void) {
87 rgb_matrix_set_suspend_state(true);
88 suspend_power_down_user();
89}
90
91void suspend_wakeup_init_kb(void) {
92 rgb_matrix_set_suspend_state(false);
93 suspend_wakeup_init_user();
94}
95
96bool rgb_matrix_indicators_kb(void) { 86bool rgb_matrix_indicators_kb(void) {
97 if (!rgb_matrix_indicators_user()) { 87 if (!rgb_matrix_indicators_user()) {
98 return false; 88 return false;
diff --git a/keyboards/melgeek/mj61/rev1/rev1.c b/keyboards/melgeek/mj61/rev1/rev1.c
index 3ee0da5183..8e0be62127 100644
--- a/keyboards/melgeek/mj61/rev1/rev1.c
+++ b/keyboards/melgeek/mj61/rev1/rev1.c
@@ -106,13 +106,4 @@ led_config_t g_led_config = {
106 } 106 }
107}; 107};
108 108
109void suspend_power_down_kb(void) {
110 rgb_matrix_set_suspend_state(true);
111 suspend_power_down_user();
112}
113
114void suspend_wakeup_init_kb(void) {
115 rgb_matrix_set_suspend_state(false);
116 suspend_wakeup_init_user();
117}
118#endif 109#endif
diff --git a/keyboards/melgeek/mj61/rev2/rev2.c b/keyboards/melgeek/mj61/rev2/rev2.c
index 71d41c16b3..7b27fa44c3 100644
--- a/keyboards/melgeek/mj61/rev2/rev2.c
+++ b/keyboards/melgeek/mj61/rev2/rev2.c
@@ -116,13 +116,4 @@ led_config_t g_led_config = {
116 } 116 }
117}; 117};
118 118
119void suspend_power_down_kb(void) {
120 rgb_matrix_set_suspend_state(true);
121 suspend_power_down_user();
122}
123
124void suspend_wakeup_init_kb(void) {
125 rgb_matrix_set_suspend_state(false);
126 suspend_wakeup_init_user();
127}
128#endif 119#endif
diff --git a/keyboards/melgeek/mj63/rev1/rev1.c b/keyboards/melgeek/mj63/rev1/rev1.c
index e3baf32de7..d6caeac0c1 100644
--- a/keyboards/melgeek/mj63/rev1/rev1.c
+++ b/keyboards/melgeek/mj63/rev1/rev1.c
@@ -110,13 +110,4 @@ led_config_t g_led_config = {
110 } 110 }
111}; 111};
112 112
113void suspend_power_down_kb(void) {
114 rgb_matrix_set_suspend_state(true);
115 suspend_power_down_user();
116}
117
118void suspend_wakeup_init_kb(void) {
119 rgb_matrix_set_suspend_state(false);
120 suspend_wakeup_init_user();
121}
122#endif 113#endif
diff --git a/keyboards/melgeek/mj63/rev2/rev2.c b/keyboards/melgeek/mj63/rev2/rev2.c
index 418092ec9f..95f0b28f5d 100644
--- a/keyboards/melgeek/mj63/rev2/rev2.c
+++ b/keyboards/melgeek/mj63/rev2/rev2.c
@@ -116,13 +116,4 @@ led_config_t g_led_config = {
116 } 116 }
117}; 117};
118 118
119void suspend_power_down_kb(void) {
120 rgb_matrix_set_suspend_state(true);
121 suspend_power_down_user();
122}
123
124void suspend_wakeup_init_kb(void) {
125 rgb_matrix_set_suspend_state(false);
126 suspend_wakeup_init_user();
127}
128#endif 119#endif
diff --git a/keyboards/melgeek/mj64/rev1/rev1.c b/keyboards/melgeek/mj64/rev1/rev1.c
index b9609cad1e..ea3376a8c7 100644
--- a/keyboards/melgeek/mj64/rev1/rev1.c
+++ b/keyboards/melgeek/mj64/rev1/rev1.c
@@ -107,13 +107,4 @@ led_config_t g_led_config = {
107 } 107 }
108}; 108};
109 109
110void suspend_power_down_kb(void) {
111 rgb_matrix_set_suspend_state(true);
112 suspend_power_down_user();
113}
114
115void suspend_wakeup_init_kb(void) {
116 rgb_matrix_set_suspend_state(false);
117 suspend_wakeup_init_user();
118}
119#endif 110#endif
diff --git a/keyboards/melgeek/mj64/rev2/rev2.c b/keyboards/melgeek/mj64/rev2/rev2.c
index 16c8e1f612..17947282ce 100644
--- a/keyboards/melgeek/mj64/rev2/rev2.c
+++ b/keyboards/melgeek/mj64/rev2/rev2.c
@@ -110,13 +110,4 @@ led_config_t g_led_config = {
110 } 110 }
111}; 111};
112 112
113void suspend_power_down_kb(void) {
114 rgb_matrix_set_suspend_state(true);
115 suspend_power_down_user();
116}
117
118void suspend_wakeup_init_kb(void) {
119 rgb_matrix_set_suspend_state(false);
120 suspend_wakeup_init_user();
121}
122#endif 113#endif
diff --git a/keyboards/melgeek/mj64/rev3/rev3.c b/keyboards/melgeek/mj64/rev3/rev3.c
index 7af80c7388..8555082e7d 100644
--- a/keyboards/melgeek/mj64/rev3/rev3.c
+++ b/keyboards/melgeek/mj64/rev3/rev3.c
@@ -116,13 +116,4 @@ led_config_t g_led_config = {
116 } 116 }
117}; 117};
118 118
119void suspend_power_down_kb(void) {
120 rgb_matrix_set_suspend_state(true);
121 suspend_power_down_user();
122}
123
124void suspend_wakeup_init_kb(void) {
125 rgb_matrix_set_suspend_state(false);
126 suspend_wakeup_init_user();
127}
128#endif 119#endif
diff --git a/keyboards/melgeek/mj65/rev3/rev3.c b/keyboards/melgeek/mj65/rev3/rev3.c
index 1392d5af4e..0a020fad74 100644
--- a/keyboards/melgeek/mj65/rev3/rev3.c
+++ b/keyboards/melgeek/mj65/rev3/rev3.c
@@ -120,14 +120,4 @@ led_config_t g_led_config = {
120 } 120 }
121}; 121};
122 122
123void suspend_power_down_kb(void) {
124 rgb_matrix_set_suspend_state(true);
125 suspend_power_down_user();
126}
127
128void suspend_wakeup_init_kb(void) {
129 rgb_matrix_set_suspend_state(false);
130 suspend_wakeup_init_user();
131}
132
133#endif 123#endif
diff --git a/keyboards/melgeek/mojo75/rev1/rev1.c b/keyboards/melgeek/mojo75/rev1/rev1.c
index 18daafebf8..60bb6eb850 100644
--- a/keyboards/melgeek/mojo75/rev1/rev1.c
+++ b/keyboards/melgeek/mojo75/rev1/rev1.c
@@ -139,14 +139,4 @@ led_config_t g_led_config = {
139 } 139 }
140}; 140};
141 141
142
143void suspend_power_down_kb(void) {
144 rgb_matrix_set_suspend_state(true);
145 suspend_power_down_user();
146}
147
148void suspend_wakeup_init_kb(void) {
149 rgb_matrix_set_suspend_state(false);
150 suspend_wakeup_init_user();
151}
152#endif 142#endif
diff --git a/keyboards/percent/canoe_gen2/canoe_gen2.c b/keyboards/percent/canoe_gen2/canoe_gen2.c
index 435083a269..6cbbed412d 100644
--- a/keyboards/percent/canoe_gen2/canoe_gen2.c
+++ b/keyboards/percent/canoe_gen2/canoe_gen2.c
@@ -18,15 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
18#include "quantum.h" 18#include "quantum.h"
19 19
20#ifdef RGB_MATRIX_ENABLE 20#ifdef RGB_MATRIX_ENABLE
21void suspend_power_down_kb(void) {
22 rgb_matrix_set_suspend_state(true);
23 suspend_power_down_user();
24}
25
26void suspend_wakeup_init_kb(void) {
27 rgb_matrix_set_suspend_state(false);
28 suspend_wakeup_init_user();
29}
30 21
31led_config_t g_led_config = { { 22led_config_t g_led_config = { {
32 // Key Matrix to LED Index 23 // Key Matrix to LED Index
diff --git a/keyboards/phase_studio/titan65/hotswap/hotswap.c b/keyboards/phase_studio/titan65/hotswap/hotswap.c
index 6df8319a83..1bcd581785 100644
--- a/keyboards/phase_studio/titan65/hotswap/hotswap.c
+++ b/keyboards/phase_studio/titan65/hotswap/hotswap.c
@@ -39,13 +39,4 @@ led_config_t g_led_config = {
39 } 39 }
40}; 40};
41 41
42void suspend_power_down_kb(void) {
43 rgb_matrix_set_suspend_state(true);
44 suspend_power_down_user();
45}
46
47void suspend_wakeup_init_kb(void) {
48 rgb_matrix_set_suspend_state(false);
49 suspend_wakeup_init_user();
50}
51#endif 42#endif
diff --git a/keyboards/phase_studio/titan65/hotswap/keyboard.json b/keyboards/phase_studio/titan65/hotswap/keyboard.json
index 8bf3152b90..956f508701 100644
--- a/keyboards/phase_studio/titan65/hotswap/keyboard.json
+++ b/keyboards/phase_studio/titan65/hotswap/keyboard.json
@@ -20,7 +20,8 @@
20 }, 20 },
21 "rgb_matrix": { 21 "rgb_matrix": {
22 "driver": "ws2812", 22 "driver": "ws2812",
23 "max_brightness": 150 23 "max_brightness": 150,
24 "sleep": true
24 }, 25 },
25 "matrix_pins": { 26 "matrix_pins": {
26 "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "C7", "F4", "F5", "F6"], 27 "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "F0", "F1", "C7", "F4", "F5", "F6"],
diff --git a/keyboards/planck/light/keyboard.json b/keyboards/planck/light/keyboard.json
index 33801562e5..dd1d69bf3c 100644
--- a/keyboards/planck/light/keyboard.json
+++ b/keyboards/planck/light/keyboard.json
@@ -54,7 +54,8 @@
54 "solid_splash": true, 54 "solid_splash": true,
55 "solid_multisplash": true 55 "solid_multisplash": true
56 }, 56 },
57 "driver": "is31fl3731" 57 "driver": "is31fl3731",
58 "sleep": true
58 }, 59 },
59 "features": { 60 "features": {
60 "audio": true, 61 "audio": true,
diff --git a/keyboards/planck/light/light.c b/keyboards/planck/light/light.c
index 8bbb8119c9..43487e2e21 100644
--- a/keyboards/planck/light/light.c
+++ b/keyboards/planck/light/light.c
@@ -115,18 +115,6 @@ uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t
115 return 0; 115 return 0;
116} 116}
117 117
118void suspend_power_down_kb(void)
119{
120 rgb_matrix_set_suspend_state(true);
121 suspend_power_down_user();
122}
123
124void suspend_wakeup_init_kb(void)
125{
126 rgb_matrix_set_suspend_state(false);
127 suspend_wakeup_init_user();
128}
129
130#ifdef SWAP_HANDS_ENABLE 118#ifdef SWAP_HANDS_ENABLE
131__attribute__ ((weak)) 119__attribute__ ((weak))
132const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { 120const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/sowbug/68keys/68keys.c b/keyboards/sowbug/68keys/68keys.c
index 8c7394d75b..df9681481f 100644
--- a/keyboards/sowbug/68keys/68keys.c
+++ b/keyboards/sowbug/68keys/68keys.c
@@ -33,13 +33,4 @@ led_config_t g_led_config = { {
33} 33}
34}; 34};
35 35
36void suspend_power_down_kb(void)
37{
38 rgb_matrix_set_suspend_state(true);
39}
40
41void suspend_wakeup_init_kb(void)
42{
43 rgb_matrix_set_suspend_state(false);
44}
45#endif // #ifdef RGB_MATRIX_ENABLE 36#endif // #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/sowbug/68keys/keyboard.json b/keyboards/sowbug/68keys/keyboard.json
index 2b8f7da3d5..7143f341b5 100644
--- a/keyboards/sowbug/68keys/keyboard.json
+++ b/keyboards/sowbug/68keys/keyboard.json
@@ -58,7 +58,8 @@
58 "solid_multisplash": true 58 "solid_multisplash": true
59 }, 59 },
60 "driver": "ws2812", 60 "driver": "ws2812",
61 "max_brightness": 128 61 "max_brightness": 128,
62 "sleep": true
62 }, 63 },
63 "features": { 64 "features": {
64 "bootmagic": true, 65 "bootmagic": true,
diff --git a/keyboards/sowbug/ansi_tkl/ansi_tkl.c b/keyboards/sowbug/ansi_tkl/ansi_tkl.c
index 284cd612dd..508bf62fe1 100644
--- a/keyboards/sowbug/ansi_tkl/ansi_tkl.c
+++ b/keyboards/sowbug/ansi_tkl/ansi_tkl.c
@@ -47,13 +47,4 @@ led_config_t g_led_config = {{
47 } 47 }
48}; 48};
49 49
50void suspend_power_down_kb(void)
51{
52 rgb_matrix_set_suspend_state(true);
53}
54
55void suspend_wakeup_init_kb(void)
56{
57 rgb_matrix_set_suspend_state(false);
58}
59#endif // #ifdef RGB_MATRIX_ENABLE 50#endif // #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/sowbug/ansi_tkl/keyboard.json b/keyboards/sowbug/ansi_tkl/keyboard.json
index 69f78cba6d..837e08a59e 100644
--- a/keyboards/sowbug/ansi_tkl/keyboard.json
+++ b/keyboards/sowbug/ansi_tkl/keyboard.json
@@ -58,7 +58,8 @@
58 "solid_multisplash": true 58 "solid_multisplash": true
59 }, 59 },
60 "driver": "ws2812", 60 "driver": "ws2812",
61 "max_brightness": 128 61 "max_brightness": 128,
62 "sleep": true
62 }, 63 },
63 "features": { 64 "features": {
64 "bootmagic": true, 65 "bootmagic": true,