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

This commit is contained in:
QMK Bot 2022-06-12 14:35:07 +00:00
commit 191c180644
2 changed files with 8 additions and 0 deletions

View file

@ -16,3 +16,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_MNXT, KC_MPRV) },
[1] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGDN, KC_PGUP) },
};
#endif

View file

@ -0,0 +1 @@
ENCODER_MAP_ENABLE = yes