From 9e1f3802e3aad07a2e3eb35de24f7a2bc90a40dc Mon Sep 17 00:00:00 2001 From: spbgzh Date: Sun, 2 Jan 2022 05:48:47 +0300 Subject: [PATCH 01/10] Bug fixed in Wuque Mamammoth Series --- keyboards/wuque/mammoth20x/config.h | 5 +++++ keyboards/wuque/mammoth20x/keymaps/via/keymap.c | 4 ++-- keyboards/wuque/mammoth75x/config.h | 7 +++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/keyboards/wuque/mammoth20x/config.h b/keyboards/wuque/mammoth20x/config.h index a29ab2cb218c..cd65297bfdb1 100644 --- a/keyboards/wuque/mammoth20x/config.h +++ b/keyboards/wuque/mammoth20x/config.h @@ -49,6 +49,11 @@ 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 c8f7c1bb8548..02c3f4a24b91 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 019a70f50d97..d808a29c2359 100644 --- a/keyboards/wuque/mammoth75x/config.h +++ b/keyboards/wuque/mammoth75x/config.h @@ -49,9 +49,16 @@ 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 LED_CAPS_LOCK_PIN B6 #define LED_PIN_ON_STATE 0 + From 449e08d2765e5984ac90c12d15d43d699415993d Mon Sep 17 00:00:00 2001 From: GG <72414103+spbgzh@users.noreply.github.com> Date: Sun, 2 Jan 2022 05:57:19 +0300 Subject: [PATCH 02/10] Update config.h --- keyboards/wuque/mammoth75x/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/wuque/mammoth75x/config.h b/keyboards/wuque/mammoth75x/config.h index d808a29c2359..40597e470764 100644 --- a/keyboards/wuque/mammoth75x/config.h +++ b/keyboards/wuque/mammoth75x/config.h @@ -61,4 +61,3 @@ along with this program. If not, see . #define LED_CAPS_LOCK_PIN B6 #define LED_PIN_ON_STATE 0 - From 7cb12fe81f665c4272259ced98584329779e0c8d Mon Sep 17 00:00:00 2001 From: GG <72414103+spbgzh@users.noreply.github.com> Date: Sun, 2 Jan 2022 06:02:14 +0300 Subject: [PATCH 03/10] Update config.h --- keyboards/wuque/mammoth75x/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/wuque/mammoth75x/config.h b/keyboards/wuque/mammoth75x/config.h index 40597e470764..88ef0e547707 100644 --- a/keyboards/wuque/mammoth75x/config.h +++ b/keyboards/wuque/mammoth75x/config.h @@ -56,8 +56,8 @@ along with this program. If not, see . #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 From 97debb494c2ae29c00c76a6f89eacf62b9fa1ec6 Mon Sep 17 00:00:00 2001 From: GG <72414103+spbgzh@users.noreply.github.com> Date: Sun, 2 Jan 2022 06:56:34 +0300 Subject: [PATCH 04/10] Update config.h --- keyboards/wuque/mammoth20x/config.h | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/wuque/mammoth20x/config.h b/keyboards/wuque/mammoth20x/config.h index cd65297bfdb1..8fcfc0319531 100644 --- a/keyboards/wuque/mammoth20x/config.h +++ b/keyboards/wuque/mammoth20x/config.h @@ -54,6 +54,7 @@ along with this program. If not, see . #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 } } From 6d3621075b908347dfed566f54b9b8ef244fdfff Mon Sep 17 00:00:00 2001 From: spbgzh Date: Fri, 14 Jan 2022 15:59:41 +0300 Subject: [PATCH 05/10] bug fixed zoom65 and zoom65_lite --- keyboards/meletrix/zoom65/config.h | 6 ++++++ keyboards/meletrix/zoom65_lite/config.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/keyboards/meletrix/zoom65/config.h b/keyboards/meletrix/zoom65/config.h index 4eb85aeb4960..6f13bd3d0aa5 100644 --- a/keyboards/meletrix/zoom65/config.h +++ b/keyboards/meletrix/zoom65/config.h @@ -42,6 +42,12 @@ #define ENCODERS_PAD_B { B0 } #define ENCODERS 1 + +#ifdef ENCODER_RESOLUTION + #undef ENCODER_RESOLUTION +#endif +#define ENCODER_RESOLUTION 2 + // Note: array is { col, row ) #define ENCODERS_CW_KEY { { 5, 4 } } #define ENCODERS_CCW_KEY { { 3, 4 } } diff --git a/keyboards/meletrix/zoom65_lite/config.h b/keyboards/meletrix/zoom65_lite/config.h index 062bda879432..5fe35cf2a32d 100644 --- a/keyboards/meletrix/zoom65_lite/config.h +++ b/keyboards/meletrix/zoom65_lite/config.h @@ -42,6 +42,12 @@ #define ENCODERS_PAD_B { B0 } #define ENCODERS 1 + +#ifdef ENCODER_RESOLUTION + #undef ENCODER_RESOLUTION +#endif +#define ENCODER_RESOLUTION 2 + // Note: array is { col, row ) #define ENCODERS_CW_KEY { { 5, 4 } } #define ENCODERS_CCW_KEY { { 3, 4 } } From c0999e9ed13a2a8006a2b7192f469d65f36ff860 Mon Sep 17 00:00:00 2001 From: GG <72414103+spbgzh@users.noreply.github.com> Date: Fri, 14 Jan 2022 16:05:57 +0300 Subject: [PATCH 06/10] Update keymap.c --- keyboards/wuque/mammoth20x/keymaps/via/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/wuque/mammoth20x/keymaps/via/keymap.c b/keyboards/wuque/mammoth20x/keymaps/via/keymap.c index 02c3f4a24b91..c8f7c1bb8548 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_VOLD, KC_MUTE, KC_VOLU, - KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_ESC, KC_PAUS, KC_DEL, KC_VOLU, KC_MUTE, KC_VOLD, + KC_LNUM, 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, From 8b545f19803dac4e5011a62c8c62342fc0731aef Mon Sep 17 00:00:00 2001 From: GG <72414103+spbgzh@users.noreply.github.com> Date: Fri, 14 Jan 2022 16:06:20 +0300 Subject: [PATCH 07/10] Update config.h --- keyboards/wuque/mammoth75x/config.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/keyboards/wuque/mammoth75x/config.h b/keyboards/wuque/mammoth75x/config.h index 88ef0e547707..019a70f50d97 100644 --- a/keyboards/wuque/mammoth75x/config.h +++ b/keyboards/wuque/mammoth75x/config.h @@ -49,15 +49,9 @@ 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 { { 3, 5 } } -#define ENCODERS_CCW_KEY { { 5, 5 } } +#define ENCODERS_CW_KEY { { 5, 5 } } +#define ENCODERS_CCW_KEY { { 3, 5 } } #define LED_CAPS_LOCK_PIN B6 #define LED_PIN_ON_STATE 0 From c0818e683923d8ce10cfc838c0a3d91e0a7038d1 Mon Sep 17 00:00:00 2001 From: GG <72414103+spbgzh@users.noreply.github.com> Date: Fri, 14 Jan 2022 16:06:40 +0300 Subject: [PATCH 08/10] Update config.h --- keyboards/wuque/mammoth20x/config.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/keyboards/wuque/mammoth20x/config.h b/keyboards/wuque/mammoth20x/config.h index 8fcfc0319531..a29ab2cb218c 100644 --- a/keyboards/wuque/mammoth20x/config.h +++ b/keyboards/wuque/mammoth20x/config.h @@ -49,12 +49,6 @@ 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 } } From 984e342c6d4c690440852f0beb6ea3459d652a37 Mon Sep 17 00:00:00 2001 From: GG <72414103+spbgzh@users.noreply.github.com> Date: Fri, 14 Jan 2022 18:30:03 +0300 Subject: [PATCH 09/10] Update config.h --- keyboards/meletrix/zoom65/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/meletrix/zoom65/config.h b/keyboards/meletrix/zoom65/config.h index 6f13bd3d0aa5..6d6f6d18eb25 100644 --- a/keyboards/meletrix/zoom65/config.h +++ b/keyboards/meletrix/zoom65/config.h @@ -43,9 +43,6 @@ #define ENCODERS 1 -#ifdef ENCODER_RESOLUTION - #undef ENCODER_RESOLUTION -#endif #define ENCODER_RESOLUTION 2 // Note: array is { col, row ) From 01c23cebb868a751770e402597b81ce6ed9fabe9 Mon Sep 17 00:00:00 2001 From: GG <72414103+spbgzh@users.noreply.github.com> Date: Fri, 14 Jan 2022 18:30:24 +0300 Subject: [PATCH 10/10] Update config.h --- keyboards/meletrix/zoom65_lite/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/meletrix/zoom65_lite/config.h b/keyboards/meletrix/zoom65_lite/config.h index 5fe35cf2a32d..1f98a4dfdadc 100644 --- a/keyboards/meletrix/zoom65_lite/config.h +++ b/keyboards/meletrix/zoom65_lite/config.h @@ -43,9 +43,6 @@ #define ENCODERS 1 -#ifdef ENCODER_RESOLUTION - #undef ENCODER_RESOLUTION -#endif #define ENCODER_RESOLUTION 2 // Note: array is { col, row )