mirror of
https://github.com/qmk/qmk_firmware
synced 2024-11-16 17:04:50 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
191c180644
2 changed files with 8 additions and 0 deletions
|
@ -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
|
||||||
|
|
||||||
|
|
1
keyboards/macro3/keymaps/default/rules.mk
Normal file
1
keyboards/macro3/keymaps/default/rules.mk
Normal file
|
@ -0,0 +1 @@
|
||||||
|
ENCODER_MAP_ENABLE = yes
|
Loading…
Reference in a new issue