diff options
Diffstat (limited to 'keyboards/redox')
-rw-r--r-- | keyboards/redox/redox.c | 16 | ||||
-rw-r--r-- | keyboards/redox/redox.h | 25 | ||||
-rw-r--r-- | keyboards/redox/rev1/base/info.json | 5 | ||||
-rw-r--r-- | keyboards/redox/rev1/config.h | 9 | ||||
-rw-r--r-- | keyboards/redox/rev1/proton_c/config.h | 7 | ||||
-rw-r--r-- | keyboards/redox/rev1/proton_c/info.json | 5 | ||||
-rw-r--r-- | keyboards/redox/rev1/proton_c/proton_c.c | 4 | ||||
-rw-r--r-- | keyboards/redox/rev1/proton_c/proton_c.h | 6 | ||||
-rw-r--r-- | keyboards/redox/rev1/rev1.c | 1 | ||||
-rw-r--r-- | keyboards/redox/rev1/rev1.h | 14 |
10 files changed, 10 insertions, 82 deletions
diff --git a/keyboards/redox/redox.c b/keyboards/redox/redox.c deleted file mode 100644 index 7fa3545a47..0000000000 --- a/keyboards/redox/redox.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2017 REPLACE_WITH_YOUR_NAME - * - * 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/>. - */ -#include "redox.h" diff --git a/keyboards/redox/redox.h b/keyboards/redox/redox.h deleted file mode 100644 index 4160096b28..0000000000 --- a/keyboards/redox/redox.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2017 REPLACE_WITH_YOUR_NAME - * - * 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 - -#if defined(KEYBOARD_redox_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_redox_media) -# include "media.h" -#endif - -#include "quantum.h" diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/info.json index d65f0e2b1b..1c251361f0 100644 --- a/keyboards/redox/rev1/base/info.json +++ b/keyboards/redox/rev1/base/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h index b768d2f19f..8b05acd7ed 100644 --- a/keyboards/redox/rev1/config.h +++ b/keyboards/redox/rev1/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } -// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h index 71d3470569..c32700fda9 100644 --- a/keyboards/redox/rev1/proton_c/config.h +++ b/keyboards/redox/rev1/proton_c/config.h @@ -3,13 +3,6 @@ #pragma once - -// wiring of each half -#undef MATRIX_ROW_PINS -#define MATRIX_ROW_PINS { B5, B3, B2, B1, B0 } -#undef MATRIX_COL_PINS -#define MATRIX_COL_PINS { A1, A0, B8, B13, B14, B15, B9 } - // //we are using hardware serial, so lets undef the softserial used otherwise /* serial.c configuration for split keyboard */ diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json index 4f6bae6891..5d5358adb0 100644 --- a/keyboards/redox/rev1/proton_c/info.json +++ b/keyboards/redox/rev1/proton_c/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "1.0.1" }, + "matrix_pins": { + "cols": ["A1", "A0", "B8", "B13", "B14", "B15", "B9"], + "rows": ["B5", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C" diff --git a/keyboards/redox/rev1/proton_c/proton_c.c b/keyboards/redox/rev1/proton_c/proton_c.c deleted file mode 100644 index 796e2c8c3d..0000000000 --- a/keyboards/redox/rev1/proton_c/proton_c.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 xerootg -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "proton_c.h" diff --git a/keyboards/redox/rev1/proton_c/proton_c.h b/keyboards/redox/rev1/proton_c/proton_c.h deleted file mode 100644 index d8813d9c4d..0000000000 --- a/keyboards/redox/rev1/proton_c/proton_c.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 xerootg -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "rev1.h" diff --git a/keyboards/redox/rev1/rev1.c b/keyboards/redox/rev1/rev1.c deleted file mode 100644 index b1ab15df32..0000000000 --- a/keyboards/redox/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "redox.h" diff --git a/keyboards/redox/rev1/rev1.h b/keyboards/redox/rev1/rev1.h index 5a24122048..4ad423d897 100644 --- a/keyboards/redox/rev1/rev1.h +++ b/keyboards/redox/rev1/rev1.h @@ -1,21 +1,7 @@ #pragma once -#include "redox.h" - -#if defined(KEYBOARD_redox_rev1_proton_c) -# include "proton_c.h" -#endif - #include "quantum.h" -#ifdef USE_I2C -#include <stddef.h> -#ifdef __AVR__ - #include <avr/io.h> - #include <avr/interrupt.h> -#endif -#endif - #define LAYOUT( \ k00, k01, k02, k03, k04, k05, k08, k09, k10, k11, k12, k13, \ k14, k15, k16, k17, k18, k19, k06, k07, k22, k23, k24, k25, k26, k27, \ |