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 7 #20020

Merged
merged 1 commit into from
Mar 10, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
  •  
  •  
  •  
8 changes: 0 additions & 8 deletions keyboards/m10a/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@

#pragma once


/* Planck PCB default pin-out */
#define MATRIX_ROW_PINS { B6, F7, F6, D6 }
#define MATRIX_COL_PINS { F5, F1, F0 }

/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION ROW2COL

/* 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/m10a/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x00AA",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F5", "F1", "F0"],
"rows": ["B6", "F7", "F6", "D6"]
},
"diode_direction": "ROW2COL",
"backlight": {
"pin": "B7",
"levels": 6
Expand Down
17 changes: 0 additions & 17 deletions keyboards/machine_industries/m4_a/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,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 { C7, C6 }
#define MATRIX_COL_PINS { F6, F7 }

/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION ROW2COL

/* 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/machine_industries/m4_a/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x004A",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F6", "F7"],
"rows": ["C7", "C6"]
},
"diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
Expand Down
25 changes: 0 additions & 25 deletions keyboards/machkeyboards/mach3/config.h

This file was deleted.

5 changes: 5 additions & 0 deletions keyboards/machkeyboards/mach3/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x4D33",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["E6", "B4", "B5"],
"rows": ["D1", "D0", "D4"]
},
"diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 5,
Expand Down
8 changes: 0 additions & 8 deletions keyboards/macro1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@

#pragma once


/* key matrix pins */
#define MATRIX_ROW_PINS { E6, B7, D0, D1, D2, B3 }
#define MATRIX_COL_PINS { D3, D4, D6, D7 }

/* 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

Expand Down
5 changes: 5 additions & 0 deletions keyboards/macro1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x9999",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D3", "D4", "D6", "D7"],
"rows": ["E6", "B7", "D0", "D1", "D2", "B3"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F0", "pin_b": "F1"}
Expand Down
9 changes: 0 additions & 9 deletions keyboards/majistic/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once


#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2 }
#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, F4, F5 } // F4, F5 is dummy
#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS_RIGHT { B6, B2, B3, B1, F7, F6, F5, F4 }

/* 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
13 changes: 12 additions & 1 deletion keyboards/majistic/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,19 @@
"pid": "0x6E55",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
"rows": ["F6", "F7", "B1", "B3", "B2"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
"soft_serial_pin": "D2",
"matrix_pins": {
"right": {
"cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
}
},
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
Expand Down
7 changes: 0 additions & 7 deletions keyboards/makrosu/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@

#pragma once


/* key matrix pins */
#define MATRIX_ROW_PINS { B6 }
#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5}

#define TAP_CODE_DELAY 10
/* 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
Expand Down
5 changes: 5 additions & 0 deletions keyboards/makrosu/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x8585",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B2", "B3", "B1", "F7", "F6", "F5"],
"rows": ["B6"]
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "E6", "pin_b": "D1"}
Expand Down
6 changes: 0 additions & 6 deletions keyboards/malevolti/lyra/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,4 @@
*/
#pragma once

// wiring of each half
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 }

#define DIODE_DIRECTION COL2ROW

#define TAPPING_TERM 100
5 changes: 5 additions & 0 deletions keyboards/malevolti/lyra/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x4C43",
"device_version": "30.3.1"
},
"matrix_pins": {
"cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
Expand Down
6 changes: 0 additions & 6 deletions keyboards/malevolti/superlyra/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,4 @@
*/
#pragma once

// wiring of each half
#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 }
#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1 }

#define DIODE_DIRECTION COL2ROW

#define TAPPING_TERM 100
5 changes: 5 additions & 0 deletions keyboards/malevolti/superlyra/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x4C53",
"device_version": "30.3.1"
},
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"],
"rows": ["B7", "B3", "B2", "B1", "B0"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
17 changes: 0 additions & 17 deletions keyboards/manta60/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 ,B4}
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }

/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW

#define SELECT_SOFT_SERIAL_SPEED 1

#define RGB_DI_PIN D3
Expand Down
5 changes: 5 additions & 0 deletions keyboards/manta60/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x991D",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
Expand Down
7 changes: 0 additions & 7 deletions keyboards/manyboard/macro/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

/* key matrix pins */
#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
#define MATRIX_COL_PINS { D4, D5, D6, D7 }

/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION ROW2COL

/* RGB Pins */
#define RGB_DI_PIN B6
#define RGBLED_NUM 2
Expand Down
5 changes: 5 additions & 0 deletions keyboards/manyboard/macro/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x0015",
"device_version": "1.0.3"
},
"matrix_pins": {
"cols": ["D4", "D5", "D6", "D7"],
"rows": ["D0", "D1", "D2", "D3"]
},
"diode_direction": "ROW2COL",
"encoder": {
"rotary": [
{"pin_a": "C6", "pin_b": "C7"}
Expand Down
8 changes: 0 additions & 8 deletions keyboards/maple_computing/6ball/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once


/* pin-out */
#define MATRIX_ROW_PINS { F5 }
#define MATRIX_COL_PINS { F4, D4, B5, B6, B2, F6 }

/* ws2812 RGB LED */
#define RGB_DI_PIN F7

Expand All @@ -37,7 +32,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLED_NUM 6 // Number of LEDs

/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW

#define TAPPING_TERM 200
5 changes: 5 additions & 0 deletions keyboards/maple_computing/6ball/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0x0007",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F4", "D4", "B5", "B6", "B2", "F6"],
"rows": ["F5"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
41 changes: 0 additions & 41 deletions keyboards/maple_computing/c39/config.h

This file was deleted.

5 changes: 5 additions & 0 deletions keyboards/maple_computing/c39/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"pid": "0xCA39",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D7", "E6", "C6", "D2", "D3"],
"rows": ["D1", "B4", "B5"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
Expand Down
Loading