summaryrefslogtreecommitdiff
path: root/keyboards/keycapsss
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keycapsss')
-rw-r--r--keyboards/keycapsss/kimiko/rev1/config.h7
-rw-r--r--keyboards/keycapsss/kimiko/rev1/info.json5
-rw-r--r--keyboards/keycapsss/plaid_pad/config.h2
-rw-r--r--keyboards/keycapsss/plaid_pad/rev1/config.h3
-rw-r--r--keyboards/keycapsss/plaid_pad/rev1/info.json8
-rw-r--r--keyboards/keycapsss/plaid_pad/rev2/config.h3
-rw-r--r--keyboards/keycapsss/plaid_pad/rev2/info.json8
-rw-r--r--keyboards/keycapsss/plaid_pad/rev3/config.h20
-rw-r--r--keyboards/keycapsss/plaid_pad/rev3/info.json10
9 files changed, 29 insertions, 37 deletions
diff --git a/keyboards/keycapsss/kimiko/rev1/config.h b/keyboards/keycapsss/kimiko/rev1/config.h
index fbcf482c35..592fefe5d4 100644
--- a/keyboards/keycapsss/kimiko/rev1/config.h
+++ b/keyboards/keycapsss/kimiko/rev1/config.h
@@ -38,13 +38,6 @@
#define RGBLIGHT_LIMIT_VAL 80
#endif
-#ifdef ENCODER_ENABLE
-# define ENCODERS_PAD_A { F4 }
-# define ENCODERS_PAD_B { F5 }
-# define ENCODERS_PAD_A_RIGHT { F4 }
-# define ENCODERS_PAD_B_RIGHT { F5 }
-#endif
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json
index 09f5867a4c..0bfeffe39a 100644
--- a/keyboards/keycapsss/kimiko/rev1/info.json
+++ b/keyboards/keycapsss/kimiko/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x4B69",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "F4", "pin_b": "F5"}
+ ]
+ },
"split": {
"soft_serial_pin": "D2"
},
diff --git a/keyboards/keycapsss/plaid_pad/config.h b/keyboards/keycapsss/plaid_pad/config.h
index 1bdd118736..5825367ac1 100644
--- a/keyboards/keycapsss/plaid_pad/config.h
+++ b/keyboards/keycapsss/plaid_pad/config.h
@@ -20,8 +20,6 @@
#define MATRIX_ROW_PINS { C0, C1, C2, C3 }
#define MATRIX_COL_PINS { B0, D7, D6, D5 }
-#define ENCODER_RESOLUTION 4
-
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keycapsss/plaid_pad/rev1/config.h b/keyboards/keycapsss/plaid_pad/rev1/config.h
index 5956835a0b..ef2037c568 100644
--- a/keyboards/keycapsss/plaid_pad/rev1/config.h
+++ b/keyboards/keycapsss/plaid_pad/rev1/config.h
@@ -16,8 +16,5 @@
#pragma once
-#define ENCODERS_PAD_A { D1, B2 }
-#define ENCODERS_PAD_B { D0, B1 }
-
#define LED_RED C5 // LED1
#define LED_GREEN C4 // LED2
diff --git a/keyboards/keycapsss/plaid_pad/rev1/info.json b/keyboards/keycapsss/plaid_pad/rev1/info.json
index 3d98c4cb57..b9fe9e977a 100644
--- a/keyboards/keycapsss/plaid_pad/rev1/info.json
+++ b/keyboards/keycapsss/plaid_pad/rev1/info.json
@@ -2,5 +2,11 @@
"keyboard_name": "Plaid-Pad Rev1",
"usb": {
"device_version": "0.0.1"
- }
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D1", "pin_b": "D0"},
+ {"pin_a": "B2", "pin_b": "B1"}
+ ]
+ },
}
diff --git a/keyboards/keycapsss/plaid_pad/rev2/config.h b/keyboards/keycapsss/plaid_pad/rev2/config.h
index efb2609edd..ef2037c568 100644
--- a/keyboards/keycapsss/plaid_pad/rev2/config.h
+++ b/keyboards/keycapsss/plaid_pad/rev2/config.h
@@ -16,8 +16,5 @@
#pragma once
-#define ENCODERS_PAD_A { D1, B2, B4, D4 }
-#define ENCODERS_PAD_B { D0, B1, B3, B5 }
-
#define LED_RED C5 // LED1
#define LED_GREEN C4 // LED2
diff --git a/keyboards/keycapsss/plaid_pad/rev2/info.json b/keyboards/keycapsss/plaid_pad/rev2/info.json
index 0a1da66f73..637139c5a4 100644
--- a/keyboards/keycapsss/plaid_pad/rev2/info.json
+++ b/keyboards/keycapsss/plaid_pad/rev2/info.json
@@ -2,5 +2,13 @@
"keyboard_name": "Plaid-Pad Rev2",
"usb": {
"device_version": "0.0.2"
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D1", "pin_b": "D0"},
+ {"pin_a": "B2", "pin_b": "B1"},
+ {"pin_a": "B4", "pin_b": "B3"},
+ {"pin_a": "D4", "pin_b": "B5"}
+ ]
}
}
diff --git a/keyboards/keycapsss/plaid_pad/rev3/config.h b/keyboards/keycapsss/plaid_pad/rev3/config.h
deleted file mode 100644
index 7e4786c5bc..0000000000
--- a/keyboards/keycapsss/plaid_pad/rev3/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 Ben Roesner (keycapsss.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define ENCODERS_PAD_A { D1, B2, B4, D4 }
-#define ENCODERS_PAD_B { D0, B1, B3, B5 }
diff --git a/keyboards/keycapsss/plaid_pad/rev3/info.json b/keyboards/keycapsss/plaid_pad/rev3/info.json
index 2f5b474c4d..93b5e3bdc9 100644
--- a/keyboards/keycapsss/plaid_pad/rev3/info.json
+++ b/keyboards/keycapsss/plaid_pad/rev3/info.json
@@ -2,5 +2,13 @@
"keyboard_name": "Plaid-Pad Rev3",
"usb": {
"device_version": "0.0.3"
- }
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D1", "pin_b": "D0"},
+ {"pin_a": "B2", "pin_b": "B1"},
+ {"pin_a": "B4", "pin_b": "B3"},
+ {"pin_a": "D4", "pin_b": "B5"}
+ ]
+ },
}