1
0
Fork 0

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-09-13 20:15:39 +00:00
commit 508db37926
3 changed files with 40 additions and 19 deletions

View file

@ -47,22 +47,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TG(_DEFAULT), _______, _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI 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;
}

View file

@ -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;
}

View file

@ -35,6 +35,7 @@ ifeq ($(strip $(KEYBOARD)), jacky_studio/bear_65)
BACKLIGHT_ENABLE = yes BACKLIGHT_ENABLE = yes
RGB_MATRIX_ENABLE = yes RGB_MATRIX_ENABLE = yes
RGBLIGHT_ENABLE = no RGBLIGHT_ENABLE = no
SRC += rgb_layers.c
endif endif
ifeq ($(strip $(KEYBOARD)), tkc/portico) ifeq ($(strip $(KEYBOARD)), tkc/portico)
SRC += rgb_timeout.c SRC += rgb_timeout.c
@ -42,3 +43,6 @@ endif
ifeq ($(strip $(KEYBOARD)), kiwikey/wanderland) ifeq ($(strip $(KEYBOARD)), kiwikey/wanderland)
SRC += rgb_timeout.c SRC += rgb_timeout.c
endif endif
ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/rgb_led/rev2)
SRC += rgb_layers.c
endif