summaryrefslogtreecommitdiff
path: root/keyboards/xelus/rs60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/xelus/rs60')
-rw-r--r--keyboards/xelus/rs60/rev1/config.h6
-rw-r--r--keyboards/xelus/rs60/rev1/info.json5
-rw-r--r--keyboards/xelus/rs60/rev1/rev1.c16
-rw-r--r--keyboards/xelus/rs60/rev2_0/config.h6
-rw-r--r--keyboards/xelus/rs60/rev2_0/info.json5
-rw-r--r--keyboards/xelus/rs60/rev2_0/rev2_0.c16
-rw-r--r--keyboards/xelus/rs60/rev2_1/config.h6
-rw-r--r--keyboards/xelus/rs60/rev2_1/info.json5
-rw-r--r--keyboards/xelus/rs60/rev2_1/rev2_1.c16
-rw-r--r--keyboards/xelus/rs60/rs60.c16
-rw-r--r--keyboards/xelus/rs60/rs60.h26
11 files changed, 15 insertions, 108 deletions
diff --git a/keyboards/xelus/rs60/rev1/config.h b/keyboards/xelus/rs60/rev1/config.h
index 78b03aa455..20970a866a 100644
--- a/keyboards/xelus/rs60/rev1/config.h
+++ b/keyboards/xelus/rs60/rev1/config.h
@@ -15,12 +15,6 @@
*/
#pragma once
-#define MATRIX_ROW_PINS { B3, B7, F0, F4, F1 }
-#define MATRIX_COL_PINS { E6, D5, D3, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4}
-
-// 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
diff --git a/keyboards/xelus/rs60/rev1/info.json b/keyboards/xelus/rs60/rev1/info.json
index 5eff1d75a6..fb410ee861 100644
--- a/keyboards/xelus/rs60/rev1/info.json
+++ b/keyboards/xelus/rs60/rev1/info.json
@@ -2,6 +2,11 @@
"usb": {
"device_version": "0.1.0"
},
+ "matrix_pins": {
+ "cols": ["E6", "D5", "D3", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["B3", "B7", "F0", "F4", "F1"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B0"
},
diff --git a/keyboards/xelus/rs60/rev1/rev1.c b/keyboards/xelus/rs60/rev1/rev1.c
deleted file mode 100644
index d997ff979e..0000000000
--- a/keyboards/xelus/rs60/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * 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 "rev1.h"
diff --git a/keyboards/xelus/rs60/rev2_0/config.h b/keyboards/xelus/rs60/rev2_0/config.h
index 5e8565b63b..5faab0f2d7 100644
--- a/keyboards/xelus/rs60/rev2_0/config.h
+++ b/keyboards/xelus/rs60/rev2_0/config.h
@@ -15,12 +15,6 @@
*/
#pragma once
-#define MATRIX_ROW_PINS { B15, B14, B12, B1, B0 }
-#define MATRIX_COL_PINS { B13, A7, A6, A5, A4, A3, A2, B7, B6, B5, B4, B3, A15, A14 }
-
-// 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
diff --git a/keyboards/xelus/rs60/rev2_0/info.json b/keyboards/xelus/rs60/rev2_0/info.json
index e2ab965c1b..f524bd938c 100644
--- a/keyboards/xelus/rs60/rev2_0/info.json
+++ b/keyboards/xelus/rs60/rev2_0/info.json
@@ -2,6 +2,11 @@
"usb": {
"device_version": "0.2.0"
},
+ "matrix_pins": {
+ "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["B15", "B14", "B12", "B1", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "A1"
},
diff --git a/keyboards/xelus/rs60/rev2_0/rev2_0.c b/keyboards/xelus/rs60/rev2_0/rev2_0.c
deleted file mode 100644
index d2abbda521..0000000000
--- a/keyboards/xelus/rs60/rev2_0/rev2_0.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * 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 "rev2_0.h"
diff --git a/keyboards/xelus/rs60/rev2_1/config.h b/keyboards/xelus/rs60/rev2_1/config.h
index 0dfcb0df72..a5910ae45c 100644
--- a/keyboards/xelus/rs60/rev2_1/config.h
+++ b/keyboards/xelus/rs60/rev2_1/config.h
@@ -15,12 +15,6 @@
*/
#pragma once
-#define MATRIX_ROW_PINS { B15, B14, B12, B1, B0 }
-#define MATRIX_COL_PINS { B13, A7, A6, A5, A4, A3, A2, B7, B6, B5, B4, B3, A15, A14 }
-
-// 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
diff --git a/keyboards/xelus/rs60/rev2_1/info.json b/keyboards/xelus/rs60/rev2_1/info.json
index 2cb5b5ddda..5f50e949a2 100644
--- a/keyboards/xelus/rs60/rev2_1/info.json
+++ b/keyboards/xelus/rs60/rev2_1/info.json
@@ -2,6 +2,11 @@
"usb": {
"device_version": "0.2.1"
},
+ "matrix_pins": {
+ "cols": ["B13", "A7", "A6", "A5", "A4", "A3", "A2", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["B15", "B14", "B12", "B1", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "A1"
},
diff --git a/keyboards/xelus/rs60/rev2_1/rev2_1.c b/keyboards/xelus/rs60/rev2_1/rev2_1.c
deleted file mode 100644
index dc234542b5..0000000000
--- a/keyboards/xelus/rs60/rev2_1/rev2_1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * 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 "rev2_1.h"
diff --git a/keyboards/xelus/rs60/rs60.c b/keyboards/xelus/rs60/rs60.c
deleted file mode 100644
index cd2fa80061..0000000000
--- a/keyboards/xelus/rs60/rs60.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Harrison Chan (Xelus)
- *
- * 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 "rs60.h"
diff --git a/keyboards/xelus/rs60/rs60.h b/keyboards/xelus/rs60/rs60.h
deleted file mode 100644
index 5a52d37a7f..0000000000
--- a/keyboards/xelus/rs60/rs60.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * 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
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_xelus_rs60_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_xelus_rs60_rev2_0)
- #include "rev2_0.h"
-#elif defined(KEYBOARD_xelus_rs60_rev2_1)
- #include "rev2_1.h"
-#endif