diff options
author | QMK Bot <[email protected]> | 2023-07-01 01:36:50 +0000 |
---|---|---|
committer | QMK Bot <[email protected]> | 2023-07-01 01:36:50 +0000 |
commit | 2b4a93a38523311af88830ddc6a04d5446ed5386 (patch) | |
tree | edd23babdaf3c795c73573c76b740e923fbaabd8 /keyboards/keebio/iris/keymaps | |
parent | 66a169388de0370f5050eabaf80e97cf2373c606 (diff) | |
parent | 6a61e2eeeec0827dfbe8226ef528143f35ab2457 (diff) | |
download | qmk_firmware-2b4a93a38523311af88830ddc6a04d5446ed5386.tar.gz qmk_firmware-2b4a93a38523311af88830ddc6a04d5446ed5386.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/keebio/iris/keymaps')
-rw-r--r-- | keyboards/keebio/iris/keymaps/via/keymap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/keebio/iris/keymaps/via/keymap.c b/keyboards/keebio/iris/keymaps/via/keymap.c index 7f793333cc..c2753da2a4 100644 --- a/keyboards/keebio/iris/keymaps/via/keymap.c +++ b/keyboards/keebio/iris/keymaps/via/keymap.c @@ -71,8 +71,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #ifdef ENCODER_MAP_ENABLE const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { -# if defined(KEYBOARD_keebio_iris_rev7) - [_MAIN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, +# if defined(KEYBOARD_keebio_iris_rev7) || defined(KEYBOARD_keebio_iris_rev8) + [_MAIN] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_FN1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_HOME, KC_END) }, [_FN2] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [_FN3] = { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_UP, KC_DOWN) }, |