diff options
author | Ryan <[email protected]> | 2023-03-11 05:41:58 +1100 |
---|---|---|
committer | GitHub <[email protected]> | 2023-03-11 05:41:58 +1100 |
commit | e933e0411f442fa411d3d5ec488180fee241e2ef (patch) | |
tree | f091f00a1408d752389385ff793c2878ec99e368 /keyboards/wavtype | |
parent | 1022afa6c24a64c78d1c9be99a695ff5335876f7 (diff) | |
download | qmk_firmware-e933e0411f442fa411d3d5ec488180fee241e2ef.tar.gz qmk_firmware-e933e0411f442fa411d3d5ec488180fee241e2ef.zip |
Move matrix config to info.json, part 5 (#20003)
Co-authored-by: Nick Brassel <[email protected]>
Diffstat (limited to 'keyboards/wavtype')
-rw-r--r-- | keyboards/wavtype/foundation/config.h | 17 | ||||
-rw-r--r-- | keyboards/wavtype/foundation/info.json | 5 | ||||
-rw-r--r-- | keyboards/wavtype/p01_ultra/config.h | 17 | ||||
-rw-r--r-- | keyboards/wavtype/p01_ultra/info.json | 5 |
4 files changed, 10 insertions, 34 deletions
diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h index 7c189d3ad1..91ce68b938 100644 --- a/keyboards/wavtype/foundation/config.h +++ b/keyboards/wavtype/foundation/config.h @@ -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 { B3, B2, B1, F0, F1 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, D2, D1, D0, D3, D5, D4, B7, D6, D7, B4, B5, B6, C6, C7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN # define RGBLED_NUM 16 diff --git a/keyboards/wavtype/foundation/info.json b/keyboards/wavtype/foundation/info.json index 36153f2bca..3b770ae352 100644 --- a/keyboards/wavtype/foundation/info.json +++ b/keyboards/wavtype/foundation/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "D2", "D1", "D0", "D3", "D5", "D4", "B7", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["B3", "B2", "B1", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [0, 1] }, diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h index ad046b7fd1..534b0f83da 100644 --- a/keyboards/wavtype/p01_ultra/config.h +++ b/keyboards/wavtype/p01_ultra/config.h @@ -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 { B4, D7, D6, B5, B6, D4 } -#define MATRIX_COL_PINS { C6, C7, F7, F6, F5, F4, F1, F0, B3, B2, B1, B0, B7, D0, D1, D2, D3, D5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN # define RGBLED_NUM 18 diff --git a/keyboards/wavtype/p01_ultra/info.json b/keyboards/wavtype/p01_ultra/info.json index d88ac83836..1c27944c76 100644 --- a/keyboards/wavtype/p01_ultra/info.json +++ b/keyboards/wavtype/p01_ultra/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5"], + "rows": ["B4", "D7", "D6", "B5", "B6", "D4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { |