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>

4 files changed, 12 insertions, 10 deletions

diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c
index f553874eb0..cb47824c80 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c
@@ -19,7 +19,7 @@
 static bool wpm_rgb_enabled = false;
 static uint8_t rgb_mode;
 
-void rgb_matrix_indicators_keymap(void) {
+bool rgb_matrix_indicators_keymap(void) {
     if (wpm_rgb_enabled && rgb_matrix_is_enabled()) {
         uint8_t wpm = get_current_wpm();
         dprintf("WPM = %d\n", wpm);
@@ -28,6 +28,7 @@ void rgb_matrix_indicators_keymap(void) {
         RGB rgb = hsv_to_rgb(hsv);
         rgb_matrix_set_color_all(rgb.r, rgb.g, rgb.b);
     }
+    return false;
 }
 
 bool process_record_fun(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c
index dda68fda2f..607606b3e7 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c
@@ -51,7 +51,7 @@ void suspend_wakeup_init_user(void) {
 }
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
     // Turn on sideglow when CAPS LOCK is activated
     if (host_keyboard_led_state().caps_lock) {
         HSV hsv = {CAPS_LOCK_COLOR};
@@ -64,5 +64,6 @@ void rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
             }
         }
     }
+    return false;
 }
 #endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
index d59b5cffc8..0106d80c14 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
@@ -15,9 +15,9 @@
  */
 #include "rgb_matrix_ledmaps.h"
 
-__attribute__((weak)) void rgb_matrix_indicators_keymap(void) { return; }
-__attribute__((weak)) void rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
-    return;
+__attribute__((weak)) bool rgb_matrix_indicators_keymap(void) { return true; }
+__attribute__((weak)) bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
+    return true;
 }
 
 #ifdef RGB_MATRIX_LEDMAPS_ENABLED
@@ -26,15 +26,15 @@ static bool enabled = true;
 
 #endif  // RGB_MATRIX_LEDMAPS_ENABLED
 
-void rgb_matrix_indicators_user(void) { rgb_matrix_indicators_keymap(); }
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_user(void) { return rgb_matrix_indicators_keymap(); }
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 #ifdef RGB_MATRIX_LEDMAPS_ENABLED
     if (rgb_matrix_is_enabled() && enabled) {
         set_layer_rgb(led_min, led_max, get_highest_layer(layer_state | default_layer_state));
     }
 
 #endif  // RGB_MATRIX_LEDMAPS_ENABLED
-    rgb_matrix_indicators_advanced_keymap(led_min, led_max);
+    return rgb_matrix_indicators_advanced_keymap(led_min, led_max);
 }
 
 #ifdef RGB_MATRIX_LEDMAPS_ENABLED
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
index b9b06309b2..931dfa0704 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
@@ -96,5 +96,5 @@ void rgb_matrix_layers_disable(void);
 
 #endif  // RGB_MATRIX_LEDMAPS_ENABLED
 
-void rgb_matrix_indicators_keymap(void);
-void rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max);
+bool rgb_matrix_indicators_keymap(void);
+bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max);