Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move matrix config to info.json, part 3 #19991

Merged
merged 7 commits into from
Mar 10, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 0 additions & 18 deletions keyboards/e88/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,6 @@

#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 { B7, D7, B4, C6, B5, B6 }
#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D0, D1, D2, D3, B3, B2, B1, E6, D5, D6, D4 }


/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
Expand Down
5 changes: 5 additions & 0 deletions keyboards/e88/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x0187",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D0", "D1", "D2", "D3", "B3", "B2", "B1", "E6", "D5", "D6", "D4"],
"rows": ["B7", "D7", "B4", "C6", "B5", "B6"]
},
"diode_direction": "COL2ROW",
"qmk_lufa_bootloader": {
"esc_input": "B7",
"esc_output": "F0"
Expand Down
7 changes: 0 additions & 7 deletions keyboards/ealdin/quadrant/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once


#define MATRIX_ROW_PINS { B2, F7, B3, B6, B1 }
#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B7, F6, F5, F4 }

/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

#define RGB_DI_PIN C7
#ifdef RGB_DI_PIN
#define RGBLED_NUM 7
Expand Down
5 changes: 5 additions & 0 deletions keyboards/ealdin/quadrant/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x5154",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B7", "F6", "F5", "F4"],
"rows": ["B2", "F7", "B3", "B6", "B1"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D5", "pin_b": "F1"}
Expand Down
17 changes: 0 additions & 17 deletions keyboards/earth_rover/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 { D4, C6, D7, E6 }
#define MATRIX_COL_PINS { F4, F5, F6, F7 }

/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
Expand Down
5 changes: 5 additions & 0 deletions keyboards/earth_rover/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0xEE11",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7"],
"rows": ["D4", "C6", "D7", "E6"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
4 changes: 0 additions & 4 deletions keyboards/eason/aeroboard/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@

#pragma once

#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12, A5, A4 }
#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 }
#define DIODE_DIRECTION COL2ROW

#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
Expand Down
5 changes: 5 additions & 0 deletions keyboards/eason/aeroboard/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x8870",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5", "A4"],
"rows": ["B10", "B1", "B0", "A7", "A6"]
},
"diode_direction": "COL2ROW",
"processor": "STM32F103",
"bootloader": "stm32duino",
"layouts": {
Expand Down
16 changes: 0 additions & 16 deletions keyboards/eason/capsule65/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,6 @@

#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 { F4, D1, B7, D0, F5 }
#define MATRIX_COL_PINS { D5, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7, E2, B3, B1, B0, B2 }

#define DIODE_DIRECTION COL2ROW

#define RGB_DI_PIN F7
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
Expand Down
5 changes: 5 additions & 0 deletions keyboards/eason/capsule65/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x6E6E",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D5", "D2", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "B3", "B1", "B0", "B2"],
"rows": ["F4", "D1", "B7", "D0", "F5"]
},
"diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "F6"
},
Expand Down
6 changes: 0 additions & 6 deletions keyboards/eason/greatsword80/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,5 @@

#pragma once

#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4 }
#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, C6, C7, E2, F7, F6, F5, F4, B0, B1, B2, B3 }


#define DIODE_DIRECTION COL2ROW

#define LED_CAPS_LOCK_PIN F0
#define LED_PIN_ON_STATE 0
5 changes: 5 additions & 0 deletions keyboards/eason/greatsword80/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x998F",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "F7", "F6", "F5", "F4", "B0", "B1", "B2", "B3"],
"rows": ["D0", "D1", "D2", "D3", "D5", "D4"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
7 changes: 0 additions & 7 deletions keyboards/ebastler/isometria_75/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once


#define MATRIX_ROW_PINS { A15, B4, B5, B6, B7, B8}
#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A10, A13, A14, B9, C13, F0, F1, A0, B2, B10, B11 }

/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

/* Backlight */
#define BACKLIGHT_PWM_DRIVER PWMD1
#define BACKLIGHT_PWM_CHANNEL 2
Expand Down
5 changes: 5 additions & 0 deletions keyboards/ebastler/isometria_75/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x1337",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B12", "B13", "B14", "B15", "A8", "A10", "A13", "A14", "B9", "C13", "F0", "F1", "A0", "B2", "B10", "B11"],
"rows": ["A15", "B4", "B5", "B6", "B7", "B8"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "C15", "pin_b": "C14", "resolution": 2}
Expand Down
4 changes: 0 additions & 4 deletions keyboards/eco/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once


/* 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
/* Locking resynchronize hack */
Expand Down
24 changes: 0 additions & 24 deletions keyboards/eco/rev1/config.h

This file was deleted.

7 changes: 6 additions & 1 deletion keyboards/eco/rev1/info.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"usb": {
"device_version": "0.0.1"
}
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
"rows": ["B1", "B6", "B2", "B3"]
},
"diode_direction": "COL2ROW"
}
24 changes: 0 additions & 24 deletions keyboards/eco/rev2/config.h

This file was deleted.

7 changes: 6 additions & 1 deletion keyboards/eco/rev2/info.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"usb": {
"device_version": "0.0.2"
}
},
"matrix_pins": {
"cols": ["D1", "D0", "D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D2", "D3"],
"rows": ["D7", "B5", "B4", "E6"]
},
"diode_direction": "COL2ROW"
}
16 changes: 0 additions & 16 deletions keyboards/edc40/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,6 @@
*/
#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 { D4, D6, D7, F7 }
#define MATRIX_COL_PINS { B0, B1, B2, B3, D0, D1, D2, D3, D5, B4, B5 }

#define DIODE_DIRECTION COL2ROW

#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE
#define RGB_DI_PIN C6
5 changes: 5 additions & 0 deletions keyboards/edc40/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x0002",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "B4", "B5"],
"rows": ["D4", "D6", "D7", "F7"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
9 changes: 0 additions & 9 deletions keyboards/edda/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once


// ROWS: Top to bottom, COLS: Left to right

#define MATRIX_ROW_PINS {F1, F0, E6, B5, B4}
#define MATRIX_COL_PINS {F4, F5, F6, F7, C7, C6, B6, B3, D7, D6, D4, D5, D3, D2, D1, D0 }

/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

// Indicators
#define INDICATOR_PIN_0 B2
#define INDICATOR_PIN_1 B1
Expand Down
5 changes: 5 additions & 0 deletions keyboards/edda/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x4544",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B3", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
"rows": ["F1", "F0", "E6", "B5", "B4"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
"community_layouts": ["alice", "alice_split_bs"],
Expand Down
18 changes: 0 additions & 18 deletions keyboards/edi/hardlight/mk1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +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 { B0, B1, B2, B3, D4, D6, D7, B4 }
#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B5 }


/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
Expand Down
7 changes: 6 additions & 1 deletion keyboards/edi/hardlight/mk1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@
"pid": "0x2401",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5"],
"rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_ortho_4x16": {
"layout": [
Expand Down
Loading