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

Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
Ryan 2023-03-11 00:34:34 +11:00 committed by GitHub
parent 76cc7fe109
commit ace372d90d
Failed to generate hash of commit
623 changed files with 1593 additions and 4581 deletions

View file

@ -17,20 +17,4 @@ 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 { C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D1 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
#define SPLIT_HAND_PIN D0

View file

@ -1,4 +1,9 @@
{
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D1"],
"rows": ["C6", "D7", "E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D3"
},

View file

@ -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)
*
*/
#define MATRIX_ROW_PINS { C5, C4, B6, B7, C7 }
#define MATRIX_ROW_PINS_RIGHT { D3, D2, D5, D6, B0 }
/* The last three NO_PIN are dummies to make the same size as MATRIX_ROW_PINS_RIGHT. */
#define MATRIX_COL_PINS { C6, B4, B3, B2, B1, B0, NO_PIN, NO_PIN, NO_PIN }
#define MATRIX_COL_PINS_RIGHT { C7, B7, B6, B5, B4, B3, B2, C6, D4 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
#define SPLIT_HAND_PIN D1
#define SPLIT_USB_DETECT

View file

@ -1,6 +1,17 @@
{
"matrix_pins": {
"cols": ["C6", "B4", "B3", "B2", "B1", "B0", null, null, null],
"rows": ["C5", "C4", "B6", "B7", "C7"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
"soft_serial_pin": "D0",
"matrix_pins": {
"right": {
"cols": ["C7", "B7", "B6", "B5", "B4", "B3", "B2", "C6", "D4"],
"rows": ["D3", "D2", "D5", "D6", "B0"]
}
}
},
"processor": "atmega32u2",
"bootloader": "atmel-dfu"

View file

@ -17,21 +17,4 @@ 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 { F4, F5, F6, F7 }
#define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D4, D0, D1 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
#define SPLIT_HAND_PIN D3

View file

@ -8,6 +8,11 @@
"pid": "0x4000",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
"rows": ["F4", "F5", "F6", "F7"]
},
"diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},

View file

@ -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 { F1, F0, F4, F7, F6, F5 }
#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4}
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN B3
#ifdef RGB_DI_PIN
# define RGBLED_NUM 8

View file

@ -8,6 +8,11 @@
"pid": "0x4D41",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
"rows": ["F1", "F0", "F4", "F7", "F6", "F5"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {

View file

@ -1,34 +0,0 @@
/*
Copyright 2019 Naoto Takai
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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 { D1, D0, D4 }
#define MATRIX_COL_PINS { C6, D7, E6, B4, F4, F5, F6, F7, B1, B3, B2, B6 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW

View file

@ -1,4 +1,9 @@
{
"matrix_pins": {
"cols": ["C6", "D7", "E6", "B4", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D1", "D0", "D4"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina"
}

View file

@ -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)
*
*/
#define MATRIX_ROW_PINS { B2, B1, B0 }
#define MATRIX_COL_PINS { C4, C5, C6, C7, B7, B6, B5, B4, B3, D5, D4, D3 }
/* 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 */

View file

@ -1,4 +1,9 @@
{
"matrix_pins": {
"cols": ["C4", "C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "D5", "D4", "D3"],
"rows": ["B2", "B1", "B0"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u2",
"bootloader": "atmel-dfu"
}