summaryrefslogtreecommitdiff
path: root/keyboards/projectcain/vault45
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2022-03-01 01:52:01 +0000
committerGitHub <noreply@github.com>2022-03-01 01:52:01 +0000
commitc9d9e70ac7ae6170728cbc8ac91c9c3269afe993 (patch)
treeaa4862db9201435b1cb15b99e901def0c11e3b20 /keyboards/projectcain/vault45
parentf293e6b4da5a3eca36e6a6da7c1bcbf3ecd536e8 (diff)
downloadqmk_firmware-c9d9e70ac7ae6170728cbc8ac91c9c3269afe993.tar.gz
qmk_firmware-c9d9e70ac7ae6170728cbc8ac91c9c3269afe993.zip
Move projectcain encoder logic to keyboard level (#16479)
Diffstat (limited to 'keyboards/projectcain/vault45')
-rw-r--r--keyboards/projectcain/vault45/config.h4
-rw-r--r--keyboards/projectcain/vault45/keymaps/default/config.h3
-rw-r--r--keyboards/projectcain/vault45/keymaps/default/rules.mk1
-rw-r--r--keyboards/projectcain/vault45/rules.mk1
4 files changed, 5 insertions, 4 deletions
diff --git a/keyboards/projectcain/vault45/config.h b/keyboards/projectcain/vault45/config.h
index 2cbf55dd0f..6accb223a4 100644
--- 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
index 81321715af..2ca1e8f123 100644
--- 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
index dca6713d4f..ff681299e4 100644
--- 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
index 1275531ef6..77d9fdb410 100644
--- 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