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>

2 files changed, 47 insertions, 38 deletions

diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rev1.c b/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
index 6b1b8604a2..b61ac10b14 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
+++ b/keyboards/mechlovin/hannah60rgb/rev1/rev1.c
@@ -27,21 +27,26 @@ led_config_t g_led_config = { {
 }, {
   //LED Index to Physical Positon
   {  0,  0},  { 16,  0},  { 32, 0 },  { 48, 0 },  { 64, 0},   { 80, 0},   { 96, 0},   { 112, 0},  { 128, 0},  { 144, 0},  { 160, 0},  { 176, 0},    {192,  0},   {208,  0},   {216, 0},
-  {220, 0},   {211, 16},  {200,16 },  {176,16 },  {160,16},   {144,16},   {128,16},   { 112,16},  { 96,16},   { 80,16},   { 64,16},   { 48,16},     {32, 16},    {16, 16},    {0,16}, 
-  {  0, 32},  { 16, 32},  { 32,32 },  { 48,32 },  { 64,32},   { 80,32},   { 96,32},   { 112,32},  { 128,32},  { 144,32},  { 160,32},  { 176,32},    {192, 32},   {208, 32},   {224,48}, 
-  {208, 48},  {192, 48},  {160,48 },  {144,48 },  {128,48},   {112,48},   {96,48},    { 80,48},   { 64,48},   { 48,48},   { 32,48},   { 16,48},     {8, 48},     {0, 48},     {0,48}, 
-  {  0, 64},  { 16, 64},  { 32,64 },  { 48,64 },  { 64,64},   { 80,64},   { 96,64},   { 112,64},  { 144,64},  { 160,64},  { 192,64},  { 224,64},                         
+  {220, 0},   {211, 16},  {200,16 },  {176,16 },  {160,16},   {144,16},   {128,16},   { 112,16},  { 96,16},   { 80,16},   { 64,16},   { 48,16},     {32, 16},    {16, 16},    {0,16},
+  {  0, 32},  { 16, 32},  { 32,32 },  { 48,32 },  { 64,32},   { 80,32},   { 96,32},   { 112,32},  { 128,32},  { 144,32},  { 160,32},  { 176,32},    {192, 32},   {208, 32},   {224,48},
+  {208, 48},  {192, 48},  {160,48 },  {144,48 },  {128,48},   {112,48},   {96,48},    { 80,48},   { 64,48},   { 48,48},   { 32,48},   { 16,48},     {8, 48},     {0, 48},     {0,48},
+  {  0, 64},  { 16, 64},  { 32,64 },  { 48,64 },  { 64,64},   { 80,64},   { 96,64},   { 112,64},  { 144,64},  { 160,64},  { 192,64},  { 224,64},
 }, {
   1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,
-  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,  
-  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,  
-  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,  
-  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1, 
+  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,
+  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,
+  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,
+  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,
 } };
 
-void rgb_matrix_indicators_user(void) {
-        if (host_keyboard_led_state().caps_lock) {
-            rgb_matrix_set_color(30, 255, 255, 255);
-        }
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(30, 255, 255, 255);
+    }
+    return true;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rev2.c b/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
index bb88a316ea..a2812aa41d 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
+++ b/keyboards/mechlovin/hannah60rgb/rev2/rev2.c
@@ -123,8 +123,8 @@ led_config_t g_led_config = { {
   {  0,  0},  { 16,  0},  { 32, 0 },  { 48,  0}, //9-59-68-76
   {  0, 16},  { 16, 16},  { 32, 16},  { 48, 16}, //10-60-72-77
   {  0, 32},  { 16, 32},  { 32, 32},  { 48, 32}, //46-61-73-78
-  {  0, 48},  {  0, 48},  { 12, 48},  { 16, 48}, //126-51-63-74  
-  {  0, 64},  { 16, 64}, //56-67  
+  {  0, 48},  {  0, 48},  { 12, 48},  { 16, 48}, //126-51-63-74
+  {  0, 64},  { 16, 64}, //56-67
   { 64,  0},  { 80,  0},   { 96, 0},  { 112, 0}, //80-84-89-94
   { 64, 16},  { 80, 16},   { 96,16},  { 112,16}, //81-85-90-95
   { 64, 32},  { 80, 32},   { 96,32},  { 112,32}, //82-86-91-96
@@ -133,34 +133,38 @@ led_config_t g_led_config = { {
   { 128, 0},  { 144, 0},  { 160, 0},  { 176, 0},    {192,  0},   {220,  0},   {210, 0}, //98-102-106-111-116-121-130
   { 128,16},   {144,16},   {160,16},  {176, 16},    {192, 16},   {220, 16},   {220,16}, //99-103-107-112-117-129-122
   { 128,32},  { 144,32},  { 160,32},  { 176,32},    {192, 32},   {220, 32}, //100-104-108-113-118-123
-  {  96,48},   {112,48},  {128, 48},  {144, 48},    {160, 48},   {200, 48},   {220,48},   {220,48}, //97-101-105-109-114-119-128-124 
+  {  96,48},   {112,48},  {128, 48},  {144, 48},    {160, 48},   {200, 48},   {220,48},   {220,48}, //97-101-105-109-114-119-128-124
   {  96,64},   {144,64},   {160,64},   {176,64},    {220, 64}, //127-110-115-120-125
-  { 220, 0},   //140                  
+  { 220, 0},   //140
 }, {
   1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,
-  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,  
-  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,  
-  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,  
-  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1, 
+  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,
+  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,
+  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,
+  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,
 } };
 
-__attribute__((weak)) void rgb_matrix_indicators_user(void) {
-        if (host_keyboard_led_state().caps_lock) {
-            rgb_matrix_set_color(8, 255, 255, 255);
-            rgb_matrix_set_color(70, 255, 0, 0);
-        } else {
-            rgb_matrix_set_color(70, 0, 0, 0);
-        }
-        if (host_keyboard_led_state().num_lock) {
-            rgb_matrix_set_color(71, 255, 0, 0);
-        } else {
-            rgb_matrix_set_color(71, 0, 0, 0);
-        }
-        if (host_keyboard_led_state().scroll_lock) {
-            rgb_matrix_set_color(72, 255, 0, 0);
-        } else {
-            rgb_matrix_set_color(72, 0, 0, 0);
-        }
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(8, 255, 255, 255);
+        rgb_matrix_set_color(70, 255, 0, 0);
+    } else {
+        rgb_matrix_set_color(70, 0, 0, 0);
+    }
+    if (host_keyboard_led_state().num_lock) {
+        rgb_matrix_set_color(71, 255, 0, 0);
+    } else {
+        rgb_matrix_set_color(71, 0, 0, 0);
+    }
+    if (host_keyboard_led_state().scroll_lock) {
+        rgb_matrix_set_color(72, 255, 0, 0);
+    } else {
+        rgb_matrix_set_color(72, 0, 0, 0);
+    }
+    return true;
 }
 
 __attribute__((weak))