From dd086a51d82a574a55eb3b89e8943301d72296f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 10 Mar 2023 22:16:56 +1100 Subject: Move matrix config to info.json, part 2 (#19987) --- keyboards/oddball/config.h | 4 ---- keyboards/oddball/v1/config.h | 30 ------------------------------ keyboards/oddball/v1/info.json | 5 +++++ keyboards/oddball/v2/config.h | 30 ------------------------------ keyboards/oddball/v2/info.json | 5 +++++ keyboards/oddball/v2_1/config.h | 30 ------------------------------ keyboards/oddball/v2_1/info.json | 5 +++++ 7 files changed, 15 insertions(+), 94 deletions(-) delete mode 100644 keyboards/oddball/v1/config.h delete mode 100644 keyboards/oddball/v2/config.h delete mode 100644 keyboards/oddball/v2_1/config.h (limited to 'keyboards/oddball') diff --git a/keyboards/oddball/config.h b/keyboards/oddball/config.h index 3666225a0e..71c4ecd4db 100644 --- a/keyboards/oddball/config.h +++ b/keyboards/oddball/config.h @@ -16,10 +16,6 @@ #pragma once - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Split Keyboard specific options */ #define USE_I2C #define SPLIT_USB_DETECT diff --git a/keyboards/oddball/v1/config.h b/keyboards/oddball/v1/config.h deleted file mode 100644 index 7a33a7049a..0000000000 --- a/keyboards/oddball/v1/config.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 Alexander Tulloh - * - * 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 - -/* - * 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 { F6, B5, B6, F7 } -#define MATRIX_COL_PINS { D6, D7, B4, D3, C6, C7 } diff --git a/keyboards/oddball/v1/info.json b/keyboards/oddball/v1/info.json index 66ed86e13c..f2bc9062ed 100644 --- a/keyboards/oddball/v1/info.json +++ b/keyboards/oddball/v1/info.json @@ -1,3 +1,8 @@ { + "matrix_pins": { + "cols": ["D6", "D7", "B4", "D3", "C6", "C7"], + "rows": ["F6", "B5", "B6", "F7"] + }, + "diode_direction": "COL2ROW", "bootloader": "halfkay" } diff --git a/keyboards/oddball/v2/config.h b/keyboards/oddball/v2/config.h deleted file mode 100644 index 793d305931..0000000000 --- a/keyboards/oddball/v2/config.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 Alexander Tulloh - * - * 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 - -/* - * 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, E6, D7, C6 } -#define MATRIX_COL_PINS { B7, B5, B4, F5, F6, F7 } diff --git a/keyboards/oddball/v2/info.json b/keyboards/oddball/v2/info.json index cc90702804..854f80649e 100644 --- a/keyboards/oddball/v2/info.json +++ b/keyboards/oddball/v2/info.json @@ -1,3 +1,8 @@ { + "matrix_pins": { + "cols": ["B7", "B5", "B4", "F5", "F6", "F7"], + "rows": ["D4", "E6", "D7", "C6"] + }, + "diode_direction": "COL2ROW", "bootloader": "qmk-dfu" } diff --git a/keyboards/oddball/v2_1/config.h b/keyboards/oddball/v2_1/config.h deleted file mode 100644 index 9f138d7d52..0000000000 --- a/keyboards/oddball/v2_1/config.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 Alexander Tulloh - * - * 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 - -/* - * 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, E6, D7, C6 } -#define MATRIX_COL_PINS { B6, B5, B4, F5, F6, F7 } diff --git a/keyboards/oddball/v2_1/info.json b/keyboards/oddball/v2_1/info.json index cc90702804..ef4a6de85d 100644 --- a/keyboards/oddball/v2_1/info.json +++ b/keyboards/oddball/v2_1/info.json @@ -1,3 +1,8 @@ { + "matrix_pins": { + "cols": ["B6", "B5", "B4", "F5", "F6", "F7"], + "rows": ["D4", "E6", "D7", "C6"] + }, + "diode_direction": "COL2ROW", "bootloader": "qmk-dfu" } -- cgit v1.2.3