summaryrefslogtreecommitdiff
path: root/keyboards/splitkb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/splitkb')
-rw-r--r--keyboards/splitkb/kyria/rev1/config.h9
-rw-r--r--keyboards/splitkb/kyria/rev1/info.json14
-rw-r--r--keyboards/splitkb/kyria/rev2/config.h9
-rw-r--r--keyboards/splitkb/kyria/rev2/info.json14
-rw-r--r--keyboards/splitkb/zima/config.h7
-rw-r--r--keyboards/splitkb/zima/info.json5
6 files changed, 33 insertions, 25 deletions
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index 5c9c282e00..8ca0d50ea6 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -23,15 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS \
{ B6, B2, B3, B1, F7, F6, F5, F4 }
-#define ENCODERS_PAD_A \
- { C6 }
-#define ENCODERS_PAD_B \
- { B5 }
-#define ENCODERS_PAD_A_RIGHT \
- { B5 }
-#define ENCODERS_PAD_B_RIGHT \
- { C6 }
-
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json
index 86006546c7..895f9283ac 100644
--- a/keyboards/splitkb/kyria/rev1/info.json
+++ b/keyboards/splitkb/kyria/rev1/info.json
@@ -4,6 +4,20 @@
"pid": "0x9D9D",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "C6", "pin_b": "B5"}
+ ]
+ },
+ "split": {
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "B5", "pin_b": "C6"}
+ ]
+ }
+ }
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
index e26e0cffda..1799c6aa49 100644
--- a/keyboards/splitkb/kyria/rev2/config.h
+++ b/keyboards/splitkb/kyria/rev2/config.h
@@ -27,15 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COL_PINS_RIGHT \
{ B4, B5, B6, B2, B3, B1, F7, F6 }
-#define ENCODERS_PAD_A \
- { F4 }
-#define ENCODERS_PAD_B \
- { F5 }
-#define ENCODERS_PAD_A_RIGHT \
- { F5 }
-#define ENCODERS_PAD_B_RIGHT \
- { F4 }
-
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json
index e30432b718..d21d820804 100644
--- a/keyboards/splitkb/kyria/rev2/info.json
+++ b/keyboards/splitkb/kyria/rev2/info.json
@@ -4,6 +4,20 @@
"pid": "0x9D9D",
"device_version": "0.0.2"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "F4", "pin_b": "F5"}
+ ]
+ },
+ "split": {
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "F5", "pin_b": "F4"}
+ ]
+ }
+ }
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h
index 0cb93e77af..c06c192e0d 100644
--- a/keyboards/splitkb/zima/config.h
+++ b/keyboards/splitkb/zima/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define ENCODERS_PAD_A { B4 }
-#define ENCODERS_PAD_B { D7 }
-
#define AUDIO_PIN B6
#define AUDIO_CLICKY
#define NO_MUSIC_MODE
@@ -47,7 +44,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DRV_GREETING alert_750ms
#define DRV_MODE_DEFAULT buzz
-// EC11K encoders have a different resolution than other EC11 encoders.
-// When using the default resolution of 4, if you notice your encoder skipping
-// every other tick, lower the resolution to 2.
-#define ENCODER_RESOLUTION 2
diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json
index ab1b8ae020..077421904c 100644
--- a/keyboards/splitkb/zima/info.json
+++ b/keyboards/splitkb/zima/info.json
@@ -8,6 +8,11 @@
"pid": "0xF75B",
"device_version": "0.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B4", "pin_b": "D7", "resolution": 2}
+ ]
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"matrix_pins": {