diff options
| author | QMK Bot <hello@qmk.fm> | 2022-12-14 02:49:39 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-12-14 02:49:39 +0000 |
| commit | 0fcf481cdd2a350b628462201b0a725df6c72b2b (patch) | |
| tree | a6b63837b6ffde832f53ae3b39c18fca9086cc52 /keyboards/boardsource/lulu/keymaps/via | |
| parent | e2117564c54044c809903627c0061b5a9d129815 (diff) | |
| parent | fecfb176b4e3de2867c4c8f5a407b26619511780 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/boardsource/lulu/keymaps/via')
| -rw-r--r-- | keyboards/boardsource/lulu/keymaps/via/keymap.c | 11 | ||||
| -rw-r--r-- | keyboards/boardsource/lulu/keymaps/via/rules.mk | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/keyboards/boardsource/lulu/keymaps/via/keymap.c b/keyboards/boardsource/lulu/keymaps/via/keymap.c index ac9efbfac1..67ef4b7b6b 100644 --- a/keyboards/boardsource/lulu/keymaps/via/keymap.c +++ b/keyboards/boardsource/lulu/keymaps/via/keymap.c @@ -5,8 +5,8 @@ enum layers { _QWERTY, - _RAISE, _LOWER, + _RAISE, _ADJUST }; @@ -102,3 +102,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______ ) }; + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) }, + [_LOWER] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, + [_RAISE] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, + [_ADJUST] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) } +}; +#endif diff --git a/keyboards/boardsource/lulu/keymaps/via/rules.mk b/keyboards/boardsource/lulu/keymaps/via/rules.mk index 036bd6d1c3..f1adcab005 100644 --- a/keyboards/boardsource/lulu/keymaps/via/rules.mk +++ b/keyboards/boardsource/lulu/keymaps/via/rules.mk @@ -1 +1,2 @@ -VIA_ENABLE = yes
\ No newline at end of file +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes |