mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-07-16 12:51:47 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
cee6d727c9
@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
#if defined(ENCODER_MAP_ENABLE)
|
#if defined(ENCODER_MAP_ENABLE)
|
||||||
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
|
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
|
||||||
[WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
|
[WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
|
||||||
[WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
|
[WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
|
||||||
[MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
|
[MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
|
||||||
|
@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
#if defined(ENCODER_MAP_ENABLE)
|
#if defined(ENCODER_MAP_ENABLE)
|
||||||
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
|
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
|
||||||
[WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
|
[WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
|
||||||
[WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
|
[WIN_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
|
||||||
[MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
|
[MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
|
||||||
|
Loading…
Reference in New Issue
Block a user