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

This commit is contained in:
QMK Bot 2022-12-14 02:49:39 +00:00
commit becafaebd5
2 changed files with 12 additions and 2 deletions

View file

@ -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

View file

@ -1 +1,2 @@
VIA_ENABLE = yes
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes