summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-09-13 20:15:39 +0000
committerQMK Bot <hello@qmk.fm>2021-09-13 20:15:39 +0000
commit508db37926dbc93dda0101bd1da2d779d22aead4 (patch)
tree11a622477dd5ceadcc79e664f34d27d8b72ccb61
parent55a8a52808cf1c5f7b15a08cecf05c65739d01b9 (diff)
parentca626f59a7fda63b65bf2a8d907af754a9707767 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/jacky_studio/bear_65/keymaps/stanrc85/keymap.c19
-rw-r--r--users/stanrc85/rgb_layers.c36
-rw-r--r--users/stanrc85/rules.mk4
3 files changed, 40 insertions, 19 deletions
diff --git a/keyboards/jacky_studio/bear_65/keymaps/stanrc85/keymap.c b/keyboards/jacky_studio/bear_65/keymaps/stanrc85/keymap.c
index 4772806340..7ee14dda8b 100644
--- a/keyboards/jacky_studio/bear_65/keymaps/stanrc85/keymap.c
+++ b/keyboards/jacky_studio/bear_65/keymaps/stanrc85/keymap.c
@@ -47,22 +47,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TG(_DEFAULT), _______, _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI
)
};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
- switch (get_highest_layer(state)) {
- case _FN1_60:
- break;
- case _FN2_60:
- rgb_matrix_mode_noeeprom(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
- break;
- case _DEFAULT:
- rgb_matrix_mode_noeeprom(RGB_MATRIX_MULTISPLASH);
- break;
- case _QWERTY:
- rgb_matrix_mode_noeeprom(RGB_MATRIX_TYPING_HEATMAP);
- break;
- default: // for any other layers, or the default layer
- break;
- }
- return state;
-}
diff --git a/users/stanrc85/rgb_layers.c b/users/stanrc85/rgb_layers.c
new file mode 100644
index 0000000000..7138323f23
--- /dev/null
+++ b/users/stanrc85/rgb_layers.c
@@ -0,0 +1,36 @@
+ /* Copyright 2021 Stanrc85
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "stanrc85.h"
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+ switch (get_highest_layer(state)) {
+ case _FN1_60:
+ break;
+ case _FN2_60:
+ rgb_matrix_mode_noeeprom(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
+ break;
+ case _DEFAULT:
+ rgb_matrix_mode_noeeprom(RGB_MATRIX_MULTISPLASH);
+ break;
+ case _QWERTY:
+ rgb_matrix_mode_noeeprom(RGB_MATRIX_TYPING_HEATMAP);
+ break;
+ default: // for any other layers, or the default layer
+ break;
+ }
+ return state;
+}
diff --git a/users/stanrc85/rules.mk b/users/stanrc85/rules.mk
index 45929575c3..cafda97b1a 100644
--- a/users/stanrc85/rules.mk
+++ b/users/stanrc85/rules.mk
@@ -35,6 +35,7 @@ ifeq ($(strip $(KEYBOARD)), jacky_studio/bear_65)
BACKLIGHT_ENABLE = yes
RGB_MATRIX_ENABLE = yes
RGBLIGHT_ENABLE = no
+ SRC += rgb_layers.c
endif
ifeq ($(strip $(KEYBOARD)), tkc/portico)
SRC += rgb_timeout.c
@@ -42,3 +43,6 @@ endif
ifeq ($(strip $(KEYBOARD)), kiwikey/wanderland)
SRC += rgb_timeout.c
endif
+ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/rgb_led/rev2)
+ SRC += rgb_layers.c
+endif