diff options
| author | fauxpark <fauxpark@gmail.com> | 2022-10-29 16:54:14 +1100 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2022-10-29 16:54:14 +1100 |
| commit | 9d717c85dc184c0e34b40251b5703ae3626f571e (patch) | |
| tree | 9ef6e296e81a48b7c6f5d265e52e571b8a5bc3ba /keyboards/rart/rart4x4 | |
| parent | 22be7e79ac6a328ed5a7dc8c4e6f17d749852221 (diff) | |
| parent | e90ff84c31905932849164204c10ea58255ddad2 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/rart/rart4x4')
| -rw-r--r-- | keyboards/rart/rart4x4/keymaps/via/keymap.c | 24 | ||||
| -rw-r--r-- | keyboards/rart/rart4x4/keymaps/via/rules.mk | 1 |
2 files changed, 9 insertions, 16 deletions
diff --git a/keyboards/rart/rart4x4/keymaps/via/keymap.c b/keyboards/rart/rart4x4/keymaps/via/keymap.c index ed36da9781..764021ec26 100644 --- a/keyboards/rart/rart4x4/keymaps/via/keymap.c +++ b/keyboards/rart/rart4x4/keymaps/via/keymap.c @@ -44,19 +44,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code(KC_WH_U); - } else { - tap_code(KC_WH_D); - } - } else if (index == 1) { /* Second encoder */ - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } - return true; -} +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } +}; +#endif
\ No newline at end of file diff --git a/keyboards/rart/rart4x4/keymaps/via/rules.mk b/keyboards/rart/rart4x4/keymaps/via/rules.mk index 1e5b99807c..f1adcab005 100644 --- a/keyboards/rart/rart4x4/keymaps/via/rules.mk +++ b/keyboards/rart/rart4x4/keymaps/via/rules.mk @@ -1 +1,2 @@ VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes |