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
502 changed files with 1299 additions and 3461 deletions

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 { B0, B3, C7, B6, C6 }
#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D5, D3, D2, D1, D0, D4, D6, D7, B4, B5 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN F0
#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING

View File

@@ -8,6 +8,11 @@
"pid": "0x0075",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"],
"rows": ["B0", "B3", "C7", "B6", "C6"]
},
"diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"breathing": true

View File

@@ -16,23 +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 { B0, B3, C7, B6, C6 }
#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D5, D3, D2, D1, D0, D4, D6, D7, B4, B5 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
#undef RGB_DI_PIN
#define RGB_DI_PIN F0
#ifdef RGB_MATRIX_ENABLE

View File

@@ -8,6 +8,11 @@
"pid": "0x0075",
"device_version": "0.0.2"
},
"matrix_pins": {
"cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"],
"rows": ["B0", "B3", "C7", "B6", "C6"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["ortho_5x15"],

View File

@@ -17,37 +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)
*
* The matrix description in the vendor-supplied JSON file for kbfirmware.com
* had 9 columns:
* { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
* and 12 rows:
* { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
* However, the row 6 was completely empty, and the pin F0 was not actually
* routed anywhere on the PCB, therefore this row was removed to save some
* resources (the EEPROM space for dynamic keymaps is especially scarce).
*
* After doing the above change, the matrix was transposed (rows and columns
* were swapped), because a matrix with the COL2ROW layout can be scanned much
* more efficiently than a matrix with the ROW2COL layout (depending on various
* optimizations, the difference in scan rate can be over 2 times). Because of
* this, the "columns" in the matrix layout now mostly correspond to physical
* rows, and the "rows" have mostly vertical physical orientation.
*/
#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
#define MATRIX_COL_PINS { B7, B3, B2, B1, B0, E6, F1, F4, F5, F6, F7 }
#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN E2
#ifdef RGB_DI_PIN
#define RGBLED_NUM 20 /* 16 underglow LEDs, 4 top LEDs */

View File

@@ -6,6 +6,11 @@
"vid": "0x6964",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"],
"rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"]
},
"diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"breathing": true

View File

@@ -14,25 +14,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 { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION ROW2COL
#define RGB_DI_PIN E2
#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_ALTERNATING

View File

@@ -8,6 +8,11 @@
"pid": "0x0087",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
"rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
},
"diode_direction": "ROW2COL",
"backlight": {
"pin": "B6"
},

View File

@@ -18,14 +18,6 @@
#pragma once
/* key matrix pins */
#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
/* 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

View File

@@ -8,6 +8,11 @@
"pid": "0x0096",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
"rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"]
},
"diode_direction": "ROW2COL",
"backlight": {
"pin": "B6",
"levels": 7,

View File

@@ -16,14 +16,6 @@
#pragma once
/* key matrix pins */
#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, C6 }
#define MATRIX_COL_PINS { D5, D3, D2, D1, D0 }
/* 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

View File

@@ -8,6 +8,11 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D5", "D3", "D2", "D1", "D0"],
"rows": ["D4", "D6", "D7", "B4", "B5", "C6"]
},
"diode_direction": "ROW2COL",
"backlight": {
"pin": "B6"
},

View File

@@ -3,21 +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 { D4, D6, D7, B4, B5, C6 }
#define MATRIX_COL_PINS { D5, D3, D2, D1, D0 }
#define DIODE_DIRECTION ROW2COL
#define RGB_DI_PIN B1
#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE)

View File

@@ -6,6 +6,11 @@
"pid": "0x0127",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["D5", "D3", "D2", "D1", "D0"],
"rows": ["D4", "D6", "D7", "B4", "B5", "C6"]
},
"diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["numpad_6x5"],