summaryrefslogtreecommitdiff
path: root/keyboards/exclusive
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/exclusive')
-rw-r--r--keyboards/exclusive/e65/config.h10
-rw-r--r--keyboards/exclusive/e65/e65.h2
-rw-r--r--keyboards/exclusive/e65/info.json5
-rw-r--r--keyboards/exclusive/e6_rgb/config.h6
-rw-r--r--keyboards/exclusive/e6_rgb/info.json5
-rw-r--r--keyboards/exclusive/e6v2/le/config.h7
-rw-r--r--keyboards/exclusive/e6v2/le/info.json5
-rw-r--r--keyboards/exclusive/e6v2/le_bmc/config.h16
-rw-r--r--keyboards/exclusive/e6v2/le_bmc/info.json5
-rw-r--r--keyboards/exclusive/e6v2/oe/config.h7
-rw-r--r--keyboards/exclusive/e6v2/oe/info.json5
-rw-r--r--keyboards/exclusive/e6v2/oe_bmc/config.h16
-rw-r--r--keyboards/exclusive/e6v2/oe_bmc/info.json5
-rw-r--r--keyboards/exclusive/e7v1/config.h8
-rw-r--r--keyboards/exclusive/e7v1/info.json5
-rw-r--r--keyboards/exclusive/e7v1se/config.h17
-rw-r--r--keyboards/exclusive/e7v1se/info.json145
-rw-r--r--keyboards/exclusive/e85/config.h19
-rw-r--r--keyboards/exclusive/e85/hotswap/info.json5
-rw-r--r--keyboards/exclusive/e85/soldered/info.json5
20 files changed, 121 insertions, 177 deletions
diff --git a/keyboards/exclusive/e65/config.h b/keyboards/exclusive/e65/config.h
index ef92b06249..9ec802d8d4 100644
--- a/keyboards/exclusive/e65/config.h
+++ b/keyboards/exclusive/e65/config.h
@@ -16,16 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS \
- { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS \
- { C6, C7, D0, D1, D2, D3, D4, D5, D6, D7, F0, F1, F4, F5, F6, F7 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/exclusive/e65/e65.h b/keyboards/exclusive/e65/e65.h
index 281b52c76e..5800060a3f 100644
--- a/keyboards/exclusive/e65/e65.h
+++ b/keyboards/exclusive/e65/e65.h
@@ -129,7 +129,7 @@
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, K015 }, \
{ K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \
{ K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214, K215 }, \
- { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314, K315 }, \
+ { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314, K315 }, \
{ K400, K401, KC_NO, K403, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413, K414, K415 } \
}
diff --git a/keyboards/exclusive/e65/info.json b/keyboards/exclusive/e65/info.json
index 436faa5f3d..3e541994de 100644
--- a/keyboards/exclusive/e65/info.json
+++ b/keyboards/exclusive/e65/info.json
@@ -8,6 +8,11 @@
"pid": "0xE605",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C6", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6", "F7"],
+ "rows": ["B0", "B1", "B2", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"levels": 6
diff --git a/keyboards/exclusive/e6_rgb/config.h b/keyboards/exclusive/e6_rgb/config.h
index bf8b3b483a..56fd4db25d 100644
--- a/keyboards/exclusive/e6_rgb/config.h
+++ b/keyboards/exclusive/e6_rgb/config.h
@@ -4,12 +4,6 @@
*/
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, F4, F5, F6, D6 }
-#define MATRIX_COL_PINS { D7, B4, B5, B6, C6, C7, F7, F0, B0, B1, D2, D3, B3, B2 }
-#define DIODE_DIRECTION COL2ROW
-
//rgb light setting
#define RGBLED_NUM 6
#define RGB_DI_PIN B7
diff --git a/keyboards/exclusive/e6_rgb/info.json b/keyboards/exclusive/e6_rgb/info.json
index 076ff4a505..39e9940732 100644
--- a/keyboards/exclusive/e6_rgb/info.json
+++ b/keyboards/exclusive/e6_rgb/info.json
@@ -8,6 +8,11 @@
"pid": "0x4536",
"device_version": "0.6.2"
},
+ "matrix_pins": {
+ "cols": ["D7", "B4", "B5", "B6", "C6", "C7", "F7", "F0", "B0", "B1", "D2", "D3", "B3", "B2"],
+ "rows": ["F1", "F4", "F5", "F6", "D6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
diff --git a/keyboards/exclusive/e6v2/le/config.h b/keyboards/exclusive/e6v2/le/config.h
index 65bd782b7e..865d5e5ead 100644
--- a/keyboards/exclusive/e6v2/le/config.h
+++ b/keyboards/exclusive/e6v2/le/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* QMK E6-V2 PCB default pin-out */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
-
#define RGB_DI_PIN E6
#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
@@ -39,5 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SAT_STEP 12
#define RGBLIGHT_VAL_STEP 12
#endif
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/exclusive/e6v2/le/info.json b/keyboards/exclusive/e6v2/le/info.json
index 10ad0c9383..c5184493fa 100644
--- a/keyboards/exclusive/e6v2/le/info.json
+++ b/keyboards/exclusive/e6v2/le/info.json
@@ -8,6 +8,11 @@
"pid": "0x6060",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"],
+ "rows": ["B0", "B1", "B2", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 2,
diff --git a/keyboards/exclusive/e6v2/le_bmc/config.h b/keyboards/exclusive/e6v2/le_bmc/config.h
index c9d14bff4d..bb3f00287e 100644
--- a/keyboards/exclusive/e6v2/le_bmc/config.h
+++ b/keyboards/exclusive/e6v2/le_bmc/config.h
@@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// 0 1 2 3 4 5 6 7 8 9 A
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, C2, C3, C4, C5, D7 }
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/exclusive/e6v2/le_bmc/info.json b/keyboards/exclusive/e6v2/le_bmc/info.json
index 51afd7c5ad..0faeed9a49 100644
--- a/keyboards/exclusive/e6v2/le_bmc/info.json
+++ b/keyboards/exclusive/e6v2/le_bmc/info.json
@@ -7,6 +7,11 @@
"pid": "0xE62D",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "C2", "C3", "C4", "C5", "D7"],
+ "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "D4"
},
diff --git a/keyboards/exclusive/e6v2/oe/config.h b/keyboards/exclusive/e6v2/oe/config.h
index 88ec4faa04..b7fd9fcff4 100644
--- a/keyboards/exclusive/e6v2/oe/config.h
+++ b/keyboards/exclusive/e6v2/oe/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* QMK E6-V2 PCB default pin-out */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { C7, C6, B5, B4, D7, D6, D4, F6, F7, F5, F4, F1, F0, B0, B1 }
-
#define RGB_DI_PIN E2
#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
@@ -39,5 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SAT_STEP 12
#define RGBLIGHT_VAL_STEP 12
#endif
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/exclusive/e6v2/oe/info.json b/keyboards/exclusive/e6v2/oe/info.json
index bfa408c556..d16df07cc6 100644
--- a/keyboards/exclusive/e6v2/oe/info.json
+++ b/keyboards/exclusive/e6v2/oe/info.json
@@ -8,6 +8,11 @@
"pid": "0x6060",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["C7", "C6", "B5", "B4", "D7", "D6", "D4", "F6", "F7", "F5", "F4", "F1", "F0", "B0", "B1"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 5,
diff --git a/keyboards/exclusive/e6v2/oe_bmc/config.h b/keyboards/exclusive/e6v2/oe_bmc/config.h
index c9d14bff4d..bb3f00287e 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/config.h
+++ b/keyboards/exclusive/e6v2/oe_bmc/config.h
@@ -17,22 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-
-// 0 1 2 3 4 5 6 7 8 9 A
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, C2, C3, C4, C5, D7 }
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLED_NUM 6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/exclusive/e6v2/oe_bmc/info.json b/keyboards/exclusive/e6v2/oe_bmc/info.json
index 6716f99c98..b2eac92849 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/info.json
+++ b/keyboards/exclusive/e6v2/oe_bmc/info.json
@@ -7,6 +7,11 @@
"pid": "0xE62B",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "C2", "C3", "C4", "C5", "D7"],
+ "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "D4"
},
diff --git a/keyboards/exclusive/e7v1/config.h b/keyboards/exclusive/e7v1/config.h
index 46944506a1..6d2de14931 100644
--- a/keyboards/exclusive/e7v1/config.h
+++ b/keyboards/exclusive/e7v1/config.h
@@ -1,13 +1,5 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 }
-#define MATRIX_COL_PINS { B6, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7, F1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/exclusive/e7v1/info.json b/keyboards/exclusive/e7v1/info.json
index d014e6d47c..5e7e72ff24 100644
--- a/keyboards/exclusive/e7v1/info.json
+++ b/keyboards/exclusive/e7v1/info.json
@@ -8,6 +8,11 @@
"pid": "0xE701",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B6", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7", "F1"],
+ "rows": ["B0", "B1", "B2", "B3", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"levels": 6
diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h
index 3da5cb8935..81c34a03b1 100644
--- a/keyboards/exclusive/e7v1se/config.h
+++ b/keyboards/exclusive/e7v1se/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, F0 }
-#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, D7, D6, D4, B4, B5, B6, C6, C7, F7, F6, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN E2
#ifdef RGB_DI_PIN
#define RGBLED_NUM 16
diff --git a/keyboards/exclusive/e7v1se/info.json b/keyboards/exclusive/e7v1se/info.json
index 9994741f24..a473dc818e 100644
--- a/keyboards/exclusive/e7v1se/info.json
+++ b/keyboards/exclusive/e7v1se/info.json
@@ -8,6 +8,11 @@
"pid": "0x7051",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D5", "D3", "D2", "D1", "D0", "D7", "D6", "D4", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F4"],
+ "rows": ["E6", "B0", "B1", "B2", "B3", "F0"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"breathing": true
@@ -17,88 +22,88 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "K00", "x": 0, "y": 0, "w": 1 },
- { "label": "K01", "x": 1.25, "y": 0, "w": 1 },
- { "label": "K02", "x": 2.25, "y": 0, "w": 1 },
- { "label": "K03", "x": 3.25, "y": 0, "w": 1 },
- { "label": "K04", "x": 4.25, "y": 0, "w": 1 },
- { "label": "K05", "x": 5.5, "y": 0, "w": 1 },
- { "label": "K06", "x": 6.5, "y": 0, "w": 1 },
- { "label": "K07", "x": 7.5, "y": 0, "w": 1 },
- { "label": "K08", "x": 8.5, "y": 0, "w": 1 },
- { "label": "K09", "x": 9.75, "y": 0, "w": 1 },
- { "label": "K0a", "x": 10.75, "y": 0, "w": 1 },
- { "label": "K0b", "x": 11.75, "y": 0, "w": 1 },
- { "label": "K0c", "x": 12.75, "y": 0, "w": 1 },
- { "label": "K0e", "x": 14, "y": 0, "w": 1 },
- { "label": "K0f", "x": 15.25, "y": 0, "w": 1 },
- { "label": "K10", "x": 0, "y": 1, "w": 1 },
- { "label": "K11", "x": 1, "y": 1, "w": 1 },
- { "label": "K12", "x": 2, "y": 1, "w": 1 },
- { "label": "K13", "x": 3, "y": 1, "w": 1 },
- { "label": "K14", "x": 4, "y": 1, "w": 1 },
- { "label": "K15", "x": 5, "y": 1, "w": 1 },
- { "label": "K16", "x": 6, "y": 1, "w": 1 },
- { "label": "K17", "x": 7, "y": 1, "w": 1 },
- { "label": "K18", "x": 8, "y": 1, "w": 1 },
- { "label": "K19", "x": 9, "y": 1, "w": 1 },
- { "label": "K1a", "x": 10, "y": 1, "w": 1 },
- { "label": "K1b", "x": 11, "y": 1, "w": 1 },
- { "label": "K1c", "x": 12, "y": 1, "w": 1 },
- { "label": "K1d", "x": 13, "y": 1, "w": 1 },
- { "label": "K1e", "x": 14, "y": 1, "w": 1 },
- { "label": "K1f", "x": 15.25, "y": 1, "w": 1 },
+ { "label": "K00", "x": 0, "y": 0 },
+ { "label": "K01", "x": 1.25, "y": 0 },
+ { "label": "K02", "x": 2.25, "y": 0 },
+ { "label": "K03", "x": 3.25, "y": 0 },
+ { "label": "K04", "x": 4.25, "y": 0 },
+ { "label": "K05", "x": 5.5, "y": 0 },
+ { "label": "K06", "x": 6.5, "y": 0 },
+ { "label": "K07", "x": 7.5, "y": 0 },
+ { "label": "K08", "x": 8.5, "y": 0 },
+ { "label": "K09", "x": 9.75, "y": 0 },
+ { "label": "K0a", "x": 10.75, "y": 0 },
+ { "label": "K0b", "x": 11.75, "y": 0 },
+ { "label": "K0c", "x": 12.75, "y": 0 },
+ { "label": "K0e", "x": 14, "y": 0 },
+ { "label": "K0f", "x": 15.25, "y": 0 },
+ { "label": "K10", "x": 0, "y": 1 },
+ { "label": "K11", "x": 1, "y": 1 },
+ { "label": "K12", "x": 2, "y": 1 },
+ { "label": "K13", "x": 3, "y": 1 },
+ { "label": "K14", "x": 4, "y": 1 },
+ { "label": "K15", "x": 5, "y": 1 },
+ { "label": "K16", "x": 6, "y": 1 },
+ { "label": "K17", "x": 7, "y": 1 },
+ { "label": "K18", "x": 8, "y": 1 },
+ { "label": "K19", "x": 9, "y": 1 },
+ { "label": "K1a", "x": 10, "y": 1 },
+ { "label": "K1b", "x": 11, "y": 1 },
+ { "label": "K1c", "x": 12, "y": 1 },
+ { "label": "K1d", "x": 13, "y": 1 },
+ { "label": "K1e", "x": 14, "y": 1 },
+ { "label": "K1f", "x": 15.25, "y": 1 },
{ "label": "K20", "x": 0, "y": 2, "w": 1.5 },
- { "label": "K22", "x": 1.5, "y": 2, "w": 1 },
- { "label": "K23", "x": 2.5, "y": 2, "w": 1 },
- { "label": "K24", "x": 3.5, "y": 2, "w": 1 },
- { "label": "K25", "x": 4.5, "y": 2, "w": 1 },
- { "label": "K26", "x": 5.5, "y": 2, "w": 1 },
- { "label": "K27", "x": 6.5, "y": 2, "w": 1 },
- { "label": "K28", "x": 7.5, "y": 2, "w": 1 },
- { "label": "K29", "x": 8.5, "y": 2, "w": 1 },
- { "label": "K2a", "x": 9.5, "y": 2, "w": 1 },
- { "label": "K2b", "x": 10.5, "y": 2, "w": 1 },
- { "label": "K2c", "x": 11.5, "y": 2, "w": 1 },
- { "label": "K2d", "x": 12.5, "y": 2, "w": 1 },
+ { "label": "K22", "x": 1.5, "y": 2 },
+ { "label": "K23", "x": 2.5, "y": 2 },
+ { "label": "K24", "x": 3.5, "y": 2 },
+ { "label": "K25", "x": 4.5, "y": 2 },
+ { "label": "K26", "x": 5.5, "y": 2 },
+ { "label": "K27", "x": 6.5, "y": 2 },
+ { "label": "K28", "x": 7.5, "y": 2 },
+ { "label": "K29", "x": 8.5, "y": 2 },
+ { "label": "K2a", "x": 9.5, "y": 2 },
+ { "label": "K2b", "x": 10.5, "y": 2 },
+ { "label": "K2c", "x": 11.5, "y": 2 },
+ { "label": "K2d", "x": 12.5, "y": 2 },
{ "label": "K2e", "x": 13.5, "y": 2, "w": 1.5 },
- { "label": "K2f", "x": 15.25, "y": 2, "w": 1 },
+ { "label": "K2f", "x": 15.25, "y": 2 },
{ "label": "K30", "x": 0, "y": 3, "w": 1.75 },
- { "label": "K32", "x": 1.75, "y": 3, "w": 1 },
- { "label": "K33", "x": 2.75, "y": 3, "w": 1 },
- { "label": "K34", "x": 3.75, "y": 3, "w": 1 },
- { "label": "K35", "x": 4.75, "y": 3, "w": 1 },
- { "label": "K36", "x": 5.75, "y": 3, "w": 1 },
- { "label": "K37", "x": 6.75, "y": 3, "w": 1 },
- { "label": "K38", "x": 7.75, "y": 3, "w": 1 },
- { "label": "K39", "x": 8.75, "y": 3, "w": 1 },
- { "label": "K3a", "x": 9.75, "y": 3, "w": 1 },
- { "label": "K3b", "x": 10.75, "y": 3, "w": 1 },
- { "label": "K3c", "x": 11.75, "y": 3, "w": 1 },
+ { "label": "K32", "x": 1.75, "y": 3 },
+ { "label": "K33", "x": 2.75, "y": 3 },
+ { "label": "K34", "x": 3.75, "y": 3 },
+ { "label": "K35", "x": 4.75, "y": 3 },
+ { "label": "K36", "x": 5.75, "y": 3 },
+ { "label": "K37", "x": 6.75, "y": 3 },
+ { "label": "K38", "x": 7.75, "y": 3 },
+ { "label": "K39", "x": 8.75, "y": 3 },
+ { "label": "K3a", "x": 9.75, "y": 3 },
+ { "label": "K3b", "x": 10.75, "y": 3 },
+ { "label": "K3c", "x": 11.75, "y": 3 },
{ "label": "K3d", "x": 12.75, "y": 3, "w": 2.25 },
{ "label": "K40", "x": 0, "y": 4, "w": 1.25 },
- { "label": "K41", "x": 1.25, "y": 4, "w": 1 },
- { "label": "K42", "x": 2.25, "y": 4, "w": 1 },
- { "label": "K43", "x": 3.25, "y": 4, "w": 1 },
- { "label": "K44", "x": 4.25, "y": 4, "w": 1 },
- { "label": "K45", "x": 5.25, "y": 4, "w": 1 },
- { "label": "K46", "x": 6.25, "y": 4, "w": 1 },
- { "label": "K47", "x": 7.25, "y": 4, "w": 1 },
- { "label": "K48", "x": 8.25, "y": 4, "w": 1 },
- { "label": "K49", "x": 9.25, "y": 4, "w": 1 },
- { "label": "K4a", "x": 10.25, "y": 4, "w": 1 },
- { "label": "K4b", "x": 11.25, "y": 4, "w": 1 },
+ { "label": "K41", "x": 1.25, "y": 4 },
+ { "label": "K42", "x": 2.25, "y": 4 },
+ { "label": "K43", "x": 3.25, "y": 4 },
+ { "label": "K44", "x": 4.25, "y": 4 },
+ { "label": "K45", "x": 5.25, "y": 4 },
+ { "label": "K46", "x": 6.25, "y": 4 },
+ { "label": "K47", "x": 7.25, "y": 4 },
+ { "label": "K48", "x": 8.25, "y": 4 },
+ { "label": "K49", "x": 9.25, "y": 4 },
+ { "label": "K4a", "x": 10.25, "y": 4 },
+ { "label": "K4b", "x": 11.25, "y": 4 },
{ "label": "K4d", "x": 12.25, "y": 4, "w": 1.75 },
- { "label": "K4e", "x": 14.25, "y": 4.25, "w": 1 },
+ { "label": "K4e", "x": 14.25, "y": 4.25 },
{ "label": "K50", "x": 0, "y": 5, "w": 1.25 },
{ "label": "K51", "x": 1.25, "y": 5, "w": 1.25 },
{ "label": "K52", "x": 2.5, "y": 5, "w": 1.25 },
{ "label": "K56", "x": 3.75, "y": 5, "w": 6.25 },
{ "label": "K5a", "x": 10, "y": 5, "w": 1.25 },
{ "label": "K5b", "x": 11.25, "y": 5, "w": 1.25 },
- { "label": "K5d", "x": 13.25, "y": 5.25, "w": 1 },
- { "label": "K5e", "x": 14.25, "y": 5.25, "w": 1 },
- { "label": "K5f", "x": 15.25, "y": 5.25, "w": 1 }
+ { "label": "K5d", "x": 13.25, "y": 5.25 },
+ { "label": "K5e", "x": 14.25, "y": 5.25 },
+ { "label": "K5f", "x": 15.25, "y": 5.25 }
]
}
}
diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h
index 8d01fe2faf..98d2fd8634 100644
--- a/keyboards/exclusive/e85/config.h
+++ b/keyboards/exclusive/e85/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-// 0 1 2 3 4 5 6 7 8 9 A
-#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
#define RGB_DI_PIN E2
#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
diff --git a/keyboards/exclusive/e85/hotswap/info.json b/keyboards/exclusive/e85/hotswap/info.json
index 0065b2b84c..e86c11ad09 100644
--- a/keyboards/exclusive/e85/hotswap/info.json
+++ b/keyboards/exclusive/e85/hotswap/info.json
@@ -8,6 +8,11 @@
"pid": "0xE851",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+ "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "B6",
"levels": 6,
diff --git a/keyboards/exclusive/e85/soldered/info.json b/keyboards/exclusive/e85/soldered/info.json
index cda9f689cd..3003d16c4b 100644
--- a/keyboards/exclusive/e85/soldered/info.json
+++ b/keyboards/exclusive/e85/soldered/info.json
@@ -8,6 +8,11 @@
"pid": "0xE852",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+ "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "B6",
"levels": 6,