qmk_firmware

QMK firmware for my keyboards (Corne, Sweep Ferris) and trackball (Ploopy Adept)
Log | Files | Refs | Submodules | LICENSE

commit c9d9e70ac7ae6170728cbc8ac91c9c3269afe993
parent f293e6b4da5a3eca36e6a6da7c1bcbf3ecd536e8
Author: Joel Challis <git@zvecr.com>
Date:   Tue,  1 Mar 2022 01:52:01 +0000

Move projectcain encoder logic to keyboard level (#16479)


Diffstat:
Mkeyboards/projectcain/vault35/config.h | 4++++
Mkeyboards/projectcain/vault35/keymaps/default/config.h | 3---
Mkeyboards/projectcain/vault35/keymaps/default/rules.mk | 1-
Mkeyboards/projectcain/vault35/rules.mk | 1+
Mkeyboards/projectcain/vault45/config.h | 4++++
Mkeyboards/projectcain/vault45/keymaps/default/config.h | 3---
Mkeyboards/projectcain/vault45/keymaps/default/rules.mk | 1-
Mkeyboards/projectcain/vault45/rules.mk | 1+
8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/keyboards/projectcain/vault35/config.h b/keyboards/projectcain/vault35/config.h @@ -44,6 +44,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW +#define ENCODERS_PAD_A { D6 } +#define ENCODERS_PAD_B { D7 } +#define ENCODER_RESOLUTION 2 + /* * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. */ diff --git a/keyboards/projectcain/vault35/keymaps/default/config.h b/keyboards/projectcain/vault35/keymaps/default/config.h @@ -16,9 +16,6 @@ #pragma once -#define ENCODERS_PAD_A { D6 } -#define ENCODERS_PAD_B { D7 } -#define ENCODER_RESOLUTION 2 #define COMBO_COUNT 2 #define COMBO_TERM 50 #define TAPPING_FORCE_HOLD diff --git a/keyboards/projectcain/vault35/keymaps/default/rules.mk b/keyboards/projectcain/vault35/keymaps/default/rules.mk @@ -1,2 +1 @@ -ENCODER_ENABLE = yes COMBO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/projectcain/vault35/rules.mk b/keyboards/projectcain/vault35/rules.mk @@ -16,3 +16,4 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes diff --git a/keyboards/projectcain/vault45/config.h b/keyboards/projectcain/vault45/config.h @@ -47,6 +47,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW +#define ENCODERS_PAD_A { B3, D1 } +#define ENCODERS_PAD_B { B2, D2 } +#define ENCODER_RESOLUTION 2 + /* * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. */ diff --git a/keyboards/projectcain/vault45/keymaps/default/config.h b/keyboards/projectcain/vault45/keymaps/default/config.h @@ -16,9 +16,6 @@ #pragma once -#define ENCODERS_PAD_A { B3, D1 } -#define ENCODERS_PAD_B { B2, D2 } -#define ENCODER_RESOLUTION 2 #define COMBO_COUNT 2 #define COMBO_TERM 50 #define TAPPING_FORCE_HOLD diff --git a/keyboards/projectcain/vault45/keymaps/default/rules.mk b/keyboards/projectcain/vault45/keymaps/default/rules.mk @@ -1,2 +1 @@ -ENCODER_ENABLE = yes COMBO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/projectcain/vault45/rules.mk b/keyboards/projectcain/vault45/rules.mk @@ -16,3 +16,4 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes