summaryrefslogtreecommitdiff
path: root/keyboards/mechwild
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechwild')
-rw-r--r--keyboards/mechwild/bde/rev2/config.h7
-rw-r--r--keyboards/mechwild/bde/rev2/info.json5
-rw-r--r--keyboards/mechwild/clunker/config.h4
-rw-r--r--keyboards/mechwild/clunker/info.json5
-rwxr-xr-xkeyboards/mechwild/mercutio/config.h6
-rw-r--r--keyboards/mechwild/mercutio/info.json5
-rw-r--r--keyboards/mechwild/mokulua/mirrored/config.h6
-rw-r--r--keyboards/mechwild/mokulua/mirrored/info.json5
-rw-r--r--keyboards/mechwild/mokulua/standard/config.h6
-rw-r--r--keyboards/mechwild/mokulua/standard/info.json5
-rw-r--r--keyboards/mechwild/murphpad/config.h6
-rw-r--r--keyboards/mechwild/murphpad/info.json6
-rw-r--r--keyboards/mechwild/obe/config.h6
-rw-r--r--keyboards/mechwild/obe/info.json5
-rw-r--r--keyboards/mechwild/puckbuddy/config.h6
-rw-r--r--keyboards/mechwild/puckbuddy/info.json6
-rw-r--r--keyboards/mechwild/waka60/config.h6
-rw-r--r--keyboards/mechwild/waka60/info.json5
18 files changed, 47 insertions, 53 deletions
diff --git a/keyboards/mechwild/bde/rev2/config.h b/keyboards/mechwild/bde/rev2/config.h
index 3d045762ca..0d43d53bcd 100644
--- a/keyboards/mechwild/bde/rev2/config.h
+++ b/keyboards/mechwild/bde/rev2/config.h
@@ -17,11 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Encoder pins */
-#define ENCODERS_PAD_A { D2 }
-#define ENCODERS_PAD_B { D3 }
-
-/* Encoder resolution */
-#define ENCODER_RESOLUTION 4
-
#define OLED_FONT_H "keyboards/mechwild/bde/lib/rev2.c"
diff --git a/keyboards/mechwild/bde/rev2/info.json b/keyboards/mechwild/bde/rev2/info.json
index 29ddb0e017..4d27c53895 100644
--- a/keyboards/mechwild/bde/rev2/info.json
+++ b/keyboards/mechwild/bde/rev2/info.json
@@ -4,6 +4,11 @@
"pid": "0x170A",
"device_version": "1.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D2", "pin_b": "D3"}
+ ]
+ },
"matrix_pins": {
"rows":[ "C6", "D7", "B4", "D4", "E6", "B2" ],
"cols": ["B3", "B1", "F7", "F6", "F5", "F4", "B5" ]
diff --git a/keyboards/mechwild/clunker/config.h b/keyboards/mechwild/clunker/config.h
index 19dab9b25d..62caa25bb3 100644
--- a/keyboards/mechwild/clunker/config.h
+++ b/keyboards/mechwild/clunker/config.h
@@ -19,8 +19,4 @@
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-#define ENCODERS_PAD_A { D2 }
-#define ENCODERS_PAD_B { D3 }
-#define ENCODER_RESOLUTION 4
-
#define SOLENOID_PIN F4
diff --git a/keyboards/mechwild/clunker/info.json b/keyboards/mechwild/clunker/info.json
index cc9b8a1c59..89083afeb2 100644
--- a/keyboards/mechwild/clunker/info.json
+++ b/keyboards/mechwild/clunker/info.json
@@ -25,6 +25,11 @@
"pid": "0x1711",
"vid": "0x6D77"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D2", "pin_b": "D3"}
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/mechwild/mercutio/config.h b/keyboards/mechwild/mercutio/config.h
index 98bfeb5625..070fe36eb7 100755
--- a/keyboards/mechwild/mercutio/config.h
+++ b/keyboards/mechwild/mercutio/config.h
@@ -22,12 +22,6 @@
#define MATRIX_ROW_PINS { D0, D1, D4, C3, C0, C1, C2}
#define MATRIX_COL_PINS { B0, D7, D6, D5, B1, B2, B3}
-/* encoder pins */
-#define ENCODERS_PAD_A { B4 }
-#define ENCODERS_PAD_B { B5 }
-
-/* encoder resolution */
-#define ENCODER_RESOLUTION 4
#define TAP_CODE_DELAY 10
/* COL2ROW or ROW2COL */
diff --git a/keyboards/mechwild/mercutio/info.json b/keyboards/mechwild/mercutio/info.json
index b0596e76e5..98c815c6a8 100644
--- a/keyboards/mechwild/mercutio/info.json
+++ b/keyboards/mechwild/mercutio/info.json
@@ -8,6 +8,11 @@
"pid": "0x1703",
"device_version": "1.0.0"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B4", "pin_b": "B5"}
+ ]
+ },
"processor": "atmega328p",
"bootloader": "usbasploader",
"layouts": {
diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h
index 0638945b90..92a8dfa323 100644
--- a/keyboards/mechwild/mokulua/mirrored/config.h
+++ b/keyboards/mechwild/mokulua/mirrored/config.h
@@ -8,12 +8,6 @@
#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 }
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-/* Encoder pins */
-#define ENCODERS_PAD_A { D2 }
-#define ENCODERS_PAD_B { B2 }
-
-/* Encoder resolution */
-#define ENCODER_RESOLUTION 4
#define TAP_CODE_DELAY 10
/* COL2ROW, ROW2COL */
diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json
index ea140fca0e..29d2497cc1 100644
--- a/keyboards/mechwild/mokulua/mirrored/info.json
+++ b/keyboards/mechwild/mokulua/mirrored/info.json
@@ -8,6 +8,11 @@
"pid": "0x170C",
"device_version": "1.0.3"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D2", "pin_b": "B2"}
+ ]
+ },
"split": {
"soft_serial_pin": "D3"
},
diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h
index db224094db..b720c271b2 100644
--- a/keyboards/mechwild/mokulua/standard/config.h
+++ b/keyboards/mechwild/mokulua/standard/config.h
@@ -8,12 +8,6 @@
#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 }
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-/* Encoder pins */
-#define ENCODERS_PAD_A { D2 }
-#define ENCODERS_PAD_B { B2 }
-
-/* Encoder resolution */
-#define ENCODER_RESOLUTION 4
#define TAP_CODE_DELAY 10
/* COL2ROW, ROW2COL */
diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json
index 0fd80e4c88..d3451698f6 100644
--- a/keyboards/mechwild/mokulua/standard/info.json
+++ b/keyboards/mechwild/mokulua/standard/info.json
@@ -8,6 +8,11 @@
"pid": "0x170B",
"device_version": "1.0.3"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "D2", "pin_b": "B2"}
+ ]
+ },
"split": {
"soft_serial_pin": "D3"
},
diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h
index b190f9af86..d3158c3306 100644
--- a/keyboards/mechwild/murphpad/config.h
+++ b/keyboards/mechwild/murphpad/config.h
@@ -22,12 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { F5, B2, B3, B1, F7, F6 }
#define MATRIX_COL_PINS { B5, D7, C6, D4, B6 }
-/* Encoder pins */
-#define ENCODERS_PAD_A { E6, D2 }
-#define ENCODERS_PAD_B { B4, D3 }
-
-/* Encoder resolution */
-#define ENCODER_RESOLUTION 4
#define TAP_CODE_DELAY 10
/* COL2ROW, ROW2COL */
diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json
index 57a3c8fa8d..92af56f0dd 100644
--- a/keyboards/mechwild/murphpad/info.json
+++ b/keyboards/mechwild/murphpad/info.json
@@ -8,6 +8,12 @@
"pid": "0x1705",
"device_version": "3.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "E6", "pin_b": "B4"},
+ {"pin_a": "D2", "pin_b": "D3"}
+ ]
+ },
"bootmagic": {
"matrix": [0, 1]
},
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h
index 25f9b62394..72efdae1e2 100644
--- a/keyboards/mechwild/obe/config.h
+++ b/keyboards/mechwild/obe/config.h
@@ -31,12 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { A8, B15, B14, B13, B12, A15, B3 }
#define MATRIX_COL_PINS { B10, B1, B0, A7, A6, A5, A4, A3, A2, A1 }
-/* encoder pins */
-#define ENCODERS_PAD_A { B5 }
-#define ENCODERS_PAD_B { B4 }
-
-/* encoder resolution */
-#define ENCODER_RESOLUTION 4
#define TAP_CODE_DELAY 10
/* COL2ROW, ROW2COL */
diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json
index 806333a0fa..cbe9f7cfa8 100644
--- a/keyboards/mechwild/obe/info.json
+++ b/keyboards/mechwild/obe/info.json
@@ -8,6 +8,11 @@
"pid": "0x1707",
"device_version": "2.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B5", "pin_b": "B4"}
+ ]
+ },
"indicators": {
"caps_lock": "B9",
"num_lock": "B8"
diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h
index 0487c5322a..bf2e1a0b58 100644
--- a/keyboards/mechwild/puckbuddy/config.h
+++ b/keyboards/mechwild/puckbuddy/config.h
@@ -42,12 +42,6 @@
#define CIRQUE_PINNACLE_SPI_DIVISOR 8
#define CIRQUE_PINNACLE_SPI_CS_PIN A4
-/* encoder pins */
-#define ENCODERS_PAD_A { B1, B3 }
-#define ENCODERS_PAD_B { B0, A15 }
-
-/* encoder resolution */
-#define ENCODER_RESOLUTION 4
#define TAP_CODE_DELAY 10
/* COL2ROW, ROW2COL */
diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json
index d0af030ff3..825def96a2 100644
--- a/keyboards/mechwild/puckbuddy/info.json
+++ b/keyboards/mechwild/puckbuddy/info.json
@@ -8,6 +8,12 @@
"pid": "0x170F",
"device_version": "1.0.0"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B1", "pin_b": "B0"},
+ {"pin_a": "B3", "pin_b": "A15"}
+ ]
+ },
"indicators": {
"caps_lock": "C13",
"on_state": 0
diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h
index 5403cd0ddc..88b160a980 100644
--- a/keyboards/mechwild/waka60/config.h
+++ b/keyboards/mechwild/waka60/config.h
@@ -31,12 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { B8, B4, B3, B9, A15, B12, B13, B14, B15, A8 }
#define MATRIX_COL_PINS { B10, B1, B0, A7, A6, A5, A4 }
-/* encoder pins */
-#define ENCODERS_PAD_A { A3 }
-#define ENCODERS_PAD_B { A2 }
-
-/* encoder resolution */
-#define ENCODER_RESOLUTION 4
#define TAP_CODE_DELAY 10
/* COL2ROW, ROW2COL */
diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json
index 8e9a2c11f1..eb7d2d9f54 100644
--- a/keyboards/mechwild/waka60/info.json
+++ b/keyboards/mechwild/waka60/info.json
@@ -8,6 +8,11 @@
"pid": "0x1709",
"device_version": "1.0.1"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "A3", "pin_b": "A2"}
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [