diff options
| author | QMK Bot <hello@qmk.fm> | 2022-01-11 00:49:20 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-01-11 00:49:20 +0000 |
| commit | 184f4b38c857b298e5cc334e680459d1f9e263e6 (patch) | |
| tree | 0d09f043921fb2440853d4ae5d2d42a74ad6bebf /keyboards/wuque/mammoth20x | |
| parent | 93149711f6d34daed62dca9c7455e9d1902f7950 (diff) | |
| parent | 19fe7dcaaa3d1494333feff6e19d4655efc693eb (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/wuque/mammoth20x')
| -rw-r--r-- | keyboards/wuque/mammoth20x/config.h | 6 | ||||
| -rw-r--r-- | keyboards/wuque/mammoth20x/keymaps/via/keymap.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/keyboards/wuque/mammoth20x/config.h b/keyboards/wuque/mammoth20x/config.h index a29ab2cb21..8fcfc03195 100644 --- a/keyboards/wuque/mammoth20x/config.h +++ b/keyboards/wuque/mammoth20x/config.h @@ -49,6 +49,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define ENCODERS_PAD_B { D2 } #define ENCODERS 1 + +#ifdef ENCODER_RESOLUTION + #undef ENCODER_RESOLUTION +#endif +#define ENCODER_RESOLUTION 2 + // Note: array is { col, row ) #define ENCODERS_CW_KEY { { 3, 2 } } #define ENCODERS_CCW_KEY { { 3, 4 } } diff --git a/keyboards/wuque/mammoth20x/keymaps/via/keymap.c b/keyboards/wuque/mammoth20x/keymaps/via/keymap.c index c8f7c1bb85..e5fe34fd7b 100644 --- a/keyboards/wuque/mammoth20x/keymaps/via/keymap.c +++ b/keyboards/wuque/mammoth20x/keymaps/via/keymap.c @@ -18,8 +18,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_ESC, KC_PAUS, KC_DEL, KC_VOLU, KC_MUTE, KC_VOLD, - KC_LNUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_ESC, KC_PAUS, KC_DEL, KC_VOLD, KC_MUTE, KC_VOLU, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_P7, KC_P8, KC_P9, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P1, KC_P2, KC_P3, |