From 19fe7dcaaa3d1494333feff6e19d4655efc693eb Mon Sep 17 00:00:00 2001 From: GG <72414103+spbgzh@users.noreply.github.com> Date: Tue, 11 Jan 2022 03:49:19 +0300 Subject: [PATCH] [Keyboard] Fixed bugs Wuque Mammoth Keyboard Series (#15700) --- keyboards/wuque/mammoth20x/config.h | 6 ++++++ keyboards/wuque/mammoth20x/keymaps/via/keymap.c | 4 ++-- keyboards/wuque/mammoth75x/config.h | 10 ++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/keyboards/wuque/mammoth20x/config.h b/keyboards/wuque/mammoth20x/config.h index a29ab2cb2..8fcfc0319 100644 --- a/keyboards/wuque/mammoth20x/config.h +++ b/keyboards/wuque/mammoth20x/config.h @@ -49,6 +49,12 @@ along with this program. If not, see . #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 c8f7c1bb8..e5fe34fd7 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, diff --git a/keyboards/wuque/mammoth75x/config.h b/keyboards/wuque/mammoth75x/config.h index 019a70f50..88ef0e547 100644 --- a/keyboards/wuque/mammoth75x/config.h +++ b/keyboards/wuque/mammoth75x/config.h @@ -49,9 +49,15 @@ along with this program. If not, see . #define ENCODERS_PAD_B { B1 } #define ENCODERS 1 + +#ifdef ENCODER_RESOLUTION + #undef ENCODER_RESOLUTION +#endif +#define ENCODER_RESOLUTION 2 + // Note: array is { col, row ) -#define ENCODERS_CW_KEY { { 5, 5 } } -#define ENCODERS_CCW_KEY { { 3, 5 } } +#define ENCODERS_CW_KEY { { 3, 5 } } +#define ENCODERS_CCW_KEY { { 5, 5 } } #define LED_CAPS_LOCK_PIN B6 #define LED_PIN_ON_STATE 0