From 64b1ed45507a15d5594b1f90b936c2096918f5a4 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 4 Oct 2022 15:24:22 -0700
Subject: 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>
---
 keyboards/idobao/id63/keymaps/idobao/keymap.c         |  3 ++-
 keyboards/idobao/id67/keymaps/idobao/keymap.c         |  3 ++-
 keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c  | 19 ++-----------------
 keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c |  3 ++-
 keyboards/idobao/id87/v2/keymaps/idobao/keymap.c      |  3 ++-
 5 files changed, 10 insertions(+), 21 deletions(-)

(limited to 'keyboards/idobao')

diff --git a/keyboards/idobao/id63/keymaps/idobao/keymap.c b/keyboards/idobao/id63/keymaps/idobao/keymap.c
index f49304fb24..df40dfa5a3 100644
--- a/keyboards/idobao/id63/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id63/keymaps/idobao/keymap.c
@@ -196,7 +196,7 @@ void eeconfig_init_user(void) {
     id63_update_rgb_mode();
 }
 
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     // Caps Lock key stuff
 
     if (host_keyboard_led_state().caps_lock) {
@@ -214,6 +214,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     } else if (user_config.rgb_disable_perkey) {
         rgb_matrix_set_color(ID63_CAPS_LOCK_KEY_INDEX, HSV_OFF);  // off
     }
+    return false;
 }
 
 #endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id67/keymaps/idobao/keymap.c b/keyboards/idobao/id67/keymaps/idobao/keymap.c
index 55ff6e5730..aadad80fb2 100644
--- a/keyboards/idobao/id67/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id67/keymaps/idobao/keymap.c
@@ -198,7 +198,7 @@ void eeconfig_init_user(void) {
     id67_update_rgb_mode();
 }
 
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     // Caps Lock key stuff
 
     if (host_keyboard_led_state().caps_lock) {
@@ -216,6 +216,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     } else if (user_config.rgb_disable_perkey) {
         rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, HSV_OFF);  // off
     }
+    return false;
 }
 
 #endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
index c0b79631d2..c90f1bf471 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -154,11 +154,7 @@ void keyboard_post_init_user(void) {
     isRGBOff = false;
 }
 
-void rgb_matrix_indicators_user(void) {
-    // do nothing, override base <<weak>> function to disable it
-}
-
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 
     uint8_t v = MIN( rgblight_get_val() + RGB_BRIGHTER_BY, 0xFF );
     uint8_t current_layer = get_highest_layer(layer_state);
@@ -239,18 +235,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             }
             break;
     }
-}
-
-/*
- * Sleep mode stuff (untested)
- */
-
-void suspend_power_down_user(void) {
-    rgb_matrix_set_suspend_state(true);
-}
-
-void suspend_wakeup_init_user(void) {
-    rgb_matrix_set_suspend_state(false);
+    return false;
 }
 
 #endif
diff --git a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
index e0d786e5e2..947863653c 100644
--- a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
@@ -196,7 +196,7 @@ void eeconfig_init_user(void) {
     id80_update_rgb_mode();
 }
 
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     // Caps Lock key stuff
 
     if (host_keyboard_led_state().caps_lock) {
@@ -214,6 +214,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     } else if (user_config.rgb_disable_perkey) {
         rgb_matrix_set_color(ID80_CAPS_LOCK_KEY_INDEX, HSV_OFF);  // off
     }
+    return false;
 }
 
 #endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
index 59b60b7e1d..31787a2e42 100644
--- a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
@@ -180,7 +180,7 @@ void eeconfig_init_user(void) {
     id87_update_rgb_mode();
 }
 
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     // Caps Lock key stuff
 
     if (host_keyboard_led_state().caps_lock) {
@@ -198,6 +198,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     } else if (user_config.rgb_disable_perkey) {
         rgb_matrix_set_color(ID87_CAPS_LOCK_KEY_INDEX, HSV_OFF);  // off
     }
+    return false;
 }
 
 #endif  // RGB_MATRIX_ENABLE
-- 
cgit v1.2.3