diff options
| author | Dan Carroll <dancarroll@gmail.com> | 2021-03-01 14:56:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-01 19:56:42 +0000 |
| commit | 3200007a69a078903f673d954310697f41fc1612 (patch) | |
| tree | 95e5407baa0481be91ff5e5bc1d2452cbbdb16ed /keyboards/lily58 | |
| parent | 7132526dd276ac637757ddff7ab6f57f64ebb84c (diff) | |
| download | qmk_firmware-3200007a69a078903f673d954310697f41fc1612.tar.gz qmk_firmware-3200007a69a078903f673d954310697f41fc1612.zip | |
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
Diffstat (limited to 'keyboards/lily58')
| -rw-r--r-- | keyboards/lily58/keymaps/default/keymap.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/keyboards/lily58/keymaps/default/keymap.c b/keyboards/lily58/keymaps/default/keymap.c index b7cf34b2e..2b34bf3e1 100644 --- a/keyboards/lily58/keymaps/default/keymap.c +++ b/keyboards/lily58/keymaps/default/keymap.c | |||
| @@ -8,8 +8,6 @@ | |||
| 8 | #include "ssd1306.h" | 8 | #include "ssd1306.h" |
| 9 | #endif | 9 | #endif |
| 10 | 10 | ||
| 11 | extern uint8_t is_master; | ||
| 12 | |||
| 13 | enum layer_number { | 11 | enum layer_number { |
| 14 | _QWERTY = 0, | 12 | _QWERTY = 0, |
| 15 | _LOWER, | 13 | _LOWER, |
| @@ -107,13 +105,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 107 | ) | 105 | ) |
| 108 | }; | 106 | }; |
| 109 | 107 | ||
| 110 | // Setting ADJUST layer RGB back to default | 108 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 111 | void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { | 109 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 112 | if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) { | ||
| 113 | layer_on(layer3); | ||
| 114 | } else { | ||
| 115 | layer_off(layer3); | ||
| 116 | } | ||
| 117 | } | 110 | } |
| 118 | 111 | ||
| 119 | //SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk | 112 | //SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk |
