Skip to content

Commit dd086a5

Browse files
authored
Move matrix config to info.json, part 2 (#19987)
1 parent 80661e5 commit dd086a5

File tree

494 files changed

+1235
-3287
lines changed

Some content is hidden

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

494 files changed

+1235
-3287
lines changed

keyboards/facew/config.h

-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2020

2121
#define RGBLED_NUM 16
2222

23-
#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
24-
#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5 }
25-
26-
#define DIODE_DIRECTION COL2ROW
27-
2823
#define RGBLIGHT_EFFECT_BREATHING
2924
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
3025
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL

keyboards/facew/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x422D",
99
"device_version": "2.0.0"
1010
},
11+
"matrix_pins": {
12+
"cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5"],
13+
"rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"backlight": {
1217
"pin": "D4"
1318
},

keyboards/fallacy/config.h

-10
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,6 @@
1515
*/
1616
#pragma once
1717

18-
19-
/* key matrix pins
20-
*/
21-
#define MATRIX_ROW_PINS { B1, B2, B3, C6, C7 }
22-
#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, D4, D5, D3 }
23-
24-
/* COL2ROW or ROW2COL
25-
*/
26-
#define DIODE_DIRECTION COL2ROW
27-
2818
/* IS31FL3731 driver address (for status LEDs)
2919
* Using the default defines here, but using a custom implementation
3020
*/

keyboards/fallacy/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
"pid": "0xBFFA",
88
"device_version": "0.0.1"
99
},
10+
"matrix_pins": {
11+
"cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
12+
"rows": ["B1", "B2", "B3", "C6", "C7"]
13+
},
14+
"diode_direction": "COL2ROW",
1015
"processor": "atmega32u4",
1116
"bootloader": "atmel-dfu",
1217
"community_layouts": ["alice", "alice_split_bs"],

keyboards/fc980c/config.h

-5
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2525
#define MATRIX_ROWS 8
2626
#define MATRIX_COLS 16
2727

28-
// #define MATRIX_ROW_PINS { B0, B2, B4, B5, B6 }
29-
// #define MATRIX_COL_PINS { F5, B1, F0, F1, F4, B3, D7, D6, D4, D5, D3, D2, D1, D0 }
30-
31-
//#define DIODE_DIRECTION
32-
3328
/*
3429
* Feature disable options
3530
* These options are also useful to firmware size reduction.

keyboards/feels/feels65/config.h

-23
This file was deleted.

keyboards/feels/feels65/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0xE965",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3"],
13+
"rows": ["D5", "D3", "D2", "D1", "D0"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"processor": "atmega32u4",
1217
"bootloader": "atmel-dfu",
1318
"community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"],

keyboards/feker/ik75/config.h

-8
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@
1717

1818
#pragma once
1919

20-
21-
/* key matrix pins */
22-
#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
23-
#define MATRIX_COL_PINS { E6, B0, B1, B2, B3, B7, D2, D3, D5, D4, D6, D7, B4, B5, B6, E2 }
24-
25-
/* COL2ROW or ROW2COL */
26-
#define DIODE_DIRECTION ROW2COL
27-
2820
#ifdef RGB_MATRIX_ENABLE
2921
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
3022
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200

keyboards/feker/ik75/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x1226",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["E6", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "E2"],
13+
"rows": ["F7", "F6", "F5", "F4", "F1", "F0"]
14+
},
15+
"diode_direction": "ROW2COL",
1116
"encoder": {
1217
"rotary": [
1318
{"pin_a": "C6", "pin_b": "C7", "resolution": 2}

keyboards/ffkeebs/puca/config.h

-7
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
#pragma once
1919

20-
21-
// 0 , 1 , 2 , 3 , 4 , 5
22-
#define MATRIX_ROW_PINS { B4, E6, D7, B5, C6, F6}
23-
#define MATRIX_COL_PINS { F7, B1, B3, B2, B6}
24-
25-
#define DIODE_DIRECTION COL2ROW
26-
2720
#ifdef RGBLIGHT_ENABLE
2821
#define RGB_DI_PIN D4
2922

keyboards/ffkeebs/puca/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x0002",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["F7", "B1", "B3", "B2", "B6"],
13+
"rows": ["B4", "E6", "D7", "B5", "C6", "F6"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"encoder": {
1217
"rotary": [
1318
{"pin_a": "F4", "pin_b": "F5"}

keyboards/ffkeebs/siris/config.h

-27
This file was deleted.

keyboards/ffkeebs/siris/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0xE96C",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["D2", "D1", "D0", "B7", "B3", "B2", "F0", "F1", "F4", "F5", "F6", "F7"],
13+
"rows": ["B5", "B4", "D7", "D6", "D4"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"encoder": {
1217
"rotary": [
1318
{"pin_a": "D3", "pin_b": "D5"},

keyboards/fjlabs/7vhotswap/config.h

-19
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-
32-
// Checked with Eagle Schematic
33-
#define MATRIX_ROW_PINS { B0, F4, F1, F7, F6, F5 }
34-
#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
35-
36-
/* COL2ROW or ROW2COL */
37-
#define DIODE_DIRECTION COL2ROW
38-
3920
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
4021
#define LOCKING_SUPPORT_ENABLE
4122
/* Locking resynchronize hack */

keyboards/fjlabs/7vhotswap/info.json

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

keyboards/fjlabs/ad65/config.h

-19
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-
32-
// Checked with Eagle Schematic
33-
#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
34-
#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
35-
36-
/* COL2ROW or ROW2COL */
37-
#define DIODE_DIRECTION COL2ROW
38-
3920
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
4021
#define LOCKING_SUPPORT_ENABLE
4122
/* Locking resynchronize hack */

keyboards/fjlabs/ad65/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x0010",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
13+
"rows": ["F4", "F1", "F7", "F6", "F5"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"indicators": {
1217
"caps_lock": "C7"
1318
},

keyboards/fjlabs/avalon/config.h

-19
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-
32-
// Checked with Eagle Schematic
33-
#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
34-
#define MATRIX_COL_PINS { B0, F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
35-
36-
/* COL2ROW or ROW2COL */
37-
#define DIODE_DIRECTION COL2ROW
38-
3920
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
4021
#define LOCKING_SUPPORT_ENABLE
4122
/* Locking resynchronize hack */

keyboards/fjlabs/avalon/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x0015",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["B0", "F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
13+
"rows": ["F4", "F1", "F7", "F6", "F5"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"indicators": {
1217
"caps_lock": "C7"
1318
},

keyboards/fjlabs/bks65/config.h

-19
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-
32-
// Checked with Eagle Schematic
33-
#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
34-
#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
35-
36-
/* COL2ROW or ROW2COL */
37-
#define DIODE_DIRECTION COL2ROW
38-
3920
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
4021
#define LOCKING_SUPPORT_ENABLE
4122
/* Locking resynchronize hack */

keyboards/fjlabs/bks65/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x1001",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
13+
"rows": ["F4", "F1", "F7", "F6", "F5"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"indicators": {
1217
"caps_lock": "C7"
1318
},

keyboards/fjlabs/bks65solder/config.h

-19
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-
32-
// Checked with Eagle Schematic
33-
#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
34-
#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
35-
36-
/* COL2ROW or ROW2COL */
37-
#define DIODE_DIRECTION COL2ROW
38-
3920
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
4021
#define LOCKING_SUPPORT_ENABLE
4122
/* Locking resynchronize hack */

keyboards/fjlabs/bks65solder/info.json

+5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"pid": "0x0099",
99
"device_version": "0.0.1"
1010
},
11+
"matrix_pins": {
12+
"cols": ["F0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D7", "B4", "B5", "B6", "C6"],
13+
"rows": ["F4", "F1", "F7", "F6", "F5"]
14+
},
15+
"diode_direction": "COL2ROW",
1116
"processor": "atmega32u4",
1217
"bootloader": "atmel-dfu",
1318
"community_layouts": ["65_ansi"],

0 commit comments

Comments
 (0)