From 9e64300e67720a5468c2585391250ca5579b311b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:00:24 +1100 Subject: Move matrix config to info.json, part 4 (#20001) --- keyboards/peej/lumberjack/config.h | 7 ------- keyboards/peej/lumberjack/info.json | 5 +++++ keyboards/peej/rosaline/config.h | 7 ------- keyboards/peej/rosaline/ortho/info.json | 5 +++++ keyboards/peej/rosaline/staggered/info.json | 5 +++++ keyboards/peej/tripel/config.h | 23 ----------------------- keyboards/peej/tripel/info.json | 5 +++++ 7 files changed, 20 insertions(+), 37 deletions(-) delete mode 100644 keyboards/peej/tripel/config.h (limited to 'keyboards/peej') diff --git a/keyboards/peej/lumberjack/config.h b/keyboards/peej/lumberjack/config.h index 032cdf4e23..0079764d8e 100644 --- a/keyboards/peej/lumberjack/config.h +++ b/keyboards/peej/lumberjack/config.h @@ -16,11 +16,4 @@ #pragma once - -#define MATRIX_ROW_PINS { C0, B5, B4, B3, B2, B1 } -#define MATRIX_COL_PINS { B0, D7, D6, D5, D4, D1, D0, C1, C2, C3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/peej/lumberjack/info.json b/keyboards/peej/lumberjack/info.json index 7e3878151f..8c37a5bf74 100644 --- a/keyboards/peej/lumberjack/info.json +++ b/keyboards/peej/lumberjack/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "D5", "D4", "D1", "D0", "C1", "C2", "C3"], + "rows": ["C0", "B5", "B4", "B3", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "community_layouts": ["ortho_5x12"], diff --git a/keyboards/peej/rosaline/config.h b/keyboards/peej/rosaline/config.h index 0bd9a069d0..265558e515 100644 --- a/keyboards/peej/rosaline/config.h +++ b/keyboards/peej/rosaline/config.h @@ -16,11 +16,4 @@ #pragma once - -#define MATRIX_ROW_PINS { C0, B5, B4, B3, B2, B1, C3, D5 } -#define MATRIX_COL_PINS { B0, D7, D6, C2, D4, D1, D0, C1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/peej/rosaline/ortho/info.json b/keyboards/peej/rosaline/ortho/info.json index 2be28d4ef6..fcd6fce1b4 100644 --- a/keyboards/peej/rosaline/ortho/info.json +++ b/keyboards/peej/rosaline/ortho/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"], + "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/peej/rosaline/staggered/info.json b/keyboards/peej/rosaline/staggered/info.json index f37e073fbd..f110f0e325 100644 --- a/keyboards/peej/rosaline/staggered/info.json +++ b/keyboards/peej/rosaline/staggered/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"], + "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "layout_aliases": { diff --git a/keyboards/peej/tripel/config.h b/keyboards/peej/tripel/config.h deleted file mode 100644 index 2d50ad8038..0000000000 --- a/keyboards/peej/tripel/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -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 . -*/ - -#pragma once - - -#define MATRIX_ROW_PINS { C6, D4, D0, B4, E6, D7, D1, D2, D3 } -#define MATRIX_COL_PINS { B5, B6, B2, B3, B1, F7, F6, F5 } - -/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/peej/tripel/info.json b/keyboards/peej/tripel/info.json index 3816cf7592..c5aebfd106 100644 --- a/keyboards/peej/tripel/info.json +++ b/keyboards/peej/tripel/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], + "rows": ["C6", "D4", "D0", "B4", "E6", "D7", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { -- cgit v1.2.3