diff options
| author | fauxpark <fauxpark@gmail.com> | 2022-10-06 04:47:34 +1100 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2022-10-06 04:47:34 +1100 |
| commit | 4d0177cd2a51606d104ca21c9720c632fdca4308 (patch) | |
| tree | c5f6d46122a381519867dc2c7168cf5ec28633cb /keyboards/gmmk/pro/rev2/ansi | |
| parent | 49030e3e5bdd412f44a886be6349ebfd2c05bbf2 (diff) | |
| parent | fe6f707a856044c754911b6b742f5518b3caaa22 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/gmmk/pro/rev2/ansi')
| -rw-r--r-- | keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c | 16 | ||||
| -rw-r--r-- | keyboards/gmmk/pro/rev2/ansi/keymaps/default/rules.mk | 1 |
2 files changed, 7 insertions, 10 deletions
diff --git a/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c index dc56a9ff8f..30fd283d7d 100644 --- a/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c +++ b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/keymap.c @@ -60,13 +60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; // clang-format on -#ifdef ENCODER_ENABLE -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return false; -} -#endif // ENCODER_ENABLE +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) } +}; +#endif
\ No newline at end of file diff --git a/keyboards/gmmk/pro/rev2/ansi/keymaps/default/rules.mk b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/rules.mk new file mode 100644 index 0000000000..a40474b4d5 --- /dev/null +++ b/keyboards/gmmk/pro/rev2/ansi/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes
\ No newline at end of file |