Skip to content

Commit 23c365b

Browse files
authored
Move matrix config to info.json, part 1 (qmk#19985)
1 parent b34d51d commit 23c365b

File tree

502 files changed

+1299
-3461
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

502 files changed

+1299
-3461
lines changed

keyboards/0_sixty/config.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616

1717
#pragma once
1818

19-
20-
#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
21-
#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B3, B2 }
22-
23-
/* COL2ROW or ROW2COL */
24-
#define DIODE_DIRECTION COL2ROW
25-
2619
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
2720
#define LOCKING_SUPPORT_ENABLE
2821
/* Locking resynchronize hack */

keyboards/0_sixty/info.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
"vid": "0x7654",
77
"device_version": "0.0.1"
88
},
9+
"matrix_pins": {
10+
"cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3", "B2"],
11+
"rows": ["B1", "F7", "F6", "F5", "F4"]
12+
},
13+
"diode_direction": "COL2ROW",
914
"features": {
1015
"extrakey": true,
1116
"console": true,

keyboards/0xc7/61key/config.h

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
#pragma once
1919

20-
21-
/*
22-
* Keyboard Matrix Assignments
23-
*
24-
* Change this to how you wired your keyboard
25-
* COLS: AVR pins used for columns, left to right
26-
* ROWS: AVR pins used for rows, top to bottom
27-
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
28-
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
29-
*
30-
*/
31-
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
32-
#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, F7, F6, F5, F4, F1, F0 }
33-
34-
/* COL2ROW, ROW2COL */
35-
#define DIODE_DIRECTION COL2ROW
36-
3720
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
3821
#define LOCKING_SUPPORT_ENABLE
3922
/* Locking resynchronize hack */

keyboards/0xc7/61key/info.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x6161",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "F7", "F6", "F5", "F4", "F1", "F0"],
13+
"rows": ["B0", "B1", "B2", "B3", "B7"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"processor": "atmega32u4",
1217
"bootloader": "atmel-dfu",
1318
"layout_aliases": {

keyboards/0xcb/static/config.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717
#pragma once
1818

19-
// clang-format off
20-
21-
/*
22-
* Keyboard Matrix Assignments
23-
*
24-
* Change this to how you wired your keyboard
25-
* COLS: AVR pins used for columns, left to right
26-
* ROWS: AVR pins used for rows, top to bottom
27-
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
28-
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
29-
*
30-
*/
31-
#define MATRIX_ROW_PINS { D5, D6, D7, B0, B1, B2, B3, B4 }
32-
#define MATRIX_COL_PINS { B5, D4, C0, C1, C2, C3 }
33-
34-
/* COL2ROW, ROW2COL*/
35-
#define DIODE_DIRECTION COL2ROW
36-
3719
#define TAP_CODE_DELAY 10
38-
// clang-format on
3920

4021
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
4122
#define LOCKING_SUPPORT_ENABLE

keyboards/0xcb/static/info.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0xA455",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["B5", "D4", "C0", "C1", "C2", "C3"],
13+
"rows": ["D5", "D6", "D7", "B0", "B1", "B2", "B3", "B4"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"encoder": {
1217
"rotary": [
1318
{"pin_a": "D0", "pin_b": "D1"}

keyboards/10bleoledhub/config.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/
1616

1717
#pragma once
1818

19-
20-
#define MATRIX_ROW_PINS { F0, F5, F4, F6 }
21-
#define MATRIX_COL_PINS { D6, D7, B5 }
22-
23-
#define DIODE_DIRECTION ROW2COL
24-
2519
#define SSD1306OLED
2620
#define RGB_DI_PIN B7
2721

keyboards/10bleoledhub/info.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x7C99",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["D6", "D7", "B5"],
13+
"rows": ["F0", "F5", "F4", "F6"]
14+
},
15+
"diode_direction": "ROW2COL",
1116
"encoder": {
1217
"rotary": [
1318
{"pin_a": "C7", "pin_b": "F7"}

keyboards/1upkeyboards/1up60hse/config.h

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
#pragma once
1919

20-
21-
/*
22-
* Keyboard Matrix Assignments
23-
*
24-
* Change this to how you wired your keyboard
25-
* COLS: AVR pins used for columns, left to right
26-
* ROWS: AVR pins used for rows, top to bottom
27-
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
28-
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
29-
*
30-
*/
31-
#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
32-
#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, E6, D1, D0, D2, D3, D5, D6, D7 }
33-
34-
/* COL2ROW, ROW2COL*/
35-
#define DIODE_DIRECTION COL2ROW
36-
3720
#define RGB_DI_PIN F0
3821
#ifdef RGB_DI_PIN
3922
#define RGBLIGHT_EFFECT_BREATHING

keyboards/1upkeyboards/1up60hse/info.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x6873",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7"],
13+
"rows": ["B3", "B2", "B1", "B0", "D4"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"backlight": {
1217
"pin": "B7",
1318
"levels": 5,

keyboards/1upkeyboards/1up60hte/config.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1818

1919
#pragma once
2020

21-
22-
/* key matrix pins */
23-
#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
24-
#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D6, D7, B4, B5 }
25-
26-
/* COL2ROW or ROW2COL */
27-
#define DIODE_DIRECTION COL2ROW
28-
2921
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
3022
#define LOCKING_SUPPORT_ENABLE
3123

keyboards/1upkeyboards/1up60hte/info.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x6874",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"],
13+
"rows": ["B3", "B2", "B1", "B0", "D4"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"backlight": {
1217
"pin": "B7"
1318
},

keyboards/1upkeyboards/1up60rgb/config.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
#pragma once
22

3-
4-
/* key matrix pins */
5-
#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
6-
#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
7-
8-
/* COL2ROW or ROW2COL */
9-
#define DIODE_DIRECTION COL2ROW
10-
113
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
124
#define LOCKING_SUPPORT_ENABLE
135

keyboards/1upkeyboards/1up60rgb/info.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x7267",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
13+
"rows": ["D0", "D1", "D2", "D3", "D5"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"backlight": {
1217
"pin": "B6",
1318
"levels": 5

keyboards/1upkeyboards/pi40/config.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
#define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c"
1616
#endif
1717

18-
#define DIODE_DIRECTION COL2ROW
19-
20-
#define MATRIX_ROW_PINS { GP21, GP20, GP19, GP18 }
21-
#define MATRIX_COL_PINS { GP1, GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12 }
22-
2318
#define RGB_DI_PIN GP0
2419
#define RGB_MATRIX_LED_COUNT 47
2520
#define RGBLED_NUM 47

keyboards/1upkeyboards/pi40/info.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
"pid": "0x5600",
77
"device_version": "0.0.1"
88
},
9+
"matrix_pins": {
10+
"cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12"],
11+
"rows": ["GP21", "GP20", "GP19", "GP18"]
12+
},
13+
"diode_direction": "COL2ROW",
914
"encoder": {
1015
"rotary": [
1116
{"pin_a": "GP14", "pin_b": "GP13"}

keyboards/1upkeyboards/super16/config.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
#pragma once
1919

20-
21-
/*
22-
* Keyboard Matrix Assignments
23-
*
24-
* Change this to how you wired your keyboard
25-
* COLS: AVR pins used for columns, left to right
26-
* ROWS: AVR pins used for rows, top to bottom
27-
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
28-
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
29-
*
30-
*/
31-
#define MATRIX_ROW_PINS \
32-
{ D1, D0, F4, F5 }
33-
#define MATRIX_COL_PINS \
34-
{ D4, C6, F6, F7 }
35-
36-
/* COL2ROW, ROW2COL*/
37-
#define DIODE_DIRECTION COL2ROW
38-
3920
#define RGB_DI_PIN D3
4021
#ifdef RGB_DI_PIN
4122
# define RGBLED_NUM 16 // Add 12 if attaching the RGB LED ring

keyboards/1upkeyboards/super16/info.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x5516",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["D4", "C6", "F6", "F7"],
13+
"rows": ["D1", "D0", "F4", "F5"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"processor": "atmega32u4",
1217
"bootloader": "caterina",
1318
"community_layouts": ["ortho_4x4", "numpad_4x4"],

keyboards/1upkeyboards/super16v2/config.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,6 @@
1919

2020
#define MOUSEKEY_MOVE_DELTA 25
2121

22-
/*
23-
* Keyboard Matrix Assignments
24-
*
25-
* Change this to how you wired your keyboard
26-
* COLS: AVR pins used for columns, left to right
27-
* ROWS: AVR pins used for rows, top to bottom
28-
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
29-
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
30-
*
31-
*/
32-
33-
// 0 1 2 3
34-
#define MATRIX_ROW_PINS { D1, D2, D3, D4 }
35-
#define MATRIX_COL_PINS { D5, D6, C2, D0 }
36-
37-
/* COL2ROW, ROW2COL */
38-
#define DIODE_DIRECTION COL2ROW
39-
4022
#define RGB_DI_PIN B5
4123
#define RGB_MATRIX_LED_COUNT 20
4224
#ifdef RGB_DI_PIN

keyboards/1upkeyboards/super16v2/info.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x5517",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["D5", "D6", "C2", "D0"],
13+
"rows": ["D1", "D2", "D3", "D4"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"encoder": {
1217
"rotary": [
1318
{"pin_a": "B1", "pin_b": "B2"},

keyboards/1upkeyboards/sweet16/v1/config.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
#pragma once
22

3-
4-
/* key matrix pins */
5-
#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
6-
#define MATRIX_COL_PINS { D1, D0, D4, C6 }
7-
8-
/* COL2ROW or ROW2COL */
9-
#define DIODE_DIRECTION COL2ROW
10-
113
#ifndef CONVERT_TO_PROTON_C
124
# define LED_NUM_LOCK_PIN B0 // RXLED
135
# define LED_CAPS_LOCK_PIN D5 // TXLED

keyboards/1upkeyboards/sweet16/v1/info.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
"pid": "0x0161",
44
"device_version": "0.0.1"
55
},
6+
"matrix_pins": {
7+
"cols": ["D1", "D0", "D4", "C6"],
8+
"rows": ["F4", "F5", "F6", "F7"]
9+
},
10+
"diode_direction": "COL2ROW",
611
"processor": "atmega32u4",
712
"bootloader": "caterina"
813
}

keyboards/25keys/aleth42/rev0/config.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
#pragma once
1919

20-
21-
/* key matrix pins */
22-
#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
23-
#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, C2, C4, C5, C6 }
24-
25-
/* COL2ROW, ROW2COL*/
26-
#define DIODE_DIRECTION COL2ROW
27-
2820
#define RGB_DI_PIN C7
2921
#ifdef RGB_DI_PIN
3022
#define RGBLED_NUM 6

keyboards/25keys/aleth42/rev0/info.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
"usb": {
33
"device_version": "0.0.0"
44
},
5+
"matrix_pins": {
6+
"cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2", "C4", "C5", "C6"],
7+
"rows": ["B0", "B1", "B2", "B3"]
8+
},
9+
"diode_direction": "COL2ROW",
510
"encoder": {
611
"rotary": [
712
{"pin_a": "B6", "pin_b": "B7"},

keyboards/25keys/aleth42/rev1/config.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
#pragma once
1919

20-
21-
/* key matrix pins */
22-
#define MATRIX_ROW_PINS { B4, B0, B2, B1 }
23-
#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, D6, D4, F7, F0, F1, F4 }
24-
25-
/* COL2ROW, ROW2COL*/
26-
#define DIODE_DIRECTION COL2ROW
27-
2820
#define RGB_DI_PIN B3
2921
#ifdef RGB_DI_PIN
3022
#define RGBLED_NUM 8

keyboards/25keys/aleth42/rev1/info.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
"usb": {
33
"device_version": "0.0.1"
44
},
5+
"matrix_pins": {
6+
"cols": ["D5", "D3", "D2", "D1", "D0", "D6", "D4", "F7", "F0", "F1", "F4"],
7+
"rows": ["B4", "B0", "B2", "B1"]
8+
},
9+
"diode_direction": "COL2ROW",
510
"encoder": {
611
"rotary": [
712
{"pin_a": "B5", "pin_b": "B6"},

0 commit comments

Comments
 (0)