summaryrefslogtreecommitdiff
path: root/keyboards/xelus
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/xelus')
-rw-r--r--keyboards/xelus/akis/config.h8
-rw-r--r--keyboards/xelus/akis/info.json5
-rw-r--r--keyboards/xelus/dawn60/dawn60.c1
-rw-r--r--keyboards/xelus/dawn60/dawn60.h24
-rw-r--r--keyboards/xelus/dawn60/rev1/config.h12
-rw-r--r--keyboards/xelus/dawn60/rev1/info.json7
-rw-r--r--keyboards/xelus/dawn60/rev1/rules.mk4
-rw-r--r--keyboards/xelus/dawn60/rev1_qmk/config.h8
-rw-r--r--keyboards/xelus/dawn60/rev1_qmk/info.json7
-rw-r--r--keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c10
-rw-r--r--keyboards/xelus/dawn60/rev1_qmk/rules.mk4
-rw-r--r--keyboards/xelus/dharma/config.h7
-rw-r--r--keyboards/xelus/dharma/dharma.c17
-rw-r--r--keyboards/xelus/dharma/info.json5
-rw-r--r--keyboards/xelus/kangaroo/rev1/config.h4
-rw-r--r--keyboards/xelus/kangaroo/rev1/info.json5
-rw-r--r--keyboards/xelus/kangaroo/rev2/config.h6
-rw-r--r--keyboards/xelus/kangaroo/rev2/info.json5
-rwxr-xr-xkeyboards/xelus/la_plus/config.h8
-rw-r--r--keyboards/xelus/la_plus/info.json5
-rw-r--r--keyboards/xelus/ninjin/config.h4
-rw-r--r--keyboards/xelus/ninjin/info.json8
-rw-r--r--keyboards/xelus/ninjin/rules.mk2
-rw-r--r--keyboards/xelus/pachi/mini_32u4/config.h4
-rw-r--r--keyboards/xelus/pachi/mini_32u4/info.json5
-rw-r--r--keyboards/xelus/pachi/mini_32u4/mini_32u4.c18
-rw-r--r--keyboards/xelus/pachi/rev1/config.h4
-rw-r--r--keyboards/xelus/pachi/rev1/info.json5
-rw-r--r--keyboards/xelus/pachi/rev1/rev1.c18
-rw-r--r--keyboards/xelus/pachi/rgb/rev1/config.h7
-rw-r--r--keyboards/xelus/pachi/rgb/rev1/info.json5
-rw-r--r--keyboards/xelus/pachi/rgb/rev2/config.h7
-rw-r--r--keyboards/xelus/pachi/rgb/rev2/info.json5
-rw-r--r--keyboards/xelus/pachi/rgb/rgb.c16
-rw-r--r--keyboards/xelus/pachi/rgb/rgb.h24
-rw-r--r--keyboards/xelus/rs108/config.h6
-rw-r--r--keyboards/xelus/rs108/info.json5
-rw-r--r--keyboards/xelus/rs108/rs108.c16
-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
-rw-r--r--keyboards/xelus/snap96/config.h8
-rw-r--r--keyboards/xelus/snap96/info.json5
-rw-r--r--keyboards/xelus/snap96/snap96.c1
-rw-r--r--keyboards/xelus/trinityxttkl/config.h4
-rw-r--r--keyboards/xelus/trinityxttkl/info.json5
-rw-r--r--keyboards/xelus/valor/rev1/config.h8
-rw-r--r--keyboards/xelus/valor/rev1/info.json5
-rw-r--r--keyboards/xelus/valor/rev1/rev1.c19
-rw-r--r--keyboards/xelus/valor/rev2/config.h8
-rw-r--r--keyboards/xelus/valor/rev2/info.json8
-rw-r--r--keyboards/xelus/valor/rev2/rules.mk1
-rw-r--r--keyboards/xelus/valor_frl_tkl/rev1/config.h8
-rw-r--r--keyboards/xelus/valor_frl_tkl/rev1/info.json5
-rw-r--r--keyboards/xelus/valor_frl_tkl/rev2_0/config.h7
-rw-r--r--keyboards/xelus/valor_frl_tkl/rev2_0/info.json5
-rw-r--r--keyboards/xelus/valor_frl_tkl/rev2_1/config.h7
-rw-r--r--keyboards/xelus/valor_frl_tkl/rev2_1/info.json5
-rw-r--r--keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c19
-rw-r--r--keyboards/xelus/xs108/config.h5
-rw-r--r--keyboards/xelus/xs108/info.json5
-rw-r--r--keyboards/xelus/xs108/xs108.c17
-rw-r--r--keyboards/xelus/xs60/hotswap/rules.mk1
-rw-r--r--keyboards/xelus/xs60/soldered/rules.mk1
72 files changed, 139 insertions, 452 deletions
diff --git a/keyboards/xelus/akis/config.h b/keyboards/xelus/akis/config.h
index b0a56cdba8..8dcff82f55 100644
--- a/keyboards/xelus/akis/config.h
+++ b/keyboards/xelus/akis/config.h
@@ -16,11 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F5, F4, F1, F0, E6 }
-#define MATRIX_COL_PINS { B4, D7, D6, D4, D5, D3, D2, D1, D0, F6, F7, C7, C6, B6, B5 }
-
/* RGB Lighting */
#define RGB_DI_PIN B0
#define RGBLED_NUM 23
@@ -35,9 +30,6 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-/* 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/akis/info.json b/keyboards/xelus/akis/info.json
index bc275f3509..074b9ca341 100644
--- a/keyboards/xelus/akis/info.json
+++ b/keyboards/xelus/akis/info.json
@@ -8,6 +8,11 @@
"pid": "0xA04B",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0", "F6", "F7", "C7", "C6", "B6", "B5"],
+ "rows": ["F5", "F4", "F1", "F0", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
diff --git a/keyboards/xelus/dawn60/dawn60.c b/keyboards/xelus/dawn60/dawn60.c
deleted file mode 100644
index 3e009b3bdf..0000000000
--- a/keyboards/xelus/dawn60/dawn60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "dawn60.h"
diff --git a/keyboards/xelus/dawn60/dawn60.h b/keyboards/xelus/dawn60/dawn60.h
deleted file mode 100644
index feec9b5e1d..0000000000
--- a/keyboards/xelus/dawn60/dawn60.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 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_dawn60_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_xelus_dawn60_rev1_qmk)
- #include "rev1_qmk.h"
-#endif
diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h
index 2e7f49644d..8bec078edc 100644
--- a/keyboards/xelus/dawn60/rev1/config.h
+++ b/keyboards/xelus/dawn60/rev1/config.h
@@ -15,22 +15,10 @@
*/
#pragma once
-
-//no underglow - prototype
-//#define MATRIX_ROW_PINS { B1, B3, B7, F6, F7 }
-//#define MATRIX_COL_PINS { B0, D5, B2, F5, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7 }
-
-//underglow
-#define MATRIX_ROW_PINS { B1, B3, F1, F6, F7 }
-#define MATRIX_COL_PINS { B0, D5, B2, F5, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-
// IS31FL3731 driver
#define DRIVER_COUNT 2
#define RGB_MATRIX_LED_COUNT 64
-// 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/xelus/dawn60/rev1/info.json b/keyboards/xelus/dawn60/rev1/info.json
new file mode 100644
index 0000000000..525e9d9ab0
--- /dev/null
+++ b/keyboards/xelus/dawn60/rev1/info.json
@@ -0,0 +1,7 @@
+{
+ "matrix_pins": {
+ "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["B1", "B3", "F1", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/xelus/dawn60/rev1/rules.mk b/keyboards/xelus/dawn60/rev1/rules.mk
index e641678ecb..d4e70bfbec 100644
--- a/keyboards/xelus/dawn60/rev1/rules.mk
+++ b/keyboards/xelus/dawn60/rev1/rules.mk
@@ -17,13 +17,13 @@ AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - We have custom RGB underglow
CIE1931_CURVE = yes
+WS2812_DRIVER_REQUIRED = yes
# project specific files
SRC += keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
quantum/color.c \
- drivers/led/issi/is31fl3731.c \
- ws2812.c
+ drivers/led/issi/is31fl3731.c
QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h
index b00009b44e..410093b6cf 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/config.h
+++ b/keyboards/xelus/dawn60/rev1_qmk/config.h
@@ -15,14 +15,6 @@
*/
#pragma once
-
-//underglow
-#define MATRIX_ROW_PINS { B1, B3, F1, F6, F7 }
-#define MATRIX_COL_PINS { B0, D5, B2, F5, D3, D2, 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
// Locking resynchronize hack
diff --git a/keyboards/xelus/dawn60/rev1_qmk/info.json b/keyboards/xelus/dawn60/rev1_qmk/info.json
new file mode 100644
index 0000000000..525e9d9ab0
--- /dev/null
+++ b/keyboards/xelus/dawn60/rev1_qmk/info.json
@@ -0,0 +1,7 @@
+{
+ "matrix_pins": {
+ "cols": ["B0", "D5", "B2", "F5", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["B1", "B3", "F1", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
index c17160a659..951c0a22ff 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
+++ b/keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c
@@ -14,13 +14,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <quantum.h>
-#include <i2c_master.h>
-#include <led_tables.h>
-#include <rgb_matrix.h>
+#include "rev1_qmk.h"
+
+#include "i2c_master.h"
+#include "led_tables.h"
+#include "rgb_matrix.h"
#include "drivers/led/issi/is31fl3731.h"
#include "ws2812.h"
-#include "rev1_qmk.h"
#ifdef RGB_MATRIX_ENABLE
LED_TYPE rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rules.mk b/keyboards/xelus/dawn60/rev1_qmk/rules.mk
index 2101e1cd1c..71a023f2d0 100644
--- a/keyboards/xelus/dawn60/rev1_qmk/rules.mk
+++ b/keyboards/xelus/dawn60/rev1_qmk/rules.mk
@@ -19,12 +19,12 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - We have custom RGB
RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
RGB_MATRIX_DRIVER = custom # Enable RGB matrix effects.
+WS2812_DRIVER_REQUIRED = yes
COMMON_VPATH += $(DRIVER_PATH)/issi
# project specific files
-SRC += drivers/led/issi/is31fl3731.c \
- ws2812.c
+SRC += drivers/led/issi/is31fl3731.c
QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/xelus/dharma/config.h b/keyboards/xelus/dharma/config.h
index a3301f94f7..b612e1587e 100644
--- a/keyboards/xelus/dharma/config.h
+++ b/keyboards/xelus/dharma/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, B0 }
-#define MATRIX_COL_PINS { B3, B2, B1, D5, D4, E6, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1 }
-
-/* 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/dharma/dharma.c b/keyboards/xelus/dharma/dharma.c
deleted file mode 100644
index 15493ff022..0000000000
--- a/keyboards/xelus/dharma/dharma.c
+++ /dev/null
@@ -1,17 +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 "quantum.h"
diff --git a/keyboards/xelus/dharma/info.json b/keyboards/xelus/dharma/info.json
index ffd8e500b9..2ec2fd82f9 100644
--- a/keyboards/xelus/dharma/info.json
+++ b/keyboards/xelus/dharma/info.json
@@ -8,6 +8,11 @@
"pid": "0xDAAA",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B3", "B2", "B1", "D5", "D4", "E6", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1"],
+ "rows": ["D0", "D1", "D2", "D3", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B7",
"num_lock": "F0"
diff --git a/keyboards/xelus/kangaroo/rev1/config.h b/keyboards/xelus/kangaroo/rev1/config.h
index 369cb76573..7f246458f5 100644
--- a/keyboards/xelus/kangaroo/rev1/config.h
+++ b/keyboards/xelus/kangaroo/rev1/config.h
@@ -16,10 +16,6 @@
#pragma once
-#define MATRIX_COL_PINS { B10, B2, B11, A10, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { A9, A8, B15, B14, B13, B12, A4, A5, A6, A7, B0, B1 }
-#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/xelus/kangaroo/rev1/info.json b/keyboards/xelus/kangaroo/rev1/info.json
index f6e477a9ef..ca5fa293e9 100644
--- a/keyboards/xelus/kangaroo/rev1/info.json
+++ b/keyboards/xelus/kangaroo/rev1/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B10", "B2", "B11", "A10", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["A9", "A8", "B15", "B14", "B13", "B12", "A4", "A5", "A6", "A7", "B0", "B1"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu"
}
diff --git a/keyboards/xelus/kangaroo/rev2/config.h b/keyboards/xelus/kangaroo/rev2/config.h
index 0711e39909..790db9b30a 100644
--- a/keyboards/xelus/kangaroo/rev2/config.h
+++ b/keyboards/xelus/kangaroo/rev2/config.h
@@ -16,12 +16,6 @@
#pragma once
-#define MATRIX_COL_PINS { B10, B2, B11, A10, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { A9, A8, B15, B14, B13, B12, A4, A5, A6, A7, B0, B1 }
-
-/* 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/xelus/kangaroo/rev2/info.json b/keyboards/xelus/kangaroo/rev2/info.json
index a2dc9694c1..196f11860b 100644
--- a/keyboards/xelus/kangaroo/rev2/info.json
+++ b/keyboards/xelus/kangaroo/rev2/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["B10", "B2", "B11", "A10", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["A9", "A8", "B15", "B14", "B13", "B12", "A4", "A5", "A6", "A7", "B0", "B1"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32L412",
"bootloader": "stm32-dfu"
}
diff --git a/keyboards/xelus/la_plus/config.h b/keyboards/xelus/la_plus/config.h
index 2dc02a7f4f..dd44daae35 100755
--- a/keyboards/xelus/la_plus/config.h
+++ b/keyboards/xelus/la_plus/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, F0, F4, F5 }
-#define MATRIX_COL_PINS { E6, D5, B2, B3, D3, 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/la_plus/info.json b/keyboards/xelus/la_plus/info.json
index c37c898995..48cdf901e4 100644
--- a/keyboards/xelus/la_plus/info.json
+++ b/keyboards/xelus/la_plus/info.json
@@ -8,6 +8,11 @@
"pid": "0x4C50",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
+ "rows": ["B0", "B1", "F0", "F4", "F5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h
index 2e6a07df5a..19da636e13 100644
--- a/keyboards/xelus/ninjin/config.h
+++ b/keyboards/xelus/ninjin/config.h
@@ -16,10 +16,6 @@
#pragma once
-#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, B6, B5 }
-#define MATRIX_ROW_PINS { B4, B3, A15, A3, B9, B8 }
-#define DIODE_DIRECTION COL2ROW
-
/* RGB Underglow */
#define RGB_DI_PIN A10
#define RGBLED_NUM 26
diff --git a/keyboards/xelus/ninjin/info.json b/keyboards/xelus/ninjin/info.json
index bbac38b051..bfb0038e89 100644
--- a/keyboards/xelus/ninjin/info.json
+++ b/keyboards/xelus/ninjin/info.json
@@ -8,6 +8,14 @@
"pid": "0x4E4A",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "driver": "pwm"
+ },
+ "matrix_pins": {
+ "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "B6", "B5"],
+ "rows": ["B4", "B3", "A15", "A3", "B9", "B8"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "A2",
"scroll_lock": "A13"
diff --git a/keyboards/xelus/ninjin/rules.mk b/keyboards/xelus/ninjin/rules.mk
index 3d8c7c0af8..ead22f6c15 100644
--- a/keyboards/xelus/ninjin/rules.mk
+++ b/keyboards/xelus/ninjin/rules.mk
@@ -11,7 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-WS2812_DRIVER = pwm
-
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/xelus/pachi/mini_32u4/config.h b/keyboards/xelus/pachi/mini_32u4/config.h
index 8786b2ad29..651f613045 100644
--- a/keyboards/xelus/pachi/mini_32u4/config.h
+++ b/keyboards/xelus/pachi/mini_32u4/config.h
@@ -16,10 +16,6 @@
#pragma once
-#define MATRIX_ROW_PINS { B0, B1, B2, F0, D2, D1 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, E6, B7, D0 }
-#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/xelus/pachi/mini_32u4/info.json b/keyboards/xelus/pachi/mini_32u4/info.json
index b400fdd7a4..0d60849bc5 100644
--- a/keyboards/xelus/pachi/mini_32u4/info.json
+++ b/keyboards/xelus/pachi/mini_32u4/info.json
@@ -8,6 +8,11 @@
"pid": "0x5041",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "E6", "B7", "D0"],
+ "rows": ["B0", "B1", "B2", "F0", "D2", "D1"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "F1",
"scroll_lock": "B3"
diff --git a/keyboards/xelus/pachi/mini_32u4/mini_32u4.c b/keyboards/xelus/pachi/mini_32u4/mini_32u4.c
deleted file mode 100644
index 98d2a80963..0000000000
--- a/keyboards/xelus/pachi/mini_32u4/mini_32u4.c
+++ /dev/null
@@ -1,18 +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 "mini_32u4.h"
-
diff --git a/keyboards/xelus/pachi/rev1/config.h b/keyboards/xelus/pachi/rev1/config.h
index e931eca992..651f613045 100644
--- a/keyboards/xelus/pachi/rev1/config.h
+++ b/keyboards/xelus/pachi/rev1/config.h
@@ -16,10 +16,6 @@
#pragma once
-#define MATRIX_ROW_PINS { B4, B3, A15, B15, B9, B8 }
-#define MATRIX_COL_PINS { B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A2, A1, A0, A3, B6, B5 }
-#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/xelus/pachi/rev1/info.json b/keyboards/xelus/pachi/rev1/info.json
index 44690cd7b5..cbd9fc69aa 100644
--- a/keyboards/xelus/pachi/rev1/info.json
+++ b/keyboards/xelus/pachi/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x5041",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A2", "A1", "A0", "A3", "B6", "B5"],
+ "rows": ["B4", "B3", "A15", "B15", "B9", "B8"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B14",
"scroll_lock": "A13"
diff --git a/keyboards/xelus/pachi/rev1/rev1.c b/keyboards/xelus/pachi/rev1/rev1.c
deleted file mode 100644
index 0a5ffe3723..0000000000
--- a/keyboards/xelus/pachi/rev1/rev1.c
+++ /dev/null
@@ -1,18 +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/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h
index f64c4ed2e3..af6157aa93 100644
--- a/keyboards/xelus/pachi/rgb/rev1/config.h
+++ b/keyboards/xelus/pachi/rgb/rev1/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B14, B13, B12, B2, A8, B15 }
-#define MATRIX_COL_PINS { C13, C14, C15, H0, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, H1, B10, B11 }
-
-/* 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/pachi/rgb/rev1/info.json b/keyboards/xelus/pachi/rgb/rev1/info.json
index be31e74a6c..5bc0668be3 100644
--- a/keyboards/xelus/pachi/rgb/rev1/info.json
+++ b/keyboards/xelus/pachi/rgb/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x5052",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C13", "C14", "C15", "H0", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "H1", "B10", "B11"],
+ "rows": ["B14", "B13", "B12", "B2", "A8", "B15"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32L422",
"bootloader": "stm32-dfu",
"layout_aliases": {
diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h
index 04dfd15983..a11aa27d3b 100644
--- a/keyboards/xelus/pachi/rgb/rev2/config.h
+++ b/keyboards/xelus/pachi/rgb/rev2/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { A5, A6, B0, A7, A8, B1, B4, B5, A15, B3, A13, A14 }
-#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A10, A9}
-
-/* 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/pachi/rgb/rev2/info.json b/keyboards/xelus/pachi/rgb/rev2/info.json
index e771916407..d06007b142 100644
--- a/keyboards/xelus/pachi/rgb/rev2/info.json
+++ b/keyboards/xelus/pachi/rgb/rev2/info.json
@@ -8,6 +8,11 @@
"pid": "0x5053",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A10", "A9"],
+ "rows": ["A5", "A6", "B0", "A7", "A8", "B1", "B4", "B5", "A15", "B3", "A13", "A14"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32L422",
"bootloader": "stm32-dfu",
"layout_aliases": {
diff --git a/keyboards/xelus/pachi/rgb/rgb.c b/keyboards/xelus/pachi/rgb/rgb.c
deleted file mode 100644
index 93ca8406de..0000000000
--- a/keyboards/xelus/pachi/rgb/rgb.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 "rgb.h"
diff --git a/keyboards/xelus/pachi/rgb/rgb.h b/keyboards/xelus/pachi/rgb/rgb.h
deleted file mode 100644
index 36ca2937a6..0000000000
--- a/keyboards/xelus/pachi/rgb/rgb.h
+++ /dev/null
@@ -1,24 +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/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_xelus_pachi_rgb_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_xelus_pachi_rgb_rev2)
- #include "rev2.h"
-#endif
diff --git a/keyboards/xelus/rs108/config.h b/keyboards/xelus/rs108/config.h
index 329fa6639c..5faab0f2d7 100644
--- a/keyboards/xelus/rs108/config.h
+++ b/keyboards/xelus/rs108/config.h
@@ -15,12 +15,6 @@
*/
#pragma once
-#define MATRIX_ROW_PINS { B5, B6, B7, A1, A0, C13, B0, A7, A5, A4, A3, A2 }
-#define MATRIX_COL_PINS { A10, A8, B15, B14, B13, B12, B1, B10, B4, B3, A15 }
-
-// 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/rs108/info.json b/keyboards/xelus/rs108/info.json
index 959da932de..d15a543e53 100644
--- a/keyboards/xelus/rs108/info.json
+++ b/keyboards/xelus/rs108/info.json
@@ -8,6 +8,11 @@
"pid": "0x5208",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B1", "B10", "B4", "B3", "A15"],
+ "rows": ["B5", "B6", "B7", "A1", "A0", "C13", "B0", "A7", "A5", "A4", "A3", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "A6",
"num_lock": "A14",
diff --git a/keyboards/xelus/rs108/rs108.c b/keyboards/xelus/rs108/rs108.c
deleted file mode 100644
index 7c23446466..0000000000
--- a/keyboards/xelus/rs108/rs108.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 "rs108.h"
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
diff --git a/keyboards/xelus/snap96/config.h b/keyboards/xelus/snap96/config.h
index 553c6aaddf..c6f9a6c1bf 100644
--- a/keyboards/xelus/snap96/config.h
+++ b/keyboards/xelus/snap96/config.h
@@ -1,13 +1,5 @@
#pragma once
-
-// key matrix pins
-#define MATRIX_ROW_PINS { B2, B1, B0, C7, F6, F7, B3, D1, D2, D7, B6, C6 }
-#define MATRIX_COL_PINS { E6, D5, B7, D0, F5, D3, B4, B5, D4, D6 }
-
-// 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/xelus/snap96/info.json b/keyboards/xelus/snap96/info.json
index 6550d46c8e..9cd82569c0 100644
--- a/keyboards/xelus/snap96/info.json
+++ b/keyboards/xelus/snap96/info.json
@@ -8,6 +8,11 @@
"pid": "0x5396",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "D5", "B7", "D0", "F5", "D3", "B4", "B5", "D4", "D6"],
+ "rows": ["B2", "B1", "B0", "C7", "F6", "F7", "B3", "D1", "D2", "D7", "B6", "C6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/xelus/snap96/snap96.c b/keyboards/xelus/snap96/snap96.c
deleted file mode 100644
index e7c728bb05..0000000000
--- a/keyboards/xelus/snap96/snap96.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "snap96.h"
diff --git a/keyboards/xelus/trinityxttkl/config.h b/keyboards/xelus/trinityxttkl/config.h
index 64cb061b40..651f613045 100644
--- a/keyboards/xelus/trinityxttkl/config.h
+++ b/keyboards/xelus/trinityxttkl/config.h
@@ -16,10 +16,6 @@
#pragma once
-#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A10, B9, B4 }
-#define MATRIX_ROW_PINS { A14, A15, B3, A2, B6, B5 }
-#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/xelus/trinityxttkl/info.json b/keyboards/xelus/trinityxttkl/info.json
index 787f30cf99..2fe1624712 100644
--- a/keyboards/xelus/trinityxttkl/info.json
+++ b/keyboards/xelus/trinityxttkl/info.json
@@ -8,6 +8,11 @@
"pid": "0x5854",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A10", "B9", "B4"],
+ "rows": ["A14", "A15", "B3", "A2", "B6", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "A1",
"scroll_lock": "A13"
diff --git a/keyboards/xelus/valor/rev1/config.h b/keyboards/xelus/valor/rev1/config.h
index 07f69540a0..36608599e2 100644
--- a/keyboards/xelus/valor/rev1/config.h
+++ b/keyboards/xelus/valor/rev1/config.h
@@ -16,11 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B1, B2, C7, C6, B6 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B5, B4, D7, D6, D4, D5, D3, D2 }
-
/* RGB Underglow */
#define RGB_DI_PIN B0
#define RGBLED_NUM 28
@@ -36,9 +31,6 @@
#define RGBLIGHT_EFFECT_TWINKLE
#define RGBLIGHT_LIMIT_VAL 200
-/* 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/valor/rev1/info.json b/keyboards/xelus/valor/rev1/info.json
index 547e50b3f8..bf611c5811 100644
--- a/keyboards/xelus/valor/rev1/info.json
+++ b/keyboards/xelus/valor/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x5652",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
+ "rows": ["B1", "B2", "C7", "C6", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["alice_split_bs"],
diff --git a/keyboards/xelus/valor/rev1/rev1.c b/keyboards/xelus/valor/rev1/rev1.c
deleted file mode 100644
index 614899aaed..0000000000
--- a/keyboards/xelus/valor/rev1/rev1.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 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/>.
- */
-
-// Nothing to see here, move along... ;-)
-
-#include "rev1.h" \ No newline at end of file
diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h
index 2dba975d78..f7bbd338fa 100644
--- a/keyboards/xelus/valor/rev2/config.h
+++ b/keyboards/xelus/valor/rev2/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B11, B10, A3, A1, A2 }
-#define MATRIX_COL_PINS { B2, B1, B0, A7, A6, A5, A4, A13, 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/valor/rev2/info.json b/keyboards/xelus/valor/rev2/info.json
index f77f18dda3..c2bafd3754 100644
--- a/keyboards/xelus/valor/rev2/info.json
+++ b/keyboards/xelus/valor/rev2/info.json
@@ -8,6 +8,14 @@
"pid": "0x5653",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "driver": "pwm"
+ },
+ "matrix_pins": {
+ "cols": ["B2", "B1", "B0", "A7", "A6", "A5", "A4", "A13", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["B11", "B10", "A3", "A1", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32L422",
"bootloader": "stm32-dfu",
"community_layouts": ["alice_split_bs"],
diff --git a/keyboards/xelus/valor/rev2/rules.mk b/keyboards/xelus/valor/rev2/rules.mk
index 47560d7f15..19af3d61b9 100644
--- a/keyboards/xelus/valor/rev2/rules.mk
+++ b/keyboards/xelus/valor/rev2/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812
RGB_MATRIX_CUSTOM_KB = yes
-WS2812_DRIVER = pwm
EEPROM_DRIVER = i2c
OPT = 2
diff --git a/keyboards/xelus/valor_frl_tkl/rev1/config.h b/keyboards/xelus/valor_frl_tkl/rev1/config.h
index 8852d04548..a03694deaa 100644
--- a/keyboards/xelus/valor_frl_tkl/rev1/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev1/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { A15, A14, A1, B3, B4 }
-#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, A0, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3 }
-
-/* 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/valor_frl_tkl/rev1/info.json b/keyboards/xelus/valor_frl_tkl/rev1/info.json
index f4cc0f9659..838396caaf 100644
--- a/keyboards/xelus/valor_frl_tkl/rev1/info.json
+++ b/keyboards/xelus/valor_frl_tkl/rev1/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "A0", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
+ "rows": ["A15", "A14", "A1", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu"
}
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
index da2454b4fe..cb37aaa4cc 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { A15, A14, A10, B3, B4 }
-#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B9, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 }
-
-/* 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/valor_frl_tkl/rev2_0/info.json b/keyboards/xelus/valor_frl_tkl/rev2_0/info.json
index 972ee4bf92..d3e2177793 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/info.json
+++ b/keyboards/xelus/valor_frl_tkl/rev2_0/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B9", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+ "rows": ["A15", "A14", "A10", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F411",
"bootloader": "stm32-dfu"
}
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
index ad3ac93ae7..cb37aaa4cc 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
+++ b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
@@ -16,13 +16,6 @@
#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { A15, A14, A13, B3, B4 }
-#define MATRIX_COL_PINS { A10, A8, B15, B14, B13, B12, B9, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 }
-
-/* 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/valor_frl_tkl/rev2_1/info.json b/keyboards/xelus/valor_frl_tkl/rev2_1/info.json
index 6e76320a13..61a26ca4c9 100644
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/info.json
+++ b/keyboards/xelus/valor_frl_tkl/rev2_1/info.json
@@ -3,6 +3,11 @@
"usb": {
"device_version": "0.0.3"
},
+ "matrix_pins": {
+ "cols": ["A10", "A8", "B15", "B14", "B13", "B12", "B9", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+ "rows": ["A15", "A14", "A13", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F401",
"bootloader": "stm32-dfu"
}
diff --git a/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c b/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c
deleted file mode 100644
index b5eca9abde..0000000000
--- a/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2020 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/>.
- */
-
-// Nothing to see here, move along... ;-)
-
-#include "valor_frl_tkl.h"
diff --git a/keyboards/xelus/xs108/config.h b/keyboards/xelus/xs108/config.h
index b04e268f1e..8a6ab123c4 100644
--- a/keyboards/xelus/xs108/config.h
+++ b/keyboards/xelus/xs108/config.h
@@ -16,11 +16,6 @@
#pragma once
-#define MATRIX_ROW_PINS { C14, C13, A10, A3, A1, A0 }
-#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, B6, B5, B4, B3, A15, A14 }
-
-#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/xelus/xs108/info.json b/keyboards/xelus/xs108/info.json
index c4a53a6f59..d138c3ed65 100644
--- a/keyboards/xelus/xs108/info.json
+++ b/keyboards/xelus/xs108/info.json
@@ -8,6 +8,11 @@
"pid": "0x0108",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["C14", "C13", "A10", "A3", "A1", "A0"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "A2",
"num_lock": "B7",
diff --git a/keyboards/xelus/xs108/xs108.c b/keyboards/xelus/xs108/xs108.c
deleted file mode 100644
index 41084d7be1..0000000000
--- a/keyboards/xelus/xs108/xs108.c
+++ /dev/null
@@ -1,17 +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 "xs108.h"
diff --git a/keyboards/xelus/xs60/hotswap/rules.mk b/keyboards/xelus/xs60/hotswap/rules.mk
index b58e18c74f..4819456d51 100644
--- a/keyboards/xelus/xs60/hotswap/rules.mk
+++ b/keyboards/xelus/xs60/hotswap/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output
EEPROM_DRIVER = i2c
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = bitbang
LTO_ENABLE = yes
OPT = 2
diff --git a/keyboards/xelus/xs60/soldered/rules.mk b/keyboards/xelus/xs60/soldered/rules.mk
index b58e18c74f..4819456d51 100644
--- a/keyboards/xelus/xs60/soldered/rules.mk
+++ b/keyboards/xelus/xs60/soldered/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output
EEPROM_DRIVER = i2c
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = bitbang
LTO_ENABLE = yes
OPT = 2