summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-03-01 19:57:19 +0000
committerQMK Bot <hello@qmk.fm>2021-03-01 19:57:19 +0000
commit1beb6b686a7146a45e54b3ccb86923275310000a (patch)
tree7d70bb94138d2e81ba4fd137afda8071abca839f /keyboards
parent50290c78b6b904b9d2f1dbcfea4495966a755eda (diff)
parent3200007a69a078903f673d954310697f41fc1612 (diff)
downloadqmk_firmware-1beb6b686a7146a45e54b3ccb86923275310000a.tar.gz
qmk_firmware-1beb6b686a7146a45e54b3ccb86923275310000a.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/lily58/keymaps/default/keymap.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/keyboards/lily58/keymaps/default/keymap.c b/keyboards/lily58/keymaps/default/keymap.c
index b7cf34b2ea..2b34bf3e15 100644
--- a/keyboards/lily58/keymaps/default/keymap.c
+++ b/keyboards/lily58/keymaps/default/keymap.c
@@ -8,8 +8,6 @@
#include "ssd1306.h"
#endif
-extern uint8_t is_master;
-
enum layer_number {
_QWERTY = 0,
_LOWER,
@@ -107,13 +105,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
- if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
- layer_on(layer3);
- } else {
- layer_off(layer3);
- }
+layer_state_t layer_state_set_user(layer_state_t state) {
+ return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}
//SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk