summaryrefslogtreecommitdiffstats
path: root/keyboards/axolstudio/yeti
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2022-10-04 15:24:22 -0700
committerGitHub <noreply@github.com>2022-10-04 15:24:22 -0700
commit64b1ed45507a15d5594b1f90b936c2096918f5a4 (patch)
tree8824b1d4f55797d7608d3111a2755e919040e834 /keyboards/axolstudio/yeti
parent09d3e2771099ff1ca7e7bd8882644eb2b2807763 (diff)
Fix Per Key LED Indicator Callbacks (#18450)
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/axolstudio/yeti')
-rw-r--r--keyboards/axolstudio/yeti/hotswap/hotswap.c65
1 files changed, 34 insertions, 31 deletions
diff --git a/keyboards/axolstudio/yeti/hotswap/hotswap.c b/keyboards/axolstudio/yeti/hotswap/hotswap.c
index a8ccf7fc43..9d5efc208d 100644
--- a/keyboards/axolstudio/yeti/hotswap/hotswap.c
+++ b/keyboards/axolstudio/yeti/hotswap/hotswap.c
@@ -21,20 +21,20 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{ 0, B_1, A_1, C_1 },
{ 0, B_2, A_2, C_2 },
{ 0, B_3, A_3, C_3 },
- { 0, B_4, A_4, C_4 },
- { 0, B_5, A_5, C_5 },
- { 0, B_6, A_6, C_6 },
- { 0, B_7, A_7, C_7 },
- { 0, B_8, A_8, C_8 },
- { 0, B_9, A_9, C_9 },
- { 0, B_10, A_10, C_10 },
- { 0, B_11, A_11, C_11 },
- { 0, B_12, A_12, C_12 },
- { 0, B_13, A_13, C_13 },
+ { 0, B_4, A_4, C_4 },
+ { 0, B_5, A_5, C_5 },
+ { 0, B_6, A_6, C_6 },
+ { 0, B_7, A_7, C_7 },
+ { 0, B_8, A_8, C_8 },
+ { 0, B_9, A_9, C_9 },
+ { 0, B_10, A_10, C_10 },
+ { 0, B_11, A_11, C_11 },
+ { 0, B_12, A_12, C_12 },
+ { 0, B_13, A_13, C_13 },
{ 0, B_14, A_14, C_14 },
{ 0, B_15, A_15, C_15 },
-
- { 0, E_1, D_1, F_1 },
+
+ { 0, E_1, D_1, F_1 },
{ 0, E_2, D_2, F_2 },
{ 0, E_3, D_3, F_3 },
{ 0, E_4, D_4, F_4 },
@@ -46,13 +46,13 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{ 0, E_10, D_10, F_10 },
{ 0, E_11, D_11, F_11 },
{ 0, E_12, D_12, F_12 },
- { 0, E_13, D_13, F_13 },
- { 0, E_14, D_14, F_14 },
+ { 0, E_13, D_13, F_13 },
+ { 0, E_14, D_14, F_14 },
{ 0, E_15, D_15, F_15 },
-
- { 0, H_1, G_1, I_1 },
- { 0, H_2, G_2, I_2 },
- { 0, H_3, G_3, I_3 },
+
+ { 0, H_1, G_1, I_1 },
+ { 0, H_2, G_2, I_2 },
+ { 0, H_3, G_3, I_3 },
{ 0, H_4, G_4, I_4 },
{ 0, H_5, G_5, I_5 },
{ 0, H_6, G_6, I_6 },
@@ -67,25 +67,25 @@ const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = {
{ 0, K_2, J_2, L_2 },
{ 0, K_3, J_3, L_3 },
- { 0, K_4, J_4, L_4 },
+ { 0, K_4, J_4, L_4 },
{ 0, K_5, J_5, L_5 },
{ 0, K_6, J_6, L_6 },
- { 0, K_7, J_7, L_7 },
- { 0, K_8, J_8, L_8 },
- { 0, K_9, J_9, L_9 },
+ { 0, K_7, J_7, L_7 },
+ { 0, K_8, J_8, L_8 },
+ { 0, K_9, J_9, L_9 },
{ 0, K_10, J_10, L_10 },
- { 0, K_11, J_11, L_11 },
- { 0, K_12, J_12, L_12 },
- { 0, K_13, J_13, L_13 },
+ { 0, K_11, J_11, L_11 },
+ { 0, K_12, J_12, L_12 },
+ { 0, K_13, J_13, L_13 },
{ 0, K_14, J_14, L_14 },
{ 0, K_1, J_1, L_1 },
{ 0, K_16, J_16, L_16 },
{ 0, H_16, G_16, I_16 },
- { 0, E_16, D_16, F_16 },
- { 0, B_16, A_16, C_16 },
+ { 0, E_16, D_16, F_16 },
+ { 0, B_16, A_16, C_16 },
{ 0, H_15, G_15, I_15 },
- { 0, K_15, J_15, L_15 },
+ { 0, K_15, J_15, L_15 },
};
led_config_t g_led_config = {
@@ -102,7 +102,7 @@ led_config_t g_led_config = {
{16,48},{32,48},{48,48},{64,48},{80,48},{96,48},{112,48},{128,48},{144,48},{160,48},{176,48},{192,48},{224,48},
{16,64},{48,64},{80,64},{96,64},{128,64},{160,64},{224,64}
}, {
- 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+ 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
@@ -110,9 +110,12 @@ led_config_t g_led_config = {
}
};
#endif
-__attribute__ ((weak))
-void rgb_matrix_indicators_user(void) {
+bool rgb_matrix_indicators_kb(void) {
+ if (!rgb_matrix_indicators_user()) {
+ return false;
+ }
if (host_keyboard_led_state().caps_lock) {
rgb_matrix_set_color(31, 0xFF, 0xFF, 0xFF);
}
+ return true;
}