Resolved issues

qmk · Dec 15, 2022 · 6de8dca · 6de8dca
1 parent 64dce94
commit 6de8dca
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 69 deletions.
diff --git a/keyboards/phage_studio/pila87/keymaps/default/keymap.c b/keyboards/phage_studio/pila87/keymaps/default/keymap.c
@@ -17,11 +17,6 @@
 
 #include QMK_KEYBOARD_H
 
-#include <string.h>
-#include <math.h>
-
-#include <lib/lib8tion/lib8tion.h>
-
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -178,23 +173,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 	}
     return true;
 }
-
-bool rgb_matrix_indicators_user(void) {
-    HSV      hsv = rgb_matrix_config.hsv;
-    uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
-    hsv.h        = time;
-    RGB      rgb = hsv_to_rgb(hsv);
-
-    if ((rgb_matrix_get_flags() & LED_FLAG_ALL)) {
-        if (host_keyboard_led_state().caps_lock) {
-            rgb_matrix_set_color(40, rgb.r, rgb.g, rgb.b);
-        }
-    } else {
-        if (host_keyboard_led_state().caps_lock) {
-            rgb_matrix_set_color(40, rgb.r, rgb.g, rgb.b);
-        } else {
-            rgb_matrix_set_color(40, 0, 0, 0);
-        }
-    }
-    return false;
-}
diff --git a/keyboards/phage_studio/pila87/keymaps/horrortroll/keymap_stuff.h b/keyboards/phage_studio/pila87/keymaps/horrortroll/keymap_stuff.h
@@ -16,7 +16,6 @@
 
 #include <string.h>
 #include <math.h>
-
 #include <lib/lib8tion/lib8tion.h>
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
@@ -222,24 +221,16 @@ bool rgb_matrix_indicators_user(void) {
     hsv.h        = time;
     RGB      rgb = hsv_to_rgb(hsv);
 
-    if ((rgb_matrix_get_flags() & LED_FLAG_ALL)) {
-        if (host_keyboard_led_state().caps_lock) {
-            rgb_matrix_set_color(40, rgb.r, rgb.g, rgb.b);
-        }
-        if (host_keyboard_led_state().scroll_lock) {
-            rgb_matrix_set_color(89, rgb.r, rgb.g, rgb.b);
-        }
-    } else {
-        if (host_keyboard_led_state().caps_lock) {
-            rgb_matrix_set_color(40, rgb.r, rgb.g, rgb.b);
-        } else {
-            rgb_matrix_set_color(40, 0, 0, 0);
-        }
-        if (host_keyboard_led_state().scroll_lock) {
-            rgb_matrix_set_color(89, rgb.r, rgb.g, rgb.b);
-        } else {
-            rgb_matrix_set_color(89, 0, 0, 0);
-        }
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(40, rgb.r, rgb.g, rgb.b);
+    } else if (!(rgb_matrix_get_flags() & LED_FLAG_INDICATOR)) {
+        rgb_matrix_set_color(40, 0, 0, 0);
+    }
+
+    if (host_keyboard_led_state().scroll_lock) {
+        rgb_matrix_set_color(89, rgb.r, rgb.g, rgb.b);
+    } else if (!(rgb_matrix_get_flags() & LED_FLAG_INDICATOR)) {
+        rgb_matrix_set_color(89, 0, 0, 0);
     }
     return false;
 }
diff --git a/keyboards/phage_studio/pila87/keymaps/via/keymap.c b/keyboards/phage_studio/pila87/keymaps/via/keymap.c
@@ -17,11 +17,6 @@
 
 #include QMK_KEYBOARD_H
 
-#include <string.h>
-#include <math.h>
-
-#include <lib/lib8tion/lib8tion.h>
-
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -178,23 +173,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 	}
     return true;
 }
-
-bool rgb_matrix_indicators_user(void) {
-    HSV      hsv = rgb_matrix_config.hsv;
-    uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
-    hsv.h        = time;
-    RGB      rgb = hsv_to_rgb(hsv);
-
-    if ((rgb_matrix_get_flags() & LED_FLAG_ALL)) {
-        if (host_keyboard_led_state().caps_lock) {
-            rgb_matrix_set_color(40, rgb.r, rgb.g, rgb.b);
-        }
-    } else {
-        if (host_keyboard_led_state().caps_lock) {
-            rgb_matrix_set_color(40, rgb.r, rgb.g, rgb.b);
-        } else {
-            rgb_matrix_set_color(40, 0, 0, 0);
-        }
-    }
-    return false;
-}
diff --git a/keyboards/phage_studio/pila87/pila87.c b/keyboards/phage_studio/pila87/pila87.c
@@ -17,6 +17,10 @@
 
 #include "pila87.h"
 
+#include <string.h>
+#include <math.h>
+#include <lib/lib8tion/lib8tion.h>
+
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
     { 75, NO_LED,     76,     77,     78,     79,     80,     81,     82,     83,     84,     85,     86,     87,     88,     89,     90 },
@@ -41,3 +45,21 @@ led_config_t g_led_config = { {
    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8,    4,
 } };
 #endif
+
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+
+    HSV      hsv = rgb_matrix_config.hsv;
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
+    hsv.h        = time;
+    RGB      rgb = hsv_to_rgb(hsv);
+
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(40, rgb.r, rgb.g, rgb.b);
+    } else if (!(rgb_matrix_get_flags() & LED_FLAG_INDICATOR)) {
+        rgb_matrix_set_color(40, 0, 0, 0);
+    }
+    return true;
+}