1
0
Fork 0

Move matrix config to info.json, part 1 (#19985)

This commit is contained in:
Ryan 2023-03-06 09:53:52 +11:00 committed by GitHub
parent b34d51d08d
commit 23c365b023
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
502 changed files with 1299 additions and 3461 deletions

View file

@ -39,13 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
)
// For some reason, the rows are colums in the schematic, and vice versa
#define MATRIX_ROW_PINS { B2, B3, B18, B19, C0, C9, C10, C11, D0 }
#define MATRIX_COL_PINS { D1, D4, D5, D6, D7 }
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION ROW2COL
/* Serial config (for communication between halves) */
#define SERIAL_USART_DRIVER SD1 // Only true for the master half
#define SERIAL_USART_CONFIG { (SERIAL_USART_SPEED), } // Only field is speed

View file

@ -6,6 +6,11 @@
"pid": "0xB04D",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D1", "D4", "D5", "D6", "D7"],
"rows": ["B2", "B3", "B18", "B19", "C0", "C9", "C10", "C11", "D0"]
},
"diode_direction": "ROW2COL",
"processor": "MK20DX256",
"bootloader": "kiibohd",
"board": "IC_TEENSY_3_1",

View file

@ -1,37 +0,0 @@
/*
Copyright 2015 Jun Wako <wakojun@gmail.com>
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
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
/* disable debug print */
//#define NO_DEBUG
/* disable print */
//#define NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

View file

@ -1,22 +0,0 @@
/*
Copyright 2015 Jun Wako <wakojun@gmail.com>
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
#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 }
#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0 }

View file

@ -0,0 +1,7 @@
{
"matrix_pins": {
"cols": ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0"],
"rows": ["D1", "D2", "D3", "D4", "D5", "D6", "D7"]
},
"diode_direction": "COL2ROW"
}

View file

@ -1,24 +0,0 @@
/*
Copyright 2015 Jun Wako <wakojun@gmail.com>
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
#define MATRIX_ROW_PINS { D1, D2, D3, D4, D5, D6, D7 }
#define MATRIX_COL_PINS { B0, B1, B2, B3, B16, B17, C4, C5, D0 }

View file

@ -0,0 +1,7 @@
{
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "B16", "B17", "C4", "C5", "D0"],
"rows": ["D1", "D2", "D3", "D4", "D5", "D6", "D7"]
},
"diode_direction": "COL2ROW"
}

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 { D5, D6, D7, C1, C2, C3, C4, C5, C6, C7 }
#define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, D0, D1, D4 }
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
/*
* Feature disable options
* These options are also useful to firmware size reduction.

View file

@ -8,6 +8,11 @@
"pid": "0xB04D",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "D0", "D1", "D4"],
"rows": ["D5", "D6", "D7", "C1", "C2", "C3", "C4", "C5", "C6", "C7"]
},
"diode_direction": "COL2ROW",
"processor": "MK20DX256",
"bootloader": "kiibohd",
"board": "IC_TEENSY_3_1",

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 { D0, D1, D4, D5, D6, D7, C1, C2 }
#define MATRIX_COL_PINS { B2, B3, B18, B19, C0, C8, C9, C10, C11 }
/* COL2ROW, ROW2COL */
#define DIODE_DIRECTION COL2ROW
#define LED_BRIGHTNESS_LO 100
#define LED_BRIGHTNESS_HI 255

View file

@ -7,6 +7,11 @@
"pid": "0xB04D",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B2", "B3", "B18", "B19", "C0", "C8", "C9", "C10", "C11"],
"rows": ["D0", "D1", "D4", "D5", "D6", "D7", "C1", "C2"]
},
"diode_direction": "COL2ROW",
"processor": "MK20DX256",
"bootloader": "kiibohd",
"board": "IC_TEENSY_3_1",