From 3200007a69a078903f673d954310697f41fc1612 Mon Sep 17 00:00:00 2001 From: Dan Carroll Date: Mon, 1 Mar 2021 14:56:42 -0500 Subject: [PATCH] Fixing adjust layer issue with the lily58 default keymap (#12052) * Fix triggering of adjust layer in default lily58 keymap * Remove unused extern * Swap raise/lower in update_tri_layer_state call to match recommendation in PR checklist --- keyboards/lily58/keymaps/default/keymap.c | 11 ++--------- 1 file 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