masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
QMK Bot 2021-03-01 19:57:19 +00:00
parent 50290c78b6 3200007a69
commit 1beb6b686a
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
keyboards/lily58/keymaps/default/keymap.c
View File

@ -8,8 +8,6 @@
#include "ssd1306.h" #include "ssd1306.h"
#endif #endif
extern uint8_t is_master;
enum layer_number { enum layer_number {
_QWERTY = 0, _QWERTY = 0,
_LOWER, _LOWER,
@ -107,13 +105,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
) )
}; };
// Setting ADJUST layer RGB back to default layer_state_t layer_state_set_user(layer_state_t state) {
void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
layer_on(layer3);
} else {
layer_off(layer3);
}
} }
//SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk //SSD1306 OLED update loop, make sure to enable OLED_DRIVER_ENABLE=yes in rules.mk