commit: 45b710f9e16733ab73af5f2ed1b0b13233db49e9
parent 8caa8674d225c1c26403f8c311be6ffbdd9081e1
Author: Joel Challis <git@zvecr.com>
Date: Fri, 12 Apr 2024 04:36:31 +0100
Migrate build target markers to keyboard.json - X (#23460)
Diffstat:
87 files changed, 3669 insertions(+), 4006 deletions(-)
diff --git a/keyboards/xbows/woody/info.json b/keyboards/xbows/woody/info.json
@@ -1,133 +0,0 @@
-{
- "keyboard_name": "WOO-DY",
- "manufacturer": "X-BOWS",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x1224",
- "device_version": "0.0.1"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_val": true,
- "band_pinwheel_val": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "solid_reactive_simple": true,
- "solid_reactive": true
- },
- "driver": "is31fl3731",
- "led_flush_limit": 26,
- "led_process_limit": 4,
- "max_brightness": 200,
- "sleep": true
- },
- "matrix_pins": {
- "cols": ["B6", "C6", "C7", "F4", "F5", "F6", "F7", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
- "rows": ["B3", "B2", "B1", "B0", "B5"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "debounce": 3,
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 10], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 6], "x": 4, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10.25, "y": 4, "w": 1.5},
- {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/xbows/woody/keyboard.json b/keyboards/xbows/woody/keyboard.json
@@ -0,0 +1,140 @@
+{
+ "keyboard_name": "WOO-DY",
+ "manufacturer": "X-BOWS",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1224",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true
+ },
+ "driver": "is31fl3731",
+ "led_flush_limit": 26,
+ "led_process_limit": 4,
+ "max_brightness": 200,
+ "sleep": true
+ },
+ "matrix_pins": {
+ "cols": ["B6", "C6", "C7", "F4", "F5", "F6", "F7", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+ "rows": ["B3", "B2", "B1", "B0", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "debounce": 3,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xbows/woody/rules.mk b/keyboards/xbows/woody/rules.mk
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-BACKLIGHT_ENABLE = no
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-AUDIO_ENABLE = no
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/keyboards/xelus/dawn60/info.json b/keyboards/xelus/dawn60/info.json
@@ -8,6 +8,12 @@
"pid": "0x0060",
"device_version": "0.0.1"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h
@@ -20,11 +20,6 @@
#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SDA
#define IS31FL3731_LED_COUNT 64
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/xelus/dawn60/rev1/info.json b/keyboards/xelus/dawn60/rev1/info.json
@@ -1,225 +0,0 @@
-{
- "ws2812": {
- "pin": "F0"
- },
- "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",
- "layouts": {
- "LAYOUT_60_ansi_arrow": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 13, "y": 3},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4}
- ]
- },
- "LAYOUT_60_tsangan_hhkb": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 13, "y": 3},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/dawn60/rev1/keyboard.json b/keyboards/xelus/dawn60/rev1/keyboard.json
@@ -0,0 +1,231 @@
+{
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "ws2812": {
+ "pin": "F0"
+ },
+ "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",
+ "layouts": {
+ "LAYOUT_60_ansi_arrow": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 13, "y": 3},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 13, "y": 3},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/dawn60/rev1/rules.mk b/keyboards/xelus/dawn60/rev1/rules.mk
@@ -3,27 +3,12 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - We have custom RGB underglow
-
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = 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
-
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/xelus/dawn60/rev1_qmk/config.h b/keyboards/xelus/dawn60/rev1_qmk/config.h
@@ -15,11 +15,6 @@
*/
#pragma once
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
//RGB Underglow defines
#define WS2812_LED_TOTAL 20
diff --git a/keyboards/xelus/dawn60/rev1_qmk/info.json b/keyboards/xelus/dawn60/rev1_qmk/info.json
@@ -1,274 +0,0 @@
-{
- "ws2812": {
- "pin": "F0"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_reactive_wide": true,
- "solid_reactive_multiwide": true,
- "solid_reactive_cross": true,
- "solid_reactive_multicross": true,
- "solid_reactive_nexus": true,
- "solid_reactive_multinexus": true,
- "splash": true,
- "multisplash": true,
- "solid_splash": true,
- "solid_multisplash": true
- },
- "default": {
- "val": 80
- },
- "driver": "custom"
- },
- "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",
- "layouts": {
- "LAYOUT_60_ansi_arrow": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 13, "y": 3},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4}
- ]
- },
- "LAYOUT_60_tsangan_hhkb": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 13, "y": 3},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4},
- {"matrix": [4, 10], "x": 11, "y": 4},
- {"matrix": [4, 11], "x": 12, "y": 4},
- {"matrix": [4, 12], "x": 13, "y": 4},
- {"matrix": [4, 13], "x": 14, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/dawn60/rev1_qmk/keyboard.json b/keyboards/xelus/dawn60/rev1_qmk/keyboard.json
@@ -0,0 +1,285 @@
+{
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "ws2812": {
+ "pin": "F0"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "default": {
+ "val": 80
+ },
+ "driver": "custom"
+ },
+ "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",
+ "layouts": {
+ "LAYOUT_60_ansi_arrow": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 13, "y": 3},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 13, "y": 3},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/dawn60/rev1_qmk/rules.mk b/keyboards/xelus/dawn60/rev1_qmk/rules.mk
@@ -3,28 +3,9 @@
# backlight effects.
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - We have custom RGB underglow
-
-RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
+I2C_DRIVER_REQUIRED = yes
WS2812_DRIVER_REQUIRED = yes
-COMMON_VPATH += $(DRIVER_PATH)/issi
-
# project specific files
+COMMON_VPATH += $(DRIVER_PATH)/issi
SRC += drivers/led/issi/is31fl3731.c
-
-I2C_DRIVER_REQUIRED = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/xelus/la_plus/config.h b/keyboards/xelus/la_plus/config.h
@@ -1,27 +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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-// Custom Startup Animation
-// comment out for solid animation
-// #define STARTUP_ANIMATION_DOTS
diff --git a/keyboards/xelus/la_plus/info.json b/keyboards/xelus/la_plus/info.json
@@ -1,215 +0,0 @@
-{
- "keyboard_name": "MechaMaker La+",
- "manufacturer": "Xelus",
- "url": "",
- "maintainer": "Xelus22",
- "usb": {
- "vid": "0x5845",
- "pid": "0x4C50",
- "device_version": "0.0.1"
- },
- "ws2812": {
- "pin": "F1"
- },
- "rgb_matrix": {
- "animations": {
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_fractal": true,
- "pixel_rain": true
- },
- "default": {
- "animation": "cycle_all",
- "val": 80
- },
- "driver": "ws2812",
- "max_brightness": 180,
- "sleep": true
- },
- "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",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
- },
- "layouts": {
- "LAYOUT_65_ansi_rwkl": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
- {"label": "Ctrl", "matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- },
- "LAYOUT_65_ansi_rwkl_split_bs": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
- {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
- {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
- {"label": "Ctrl", "matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
- {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/la_plus/keyboard.json b/keyboards/xelus/la_plus/keyboard.json
@@ -0,0 +1,232 @@
+{
+ "keyboard_name": "MechaMaker La+",
+ "manufacturer": "Xelus",
+ "url": "",
+ "maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x4C50",
+ "device_version": "0.0.1"
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "ws2812": {
+ "pin": "F1"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_fractal": true,
+ "pixel_rain": true
+ },
+ "default": {
+ "animation": "cycle_all",
+ "val": 80
+ },
+ "driver": "ws2812",
+ "max_brightness": 180,
+ "sleep": true
+ },
+ "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",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_65_ansi_rwkl_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_65_ansi_rwkl": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+ {"label": "Ctrl", "matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_ansi_rwkl_split_bs": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 0},
+ {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+ {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 8], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+ {"label": "Ctrl", "matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+ {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/la_plus/rules.mk b/keyboards/xelus/la_plus/rules.mk
@@ -1,16 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-
-RGB_MATRIX_ENABLE = yes
RGB_MATRIX_CUSTOM_KB = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/xelus/pachi/rgb/info.json b/keyboards/xelus/pachi/rgb/info.json
@@ -0,0 +1,20 @@
+{
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ }
+}
diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
// I2C setup
#define I2C1_SCL_PIN B8
#define I2C1_SDA_PIN B9
diff --git a/keyboards/xelus/pachi/rgb/rev1/info.json b/keyboards/xelus/pachi/rgb/rev1/keyboard.json
diff --git a/keyboards/xelus/pachi/rgb/rev1/rules.mk b/keyboards/xelus/pachi/rgb/rev1/rules.mk
@@ -1,20 +1,4 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
-
-RGB_MATRIX_ENABLE = yes
-
COMMON_VPATH += $(DRIVER_PATH)/issi
SRC += drivers/led/issi/is31fl3741.c
-LTO_ENABLE = yes
OPT = 2
diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
// I2C setup
#define I2C1_SCL_PIN B6
#define I2C1_SDA_PIN B7
diff --git a/keyboards/xelus/pachi/rgb/rev2/info.json b/keyboards/xelus/pachi/rgb/rev2/keyboard.json
diff --git a/keyboards/xelus/pachi/rgb/rev2/rules.mk b/keyboards/xelus/pachi/rgb/rev2/rules.mk
@@ -1,19 +1,4 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-
-RGB_MATRIX_ENABLE = yes
-
COMMON_VPATH += $(DRIVER_PATH)/issi
SRC += drivers/led/issi/is31fl3741.c
-LTO_ENABLE = yes
OPT = 2
diff --git a/keyboards/xelus/rs108/config.h b/keyboards/xelus/rs108/config.h
@@ -15,12 +15,6 @@
*/
#pragma once
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
// I2C config
#define I2C1_SCL_PIN B8
#define I2C1_SDA_PIN B9
diff --git a/keyboards/xelus/rs108/info.json b/keyboards/xelus/rs108/info.json
@@ -1,160 +0,0 @@
-{
- "keyboard_name": "RS108",
- "manufacturer": "Xelus",
- "url": "",
- "maintainer": "xelus22",
- "usb": {
- "vid": "0x5845",
- "pid": "0x5208",
- "device_version": "0.0.2",
- "force_nkro": true
- },
- "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",
- "eeprom": {
- "driver": "i2c"
- },
- "indicators": {
- "caps_lock": "A6",
- "num_lock": "A14",
- "scroll_lock": "A13"
- },
- "processor": "STM32F401",
- "bootloader": "stm32-dfu",
- "layouts": {
- "LAYOUT_108_fullsize_ansi": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [1, 1], "x": 3, "y": 0},
- {"matrix": [0, 2], "x": 4, "y": 0},
- {"matrix": [1, 2], "x": 5, "y": 0},
-
- {"matrix": [0, 3], "x": 6.5, "y": 0},
- {"matrix": [1, 3], "x": 7.5, "y": 0},
- {"matrix": [0, 4], "x": 8.5, "y": 0},
- {"matrix": [1, 4], "x": 9.5, "y": 0},
-
- {"matrix": [0, 5], "x": 11, "y": 0},
- {"matrix": [1, 5], "x": 12, "y": 0},
- {"matrix": [0, 6], "x": 13, "y": 0},
- {"matrix": [1, 6], "x": 14, "y": 0},
-
- {"matrix": [0, 7], "x": 15.25, "y": 0},
- {"matrix": [1, 7], "x": 16.25, "y": 0},
- {"matrix": [0, 8], "x": 17.25, "y": 0},
-
- {"matrix": [1, 8], "x": 18.5, "y": 0},
- {"matrix": [0, 9], "x": 19.5, "y": 0},
- {"matrix": [1, 9], "x": 20.5, "y": 0},
- {"matrix": [0, 10], "x": 21.5, "y": 0},
-
- {"matrix": [2, 0], "x": 0, "y": 1.25},
- {"matrix": [3, 0], "x": 1, "y": 1.25},
- {"matrix": [2, 1], "x": 2, "y": 1.25},
- {"matrix": [3, 1], "x": 3, "y": 1.25},
- {"matrix": [2, 2], "x": 4, "y": 1.25},
- {"matrix": [3, 2], "x": 5, "y": 1.25},
- {"matrix": [2, 3], "x": 6, "y": 1.25},
- {"matrix": [3, 3], "x": 7, "y": 1.25},
- {"matrix": [2, 4], "x": 8, "y": 1.25},
- {"matrix": [3, 4], "x": 9, "y": 1.25},
- {"matrix": [2, 5], "x": 10, "y": 1.25},
- {"matrix": [3, 5], "x": 11, "y": 1.25},
- {"matrix": [2, 6], "x": 12, "y": 1.25},
- {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
-
- {"matrix": [2, 7], "x": 15.25, "y": 1.25},
- {"matrix": [3, 7], "x": 16.25, "y": 1.25},
- {"matrix": [2, 8], "x": 17.25, "y": 1.25},
-
- {"matrix": [3, 8], "x": 18.5, "y": 1.25},
- {"matrix": [2, 9], "x": 19.5, "y": 1.25},
- {"matrix": [3, 9], "x": 20.5, "y": 1.25},
- {"matrix": [2, 10], "x": 21.5, "y": 1.25},
-
- {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"matrix": [5, 0], "x": 1.5, "y": 2.25},
- {"matrix": [4, 1], "x": 2.5, "y": 2.25},
- {"matrix": [5, 1], "x": 3.5, "y": 2.25},
- {"matrix": [4, 2], "x": 4.5, "y": 2.25},
- {"matrix": [5, 2], "x": 5.5, "y": 2.25},
- {"matrix": [4, 3], "x": 6.5, "y": 2.25},
- {"matrix": [5, 3], "x": 7.5, "y": 2.25},
- {"matrix": [4, 4], "x": 8.5, "y": 2.25},
- {"matrix": [5, 4], "x": 9.5, "y": 2.25},
- {"matrix": [4, 5], "x": 10.5, "y": 2.25},
- {"matrix": [5, 5], "x": 11.5, "y": 2.25},
- {"matrix": [4, 6], "x": 12.5, "y": 2.25},
- {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"matrix": [4, 7], "x": 15.25, "y": 2.25},
- {"matrix": [5, 7], "x": 16.25, "y": 2.25},
- {"matrix": [4, 8], "x": 17.25, "y": 2.25},
-
- {"matrix": [5, 8], "x": 18.5, "y": 2.25},
- {"matrix": [4, 9], "x": 19.5, "y": 2.25},
- {"matrix": [5, 9], "x": 20.5, "y": 2.25},
-
- {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"matrix": [7, 0], "x": 1.75, "y": 3.25},
- {"matrix": [6, 1], "x": 2.75, "y": 3.25},
- {"matrix": [7, 1], "x": 3.75, "y": 3.25},
- {"matrix": [6, 2], "x": 4.75, "y": 3.25},
- {"matrix": [7, 2], "x": 5.75, "y": 3.25},
- {"matrix": [6, 3], "x": 6.75, "y": 3.25},
- {"matrix": [7, 3], "x": 7.75, "y": 3.25},
- {"matrix": [6, 4], "x": 8.75, "y": 3.25},
- {"matrix": [7, 4], "x": 9.75, "y": 3.25},
- {"matrix": [6, 5], "x": 10.75, "y": 3.25},
- {"matrix": [7, 5], "x": 11.75, "y": 3.25},
- {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"matrix": [7, 8], "x": 18.5, "y": 3.25},
- {"matrix": [6, 9], "x": 19.5, "y": 3.25},
- {"matrix": [7, 9], "x": 20.5, "y": 3.25},
- {"matrix": [6, 10], "x": 21.5, "y": 2.25, "h": 2},
-
- {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"matrix": [9, 0], "x": 2.25, "y": 4.25},
- {"matrix": [8, 1], "x": 3.25, "y": 4.25},
- {"matrix": [9, 1], "x": 4.25, "y": 4.25},
- {"matrix": [8, 2], "x": 5.25, "y": 4.25},
- {"matrix": [9, 2], "x": 6.25, "y": 4.25},
- {"matrix": [8, 3], "x": 7.25, "y": 4.25},
- {"matrix": [9, 3], "x": 8.25, "y": 4.25},
- {"matrix": [8, 4], "x": 9.25, "y": 4.25},
- {"matrix": [9, 4], "x": 10.25, "y": 4.25},
- {"matrix": [8, 5], "x": 11.25, "y": 4.25},
- {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"matrix": [9, 7], "x": 16.25, "y": 4.25},
-
- {"matrix": [9, 8], "x": 18.5, "y": 4.25},
- {"matrix": [8, 9], "x": 19.5, "y": 4.25},
- {"matrix": [9, 9], "x": 20.5, "y": 4.25},
-
- {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
- {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
- {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
- {"matrix": [11, 2], "x": 3.75, "y": 5.25, "w": 6.25},
- {"matrix": [11, 4], "x": 10, "y": 5.25, "w": 1.25},
- {"matrix": [10, 5], "x": 11.25, "y": 5.25, "w": 1.25},
- {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
- {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
- {"matrix": [10, 7], "x": 15.25, "y": 5.25},
-
- {"matrix": [11, 7], "x": 16.25, "y": 5.25},
- {"matrix": [10, 8], "x": 17.25, "y": 5.25},
- {"matrix": [10, 9], "x": 18.5, "y": 5.25, "w": 2},
-
- {"matrix": [11, 9], "x": 20.5, "y": 5.25},
- {"matrix": [10, 10], "x": 21.5, "y": 4.25, "h": 2}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/rs108/keyboard.json b/keyboards/xelus/rs108/keyboard.json
@@ -0,0 +1,176 @@
+{
+ "keyboard_name": "RS108",
+ "manufacturer": "Xelus",
+ "url": "",
+ "maintainer": "xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5208",
+ "device_version": "0.0.2",
+ "force_nkro": true,
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "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",
+ "eeprom": {
+ "driver": "i2c"
+ },
+ "indicators": {
+ "caps_lock": "A6",
+ "num_lock": "A14",
+ "scroll_lock": "A13"
+ },
+ "processor": "STM32F401",
+ "bootloader": "stm32-dfu",
+ "layouts": {
+ "LAYOUT_108_fullsize_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 5], "x": 11, "y": 0},
+ {"matrix": [1, 5], "x": 12, "y": 0},
+ {"matrix": [0, 6], "x": 13, "y": 0},
+ {"matrix": [1, 6], "x": 14, "y": 0},
+
+ {"matrix": [0, 7], "x": 15.25, "y": 0},
+ {"matrix": [1, 7], "x": 16.25, "y": 0},
+ {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 8], "x": 18.5, "y": 0},
+ {"matrix": [0, 9], "x": 19.5, "y": 0},
+ {"matrix": [1, 9], "x": 20.5, "y": 0},
+ {"matrix": [0, 10], "x": 21.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.25},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 1], "x": 2, "y": 1.25},
+ {"matrix": [3, 1], "x": 3, "y": 1.25},
+ {"matrix": [2, 2], "x": 4, "y": 1.25},
+ {"matrix": [3, 2], "x": 5, "y": 1.25},
+ {"matrix": [2, 3], "x": 6, "y": 1.25},
+ {"matrix": [3, 3], "x": 7, "y": 1.25},
+ {"matrix": [2, 4], "x": 8, "y": 1.25},
+ {"matrix": [3, 4], "x": 9, "y": 1.25},
+ {"matrix": [2, 5], "x": 10, "y": 1.25},
+ {"matrix": [3, 5], "x": 11, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+ {"matrix": [3, 7], "x": 16.25, "y": 1.25},
+ {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+ {"matrix": [3, 8], "x": 18.5, "y": 1.25},
+ {"matrix": [2, 9], "x": 19.5, "y": 1.25},
+ {"matrix": [3, 9], "x": 20.5, "y": 1.25},
+ {"matrix": [2, 10], "x": 21.5, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+ {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [4, 7], "x": 15.25, "y": 2.25},
+ {"matrix": [5, 7], "x": 16.25, "y": 2.25},
+ {"matrix": [4, 8], "x": 17.25, "y": 2.25},
+
+ {"matrix": [5, 8], "x": 18.5, "y": 2.25},
+ {"matrix": [4, 9], "x": 19.5, "y": 2.25},
+ {"matrix": [5, 9], "x": 20.5, "y": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [7, 8], "x": 18.5, "y": 3.25},
+ {"matrix": [6, 9], "x": 19.5, "y": 3.25},
+ {"matrix": [7, 9], "x": 20.5, "y": 3.25},
+ {"matrix": [6, 10], "x": 21.5, "y": 2.25, "h": 2},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [9, 0], "x": 2.25, "y": 4.25},
+ {"matrix": [8, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 4.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 6.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 7.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+ {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [9, 7], "x": 16.25, "y": 4.25},
+
+ {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+ {"matrix": [8, 9], "x": 19.5, "y": 4.25},
+ {"matrix": [9, 9], "x": 20.5, "y": 4.25},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 2], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [11, 4], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 6], "x": 13.75, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+
+ {"matrix": [11, 7], "x": 16.25, "y": 5.25},
+ {"matrix": [10, 8], "x": 17.25, "y": 5.25},
+ {"matrix": [10, 9], "x": 18.5, "y": 5.25, "w": 2},
+
+ {"matrix": [11, 9], "x": 20.5, "y": 5.25},
+ {"matrix": [10, 10], "x": 21.5, "y": 4.25, "h": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/rs108/rules.mk b/keyboards/xelus/rs108/rules.mk
@@ -1,16 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-# Save hid interface
-KEYBOARD_SHARED_EP = yes
-
diff --git a/keyboards/xelus/rs60/info.json b/keyboards/xelus/rs60/info.json
@@ -7,5 +7,11 @@
"vid": "0x5845",
"pid": "0x5253"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_ansi_tsangan", "60_tsangan_hhkb"]
}
diff --git a/keyboards/xelus/rs60/rev1/config.h b/keyboards/xelus/rs60/rev1/config.h
@@ -1,22 +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
-
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/xelus/rs60/rev2_0/config.h b/keyboards/xelus/rs60/rev2_0/config.h
@@ -15,12 +15,6 @@
*/
#pragma once
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
// I2C config
#define I2C1_SCL_PIN B8
#define I2C1_SDA_PIN B9
diff --git a/keyboards/xelus/rs60/rev2_0/info.json b/keyboards/xelus/rs60/rev2_0/info.json
@@ -1,299 +0,0 @@
-{
- "usb": {
- "device_version": "0.2.0",
- "force_nkro": true
- },
- "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",
- "eeprom": {
- "driver": "i2c"
- },
- "indicators": {
- "caps_lock": "A1"
- },
- "processor": "STM32F401",
- "bootloader": "stm32-dfu",
- "layouts": {
- "LAYOUT_60_ansi": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_split_bs_rshift": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_tsangan": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_60_tsangan_hhkb": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/rs60/rev2_0/keyboard.json b/keyboards/xelus/rs60/rev2_0/keyboard.json
@@ -0,0 +1,310 @@
+{
+ "usb": {
+ "device_version": "0.2.0",
+ "force_nkro": true,
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "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",
+ "eeprom": {
+ "driver": "i2c"
+ },
+ "indicators": {
+ "caps_lock": "A1"
+ },
+ "processor": "STM32F401",
+ "bootloader": "stm32-dfu",
+ "layouts": {
+ "LAYOUT_60_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_tsangan": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/rs60/rev2_0/rules.mk b/keyboards/xelus/rs60/rev2_0/rules.mk
@@ -1,16 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-# Save hid interface
-KEYBOARD_SHARED_EP = yes
-
diff --git a/keyboards/xelus/rs60/rev2_1/config.h b/keyboards/xelus/rs60/rev2_1/config.h
@@ -1,23 +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
-
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
diff --git a/keyboards/xelus/rs60/rev2_1/info.json b/keyboards/xelus/rs60/rev2_1/info.json
@@ -1,302 +0,0 @@
-{
- "usb": {
- "device_version": "0.2.1",
- "force_nkro": true
- },
- "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",
- "eeprom": {
- "wear_leveling": {
- "backing_size": 4096
- }
- },
- "indicators": {
- "caps_lock": "A1",
- "on_state": 0
- },
- "processor": "STM32L412",
- "bootloader": "stm32-dfu",
- "layouts": {
- "LAYOUT_60_ansi": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_split_bs_rshift": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_60_ansi_tsangan": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_60_tsangan_hhkb": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [2, 13], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 1], "x": 2.25, "y": 3},
- {"matrix": [3, 2], "x": 3.25, "y": 3},
- {"matrix": [3, 3], "x": 4.25, "y": 3},
- {"matrix": [3, 4], "x": 5.25, "y": 3},
- {"matrix": [3, 5], "x": 6.25, "y": 3},
- {"matrix": [3, 6], "x": 7.25, "y": 3},
- {"matrix": [3, 7], "x": 8.25, "y": 3},
- {"matrix": [3, 8], "x": 9.25, "y": 3},
- {"matrix": [3, 9], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 13], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/rs60/rev2_1/keyboard.json b/keyboards/xelus/rs60/rev2_1/keyboard.json
@@ -0,0 +1,313 @@
+{
+ "usb": {
+ "device_version": "0.2.1",
+ "force_nkro": true,
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "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",
+ "eeprom": {
+ "wear_leveling": {
+ "backing_size": 4096
+ }
+ },
+ "indicators": {
+ "caps_lock": "A1",
+ "on_state": 0
+ },
+ "processor": "STM32L412",
+ "bootloader": "stm32-dfu",
+ "layouts": {
+ "LAYOUT_60_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_60_ansi_tsangan": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/rs60/rev2_1/rules.mk b/keyboards/xelus/rs60/rev2_1/rules.mk
@@ -1,16 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-# Save hid interface
-KEYBOARD_SHARED_EP = yes
-
diff --git a/keyboards/xelus/trinityxttkl/config.h b/keyboards/xelus/trinityxttkl/config.h
@@ -1,22 +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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/xelus/trinityxttkl/info.json b/keyboards/xelus/trinityxttkl/info.json
@@ -1,511 +0,0 @@
-{
- "keyboard_name": "Trinity XT TKL",
- "manufacturer": "Xelus",
- "url": "",
- "maintainer": "Xelus22",
- "usb": {
- "vid": "0x5845",
- "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"
- },
- "processor": "STM32F072",
- "bootloader": "stm32-dfu",
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_ansi_split_space_split_bs_rshift"
- },
- "layouts": {
- "LAYOUT_ansi_split_space": {
- "layout": [
- {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-
- {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-
- {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
- {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
- {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
-
- {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
- {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
- {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
- {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
-
- {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
-
- {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
- {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
- {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
- {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
- {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
- {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
- {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
- {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
- {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25, "w": 2},
-
- {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
- {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
- {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
- {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
- {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
- {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
- {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
- {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
- {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
- {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
- {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
- {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
- {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
- {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
- {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
- {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
- {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
- {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
- {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
-
- {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
- {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
- {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
- {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
- {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
- {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
- {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
- {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
- {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
-
- {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
- {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
-
- {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
- {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
- {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
- {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
- {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
- {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
- {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
- {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
- {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
- {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
- {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 2.75},
-
- {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-
- {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
- {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
-
- {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
- {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 4], "x": 6.25, "y": 5.25, "w": 3},
- {"label": "Space", "matrix": [5, 5], "x": 9.25, "y": 5.25},
- {"label": "Space", "matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 3},
- {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
- {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
- ]
- },
- "LAYOUT_ansi_split_space_split_bs_rshift": {
- "layout": [
- {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-
- {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-
- {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
- {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
- {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
-
- {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
- {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
- {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
- {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
-
- {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
-
- {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
- {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
- {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
- {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
- {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
- {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
- {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
- {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
- {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25},
- {"label": "Backspace", "matrix": [3, 15], "x": 16.25, "y": 1.25},
-
- {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
- {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
- {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
- {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
- {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
- {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
- {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
- {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
- {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
- {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
- {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
- {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
- {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
- {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
- {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
- {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
- {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
- {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
- {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
-
- {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
- {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
- {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
- {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
- {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
- {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
- {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
- {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
- {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
-
- {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
- {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
-
- {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
- {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
- {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
- {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
- {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
- {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
- {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
- {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
- {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
- {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
- {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 1.75},
- {"label": "Fn", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-
- {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
- {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
-
- {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
- {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 4], "x": 6.25, "y": 5.25, "w": 3},
- {"label": "Space", "matrix": [5, 5], "x": 9.25, "y": 5.25},
- {"label": "Space", "matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 3},
- {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
- {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
- ]
- },
- "LAYOUT_ansi_wkl": {
- "layout": [
- {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-
- {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-
- {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
- {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
- {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
-
- {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
- {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
- {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
- {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
-
- {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
-
- {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
- {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
- {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
- {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
- {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
- {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
- {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
- {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
- {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25, "w": 2},
-
- {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
- {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
- {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
- {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
- {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
- {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
- {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
- {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
- {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
- {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
- {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
- {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
- {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
- {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
- {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
- {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
- {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
- {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
- {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
-
- {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
- {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
- {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
- {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
- {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
- {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
- {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
- {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
- {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
-
- {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
- {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
-
- {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
- {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
- {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
- {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
- {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
- {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
- {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
- {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
- {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
- {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
- {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 2.75},
-
- {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-
- {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
- {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
-
- {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
- {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 7},
- {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
- {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
- ]
- },
- "LAYOUT_ansi_wkl_split_bs_rshift": {
- "layout": [
- {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
-
- {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
-
- {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
- {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
- {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
- {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
- {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
- {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
- {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
-
- {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
- {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
- {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
- {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
-
- {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
- {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
- {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
-
- {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
-
- {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
- {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
- {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
- {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
- {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
- {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
- {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
- {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
- {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
- {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
- {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
- {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
- {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25},
- {"label": "Backspace", "matrix": [3, 15], "x": 16.25, "y": 1.25},
-
- {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
- {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
- {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
- {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
- {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
-
- {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
- {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
- {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
- {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
- {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
- {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
- {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
- {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
- {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
- {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
- {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
- {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
- {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
- {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
- {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
- {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
- {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
-
- {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
- {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
- {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
- {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
- {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
- {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
- {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
- {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
- {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
- {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
- {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
- {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
-
- {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
- {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
-
- {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
- {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
- {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
- {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
- {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
- {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
- {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
- {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
- {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
- {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
- {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 1.75},
- {"label": "Fn", "matrix": [4, 15], "x": 16.25, "y": 4.25},
-
- {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
-
- {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
- {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
-
- {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
- {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 7},
- {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
- {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
-
- {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
- {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
- {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/trinityxttkl/keyboard.json b/keyboards/xelus/trinityxttkl/keyboard.json
@@ -0,0 +1,524 @@
+{
+ "keyboard_name": "Trinity XT TKL",
+ "manufacturer": "Xelus",
+ "url": "",
+ "maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5854",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "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"
+ },
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_ansi_split_space_split_bs_rshift"
+ },
+ "layouts": {
+ "LAYOUT_ansi_split_space": {
+ "layout": [
+ {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+
+ {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
+ {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
+ {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
+
+ {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
+ {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
+ {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
+ {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
+
+ {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+ {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
+ {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
+ {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
+ {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
+ {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
+ {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
+ {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
+ {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25, "w": 2},
+
+ {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+ {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
+ {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
+ {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
+ {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
+ {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+ {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
+ {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
+
+ {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
+ {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
+ {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
+ {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
+ {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
+ {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
+ {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
+ {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
+
+ {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
+ {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
+
+ {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
+ {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
+ {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
+ {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
+ {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
+ {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
+ {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
+ {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
+ {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
+ {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+
+ {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
+ {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
+
+ {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+ {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 4], "x": 6.25, "y": 5.25, "w": 3},
+ {"label": "Space", "matrix": [5, 5], "x": 9.25, "y": 5.25},
+ {"label": "Space", "matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 3},
+ {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
+ {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+ ]
+ },
+ "LAYOUT_ansi_split_space_split_bs_rshift": {
+ "layout": [
+ {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+
+ {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
+ {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
+ {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
+
+ {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
+ {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
+ {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
+ {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
+
+ {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+ {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
+ {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
+ {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
+ {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
+ {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
+ {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
+ {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
+ {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+ {"label": "Backspace", "matrix": [3, 15], "x": 16.25, "y": 1.25},
+
+ {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+ {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
+ {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
+ {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
+ {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
+ {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+ {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
+ {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
+
+ {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
+ {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
+ {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
+ {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
+ {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
+ {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
+ {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
+ {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
+
+ {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
+ {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
+
+ {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
+ {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
+ {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
+ {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
+ {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
+ {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
+ {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
+ {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
+ {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
+ {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 1.75},
+ {"label": "Fn", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+
+ {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
+ {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
+
+ {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+ {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 4], "x": 6.25, "y": 5.25, "w": 3},
+ {"label": "Space", "matrix": [5, 5], "x": 9.25, "y": 5.25},
+ {"label": "Space", "matrix": [5, 11], "x": 10.25, "y": 5.25, "w": 3},
+ {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
+ {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+ ]
+ },
+ "LAYOUT_ansi_wkl": {
+ "layout": [
+ {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+
+ {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
+ {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
+ {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
+
+ {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
+ {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
+ {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
+ {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
+
+ {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+ {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
+ {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
+ {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
+ {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
+ {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
+ {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
+ {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
+ {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25, "w": 2},
+
+ {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+ {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
+ {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
+ {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
+ {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
+ {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+ {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
+ {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
+
+ {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
+ {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
+ {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
+ {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
+ {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
+ {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
+ {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
+ {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
+
+ {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
+ {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
+
+ {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
+ {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
+ {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
+ {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
+ {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
+ {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
+ {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
+ {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
+ {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
+ {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+
+ {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
+ {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
+
+ {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+ {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
+ {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+ ]
+ },
+ "LAYOUT_ansi_wkl_split_bs_rshift": {
+ "layout": [
+ {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+
+ {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
+
+ {"label": "F1", "matrix": [0, 4], "x": 4.25, "y": 0},
+ {"label": "F2", "matrix": [0, 5], "x": 5.25, "y": 0},
+ {"label": "F3", "matrix": [0, 6], "x": 6.25, "y": 0},
+ {"label": "F4", "matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"label": "F5", "matrix": [0, 8], "x": 8.75, "y": 0},
+ {"label": "F6", "matrix": [0, 9], "x": 9.75, "y": 0},
+ {"label": "F7", "matrix": [0, 10], "x": 10.75, "y": 0},
+ {"label": "F8", "matrix": [0, 11], "x": 11.75, "y": 0},
+
+ {"label": "F9", "matrix": [0, 12], "x": 13.25, "y": 0},
+ {"label": "F10", "matrix": [0, 13], "x": 14.25, "y": 0},
+ {"label": "F11", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "F12", "matrix": [0, 15], "x": 16.25, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 16], "x": 17.5, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 17], "x": 18.5, "y": 0},
+ {"label": "Pause", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"label": "F15", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "F16", "matrix": [1, 1], "x": 1, "y": 1.25},
+
+ {"label": "`", "matrix": [1, 2], "x": 2.25, "y": 1.25},
+ {"label": "1", "matrix": [1, 3], "x": 3.25, "y": 1.25},
+ {"label": "2", "matrix": [1, 4], "x": 4.25, "y": 1.25},
+ {"label": "3", "matrix": [1, 5], "x": 5.25, "y": 1.25},
+ {"label": "4", "matrix": [1, 6], "x": 6.25, "y": 1.25},
+ {"label": "5", "matrix": [1, 7], "x": 7.25, "y": 1.25},
+ {"label": "6", "matrix": [1, 8], "x": 8.25, "y": 1.25},
+ {"label": "7", "matrix": [1, 9], "x": 9.25, "y": 1.25},
+ {"label": "8", "matrix": [1, 10], "x": 10.25, "y": 1.25},
+ {"label": "9", "matrix": [1, 11], "x": 11.25, "y": 1.25},
+ {"label": "0", "matrix": [1, 12], "x": 12.25, "y": 1.25},
+ {"label": "-", "matrix": [1, 13], "x": 13.25, "y": 1.25},
+ {"label": "=", "matrix": [1, 14], "x": 14.25, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 15], "x": 15.25, "y": 1.25},
+ {"label": "Backspace", "matrix": [3, 15], "x": 16.25, "y": 1.25},
+
+ {"label": "Insert", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"label": "Home", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+ {"label": "F17", "matrix": [2, 0], "x": 0, "y": 2.25},
+ {"label": "F18", "matrix": [2, 1], "x": 1, "y": 2.25},
+
+ {"label": "Tab", "matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 3], "x": 3.75, "y": 2.25},
+ {"label": "W", "matrix": [2, 4], "x": 4.75, "y": 2.25},
+ {"label": "E", "matrix": [2, 5], "x": 5.75, "y": 2.25},
+ {"label": "R", "matrix": [2, 6], "x": 6.75, "y": 2.25},
+ {"label": "T", "matrix": [2, 7], "x": 7.75, "y": 2.25},
+ {"label": "Y", "matrix": [2, 8], "x": 8.75, "y": 2.25},
+ {"label": "U", "matrix": [2, 9], "x": 9.75, "y": 2.25},
+ {"label": "I", "matrix": [2, 10], "x": 10.75, "y": 2.25},
+ {"label": "O", "matrix": [2, 11], "x": 11.75, "y": 2.25},
+ {"label": "P", "matrix": [2, 12], "x": 12.75, "y": 2.25},
+ {"label": "[", "matrix": [2, 13], "x": 13.75, "y": 2.25},
+ {"label": "]", "matrix": [2, 14], "x": 14.75, "y": 2.25},
+ {"label": "\\", "matrix": [2, 15], "x": 15.75, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"label": "End", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+ {"label": "F19", "matrix": [3, 0], "x": 0, "y": 3.25},
+ {"label": "F20", "matrix": [3, 1], "x": 1, "y": 3.25},
+
+ {"label": "Caps Lock", "matrix": [3, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 3], "x": 4, "y": 3.25},
+ {"label": "S", "matrix": [3, 4], "x": 5, "y": 3.25},
+ {"label": "D", "matrix": [3, 5], "x": 6, "y": 3.25},
+ {"label": "F", "matrix": [3, 6], "x": 7, "y": 3.25},
+ {"label": "G", "matrix": [3, 7], "x": 8, "y": 3.25},
+ {"label": "H", "matrix": [3, 8], "x": 9, "y": 3.25},
+ {"label": "J", "matrix": [3, 9], "x": 10, "y": 3.25},
+ {"label": "K", "matrix": [3, 10], "x": 11, "y": 3.25},
+ {"label": "L", "matrix": [3, 11], "x": 12, "y": 3.25},
+ {"label": ";", "matrix": [3, 12], "x": 13, "y": 3.25},
+ {"label": "'", "matrix": [3, 13], "x": 14, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 14], "x": 15, "y": 3.25, "w": 2.25},
+
+ {"label": "F21", "matrix": [4, 0], "x": 0, "y": 4.25},
+ {"label": "F22", "matrix": [4, 1], "x": 1, "y": 4.25},
+
+ {"label": "Shift", "matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 3], "x": 4.5, "y": 4.25},
+ {"label": "X", "matrix": [4, 4], "x": 5.5, "y": 4.25},
+ {"label": "C", "matrix": [4, 5], "x": 6.5, "y": 4.25},
+ {"label": "V", "matrix": [4, 6], "x": 7.5, "y": 4.25},
+ {"label": "B", "matrix": [4, 7], "x": 8.5, "y": 4.25},
+ {"label": "N", "matrix": [4, 8], "x": 9.5, "y": 4.25},
+ {"label": "M", "matrix": [4, 9], "x": 10.5, "y": 4.25},
+ {"label": ",", "matrix": [4, 10], "x": 11.5, "y": 4.25},
+ {"label": ".", "matrix": [4, 11], "x": 12.5, "y": 4.25},
+ {"label": "/", "matrix": [4, 12], "x": 13.5, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 14], "x": 14.5, "y": 4.25, "w": 1.75},
+ {"label": "Fn", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "\u2191", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+
+ {"label": "F23", "matrix": [5, 0], "x": 0, "y": 5.25},
+ {"label": "F24", "matrix": [5, 1], "x": 1, "y": 5.25},
+
+ {"label": "Ctrl", "matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.5},
+ {"label": "Alt", "matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 12], "x": 13.25, "y": 5.25, "w": 1.5},
+ {"label": "Ctrl", "matrix": [5, 15], "x": 15.75, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/trinityxttkl/rules.mk b/keyboards/xelus/trinityxttkl/rules.mk
@@ -1,16 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-
-
diff --git a/keyboards/xelus/valor/info.json b/keyboards/xelus/valor/info.json
@@ -0,0 +1,8 @@
+{
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ }
+}
diff --git a/keyboards/xelus/valor/rev1/config.h b/keyboards/xelus/valor/rev1/config.h
@@ -1,23 +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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
// I2C setup
#define I2C1_SCL_PIN B8
#define I2C1_SDA_PIN B9
diff --git a/keyboards/xelus/valor/rev2/info.json b/keyboards/xelus/valor/rev2/info.json
@@ -1,240 +0,0 @@
-{
- "keyboard_name": "Valor Rev2",
- "manufacturer": "Xelus",
- "url": "",
- "maintainer": "Xelus22",
- "usb": {
- "vid": "0x5845",
- "pid": "0x5653",
- "device_version": "0.0.1"
- },
- "ws2812": {
- "pin": "A9",
- "driver": "pwm"
- },
- "rgb_matrix": {
- "animations": {
- "alphas_mods": true,
- "gradient_up_down": true,
- "gradient_left_right": true,
- "breathing": true,
- "band_sat": true,
- "band_val": true,
- "band_pinwheel_sat": true,
- "band_pinwheel_val": true,
- "band_spiral_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "cycle_left_right": true,
- "cycle_up_down": true,
- "rainbow_moving_chevron": true,
- "cycle_out_in": true,
- "cycle_out_in_dual": true,
- "cycle_pinwheel": true,
- "cycle_spiral": true,
- "dual_beacon": true,
- "rainbow_beacon": true,
- "rainbow_pinwheels": true,
- "raindrops": true,
- "jellybean_raindrops": true,
- "hue_breathing": true,
- "hue_pendulum": true,
- "hue_wave": true,
- "pixel_rain": true,
- "pixel_flow": true,
- "pixel_fractal": true,
- "typing_heatmap": true,
- "digital_rain": true,
- "solid_reactive_simple": true,
- "solid_reactive": true,
- "solid_reactive_wide": true,
- "solid_reactive_multiwide": true,
- "solid_reactive_cross": true,
- "solid_reactive_multicross": true,
- "solid_reactive_nexus": true,
- "solid_reactive_multinexus": true,
- "splash": true,
- "multisplash": true,
- "solid_splash": true,
- "solid_multisplash": true
- },
- "driver": "ws2812",
- "max_brightness": 200,
- "sleep": true
- },
- "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",
- "eeprom": {
- "driver": "i2c"
- },
- "processor": "STM32L422",
- "bootloader": "stm32-dfu",
- "community_layouts": ["alice", "alice_split_bs"],
- "layout_aliases": {
- "LAYOUT_all": "LAYOUT_alice_split_bs"
- },
- "layouts": {
- "LAYOUT_alice": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"matrix": [0, 8], "x": 10.25, "y": 0},
- {"matrix": [0, 9], "x": 11.25, "y": 0},
- {"matrix": [0, 10], "x": 12.25, "y": 0},
- {"matrix": [0, 11], "x": 13.25, "y": 0},
- {"matrix": [0, 12], "x": 14.25, "y": 0},
- {"matrix": [0, 13], "x": 15.25, "y": 0},
- {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 2.75, "y": 1},
- {"matrix": [1, 3], "x": 3.75, "y": 1},
- {"matrix": [1, 4], "x": 4.75, "y": 1},
- {"matrix": [1, 5], "x": 5.75, "y": 1},
- {"matrix": [1, 6], "x": 6.75, "y": 1},
-
- {"matrix": [1, 7], "x": 9.75, "y": 1},
- {"matrix": [1, 8], "x": 10.75, "y": 1},
- {"matrix": [1, 9], "x": 11.75, "y": 1},
- {"matrix": [1, 10], "x": 12.75, "y": 1},
- {"matrix": [1, 11], "x": 13.75, "y": 1},
- {"matrix": [1, 12], "x": 14.75, "y": 1},
- {"matrix": [1, 13], "x": 15.75, "y": 1},
- {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 4], "x": 5, "y": 2},
- {"matrix": [2, 5], "x": 6, "y": 2},
- {"matrix": [2, 6], "x": 7, "y": 2},
-
- {"matrix": [2, 7], "x": 10, "y": 2},
- {"matrix": [2, 8], "x": 11, "y": 2},
- {"matrix": [2, 9], "x": 12, "y": 2},
- {"matrix": [2, 10], "x": 13, "y": 2},
- {"matrix": [2, 11], "x": 14, "y": 2},
- {"matrix": [2, 12], "x": 15, "y": 2},
- {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 3.5, "y": 3},
- {"matrix": [3, 3], "x": 4.5, "y": 3},
- {"matrix": [3, 4], "x": 5.5, "y": 3},
- {"matrix": [3, 5], "x": 6.5, "y": 3},
- {"matrix": [3, 6], "x": 7.5, "y": 3},
-
- {"matrix": [3, 7], "x": 9.5, "y": 3},
- {"matrix": [3, 8], "x": 10.5, "y": 3},
- {"matrix": [3, 9], "x": 11.5, "y": 3},
- {"matrix": [3, 10], "x": 12.5, "y": 3},
- {"matrix": [3, 11], "x": 13.5, "y": 3},
- {"matrix": [3, 12], "x": 14.5, "y": 3},
- {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
- {"matrix": [3, 14], "x": 17.25, "y": 3},
-
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
- {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
- {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
- {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
- {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
- ]
- },
- "LAYOUT_alice_split_bs": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 1.25, "y": 0},
- {"matrix": [0, 2], "x": 2.25, "y": 0},
- {"matrix": [0, 3], "x": 3.25, "y": 0},
- {"matrix": [0, 4], "x": 4.25, "y": 0},
- {"matrix": [0, 5], "x": 5.25, "y": 0},
- {"matrix": [0, 6], "x": 6.25, "y": 0},
- {"matrix": [0, 7], "x": 7.25, "y": 0},
-
- {"matrix": [0, 8], "x": 10.25, "y": 0},
- {"matrix": [0, 9], "x": 11.25, "y": 0},
- {"matrix": [0, 10], "x": 12.25, "y": 0},
- {"matrix": [0, 11], "x": 13.25, "y": 0},
- {"matrix": [0, 12], "x": 14.25, "y": 0},
- {"matrix": [0, 13], "x": 15.25, "y": 0},
- {"matrix": [0, 14], "x": 16.25, "y": 0},
- {"matrix": [2, 14], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
-
- {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
- {"matrix": [1, 2], "x": 2.75, "y": 1},
- {"matrix": [1, 3], "x": 3.75, "y": 1},
- {"matrix": [1, 4], "x": 4.75, "y": 1},
- {"matrix": [1, 5], "x": 5.75, "y": 1},
- {"matrix": [1, 6], "x": 6.75, "y": 1},
-
- {"matrix": [1, 7], "x": 9.75, "y": 1},
- {"matrix": [1, 8], "x": 10.75, "y": 1},
- {"matrix": [1, 9], "x": 11.75, "y": 1},
- {"matrix": [1, 10], "x": 12.75, "y": 1},
- {"matrix": [1, 11], "x": 13.75, "y": 1},
- {"matrix": [1, 12], "x": 14.75, "y": 1},
- {"matrix": [1, 13], "x": 15.75, "y": 1},
- {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2},
- {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 3, "y": 2},
- {"matrix": [2, 3], "x": 4, "y": 2},
- {"matrix": [2, 4], "x": 5, "y": 2},
- {"matrix": [2, 5], "x": 6, "y": 2},
- {"matrix": [2, 6], "x": 7, "y": 2},
-
- {"matrix": [2, 7], "x": 10, "y": 2},
- {"matrix": [2, 8], "x": 11, "y": 2},
- {"matrix": [2, 9], "x": 12, "y": 2},
- {"matrix": [2, 10], "x": 13, "y": 2},
- {"matrix": [2, 11], "x": 14, "y": 2},
- {"matrix": [2, 12], "x": 15, "y": 2},
- {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
-
- {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 3.5, "y": 3},
- {"matrix": [3, 3], "x": 4.5, "y": 3},
- {"matrix": [3, 4], "x": 5.5, "y": 3},
- {"matrix": [3, 5], "x": 6.5, "y": 3},
- {"matrix": [3, 6], "x": 7.5, "y": 3},
-
- {"matrix": [3, 7], "x": 9.5, "y": 3},
- {"matrix": [3, 8], "x": 10.5, "y": 3},
- {"matrix": [3, 9], "x": 11.5, "y": 3},
- {"matrix": [3, 10], "x": 12.5, "y": 3},
- {"matrix": [3, 11], "x": 13.5, "y": 3},
- {"matrix": [3, 12], "x": 14.5, "y": 3},
- {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
- {"matrix": [3, 14], "x": 17.25, "y": 3},
-
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
- {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
- {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
- {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
- {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
- {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
- ]
- }
- }
-}
diff --git a/keyboards/xelus/valor/rev2/keyboard.json b/keyboards/xelus/valor/rev2/keyboard.json
@@ -0,0 +1,250 @@
+{
+ "keyboard_name": "Valor Rev2",
+ "manufacturer": "Xelus",
+ "url": "",
+ "maintainer": "Xelus22",
+ "usb": {
+ "vid": "0x5845",
+ "pid": "0x5653",
+ "device_version": "0.0.1"
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "ws2812": {
+ "pin": "A9",
+ "driver": "pwm"
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "driver": "ws2812",
+ "max_brightness": 200,
+ "sleep": true
+ },
+ "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",
+ "eeprom": {
+ "driver": "i2c"
+ },
+ "processor": "STM32L422",
+ "bootloader": "stm32-dfu",
+ "community_layouts": ["alice", "alice_split_bs"],
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_alice_split_bs"
+ },
+ "layouts": {
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"matrix": [0, 8], "x": 10.25, "y": 0},
+ {"matrix": [0, 9], "x": 11.25, "y": 0},
+ {"matrix": [0, 10], "x": 12.25, "y": 0},
+ {"matrix": [0, 11], "x": 13.25, "y": 0},
+ {"matrix": [0, 12], "x": 14.25, "y": 0},
+ {"matrix": [0, 13], "x": 15.25, "y": 0},
+ {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+ {"matrix": [1, 7], "x": 9.75, "y": 1},
+ {"matrix": [1, 8], "x": 10.75, "y": 1},
+ {"matrix": [1, 9], "x": 11.75, "y": 1},
+ {"matrix": [1, 10], "x": 12.75, "y": 1},
+ {"matrix": [1, 11], "x": 13.75, "y": 1},
+ {"matrix": [1, 12], "x": 14.75, "y": 1},
+ {"matrix": [1, 13], "x": 15.75, "y": 1},
+ {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+
+ {"matrix": [2, 7], "x": 10, "y": 2},
+ {"matrix": [2, 8], "x": 11, "y": 2},
+ {"matrix": [2, 9], "x": 12, "y": 2},
+ {"matrix": [2, 10], "x": 13, "y": 2},
+ {"matrix": [2, 11], "x": 14, "y": 2},
+ {"matrix": [2, 12], "x": 15, "y": 2},
+ {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [3, 7], "x": 9.5, "y": 3},
+ {"matrix": [3, 8], "x": 10.5, "y": 3},
+ {"matrix": [3, 9], "x": 11.5, "y": 3},
+ {"matrix": [3, 10], "x": 12.5, "y": 3},
+ {"matrix": [3, 11], "x": 13.5, "y": 3},
+ {"matrix": [3, 12], "x": 14.5, "y": 3},
+ {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+
+ {"matrix": [0, 8], "x": 10.25, "y": 0},
+ {"matrix": [0, 9], "x": 11.25, "y": 0},
+ {"matrix": [0, 10], "x": 12.25, "y": 0},
+ {"matrix": [0, 11], "x": 13.25, "y": 0},
+ {"matrix": [0, 12], "x": 14.25, "y": 0},
+ {"matrix": [0, 13], "x": 15.25, "y": 0},
+ {"matrix": [0, 14], "x": 16.25, "y": 0},
+ {"matrix": [2, 14], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+ {"matrix": [1, 7], "x": 9.75, "y": 1},
+ {"matrix": [1, 8], "x": 10.75, "y": 1},
+ {"matrix": [1, 9], "x": 11.75, "y": 1},
+ {"matrix": [1, 10], "x": 12.75, "y": 1},
+ {"matrix": [1, 11], "x": 13.75, "y": 1},
+ {"matrix": [1, 12], "x": 14.75, "y": 1},
+ {"matrix": [1, 13], "x": 15.75, "y": 1},
+ {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+
+ {"matrix": [2, 7], "x": 10, "y": 2},
+ {"matrix": [2, 8], "x": 11, "y": 2},
+ {"matrix": [2, 9], "x": 12, "y": 2},
+ {"matrix": [2, 10], "x": 13, "y": 2},
+ {"matrix": [2, 11], "x": 14, "y": 2},
+ {"matrix": [2, 12], "x": 15, "y": 2},
+ {"matrix": [2, 13], "x": 16, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [3, 7], "x": 9.5, "y": 3},
+ {"matrix": [3, 8], "x": 10.5, "y": 3},
+ {"matrix": [3, 9], "x": 11.5, "y": 3},
+ {"matrix": [3, 10], "x": 12.5, "y": 3},
+ {"matrix": [3, 11], "x": 13.5, "y": 3},
+ {"matrix": [3, 12], "x": 14.5, "y": 3},
+ {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xelus/valor/rev2/rules.mk b/keyboards/xelus/valor/rev2/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
RGB_MATRIX_CUSTOM_KB = yes
OPT = 2
-LTO_ENABLE = yes
diff --git a/keyboards/xelus/valor_frl_tkl/info.json b/keyboards/xelus/valor_frl_tkl/info.json
@@ -6,6 +6,12 @@
"vid": "0x5845",
"pid": "0x4654"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"layout_aliases": {
"LAYOUT_all": "LAYOUT_ansi_split_bs_rshift"
},
diff --git a/keyboards/xelus/valor_frl_tkl/rev1/config.h b/keyboards/xelus/valor_frl_tkl/rev1/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
// I2C OLED defines
#define I2C1_SCL_PIN B8
#define I2C1_SDA_PIN B9
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
@@ -16,10 +16,4 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
#define STM32_HSECLK 16000000
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/info.json b/keyboards/xelus/valor_frl_tkl/rev2_0/info.json
@@ -1,13 +0,0 @@
-{
- "keyboard_name": "Valor FRL TKL Rev2.0",
- "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_0/keyboard.json b/keyboards/xelus/valor_frl_tkl/rev2_0/keyboard.json
@@ -0,0 +1,24 @@
+{
+ "keyboard_name": "Valor FRL TKL Rev2.0",
+ "usb": {
+ "device_version": "0.0.2",
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "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_0/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
@@ -16,10 +16,4 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
#define STM32_HSECLK 16000000
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/info.json b/keyboards/xelus/valor_frl_tkl/rev2_1/info.json
@@ -1,13 +0,0 @@
-{
- "keyboard_name": "Valor FRL TKL Rev2.2",
- "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/rev2_1/keyboard.json b/keyboards/xelus/valor_frl_tkl/rev2_1/keyboard.json
@@ -0,0 +1,24 @@
+{
+ "keyboard_name": "Valor FRL TKL Rev2.2",
+ "usb": {
+ "device_version": "0.0.3",
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "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/rev2_1/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/xelus/xs60/hotswap/config.h b/keyboards/xelus/xs60/hotswap/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
// I2C setup
#define I2C1_SCL_PAL_MODE 4
#define I2C1_SDA_PAL_MODE 4
diff --git a/keyboards/xelus/xs60/hotswap/info.json b/keyboards/xelus/xs60/hotswap/keyboard.json
diff --git a/keyboards/xelus/xs60/hotswap/rules.mk b/keyboards/xelus/xs60/hotswap/rules.mk
@@ -1,16 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-
-RGBLIGHT_ENABLE = yes
-
-LTO_ENABLE = yes
OPT = 2
diff --git a/keyboards/xelus/xs60/info.json b/keyboards/xelus/xs60/info.json
@@ -0,0 +1,19 @@
+{
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ }
+}
diff --git a/keyboards/xelus/xs60/soldered/config.h b/keyboards/xelus/xs60/soldered/config.h
@@ -16,12 +16,6 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
// I2C setup
#define I2C1_SCL_PAL_MODE 4
#define I2C1_SDA_PAL_MODE 4
diff --git a/keyboards/xelus/xs60/soldered/info.json b/keyboards/xelus/xs60/soldered/keyboard.json
diff --git a/keyboards/xelus/xs60/soldered/rules.mk b/keyboards/xelus/xs60/soldered/rules.mk
@@ -1,16 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-
-RGBLIGHT_ENABLE = yes
-
-LTO_ENABLE = yes
OPT = 2
diff --git a/keyboards/xenon/config.h b/keyboards/xenon/config.h
@@ -1,31 +0,0 @@
-/*
-Copyright 2020 Kyrre Havik Eriksen
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-#ifdef OLED_ENABLE
- #define OLED_DISPLAY_128X32
-#endif
-
-// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
-// #define SPLIT_USB_DETECT
-// #define NO_USB_STARTUP_CHECK
diff --git a/keyboards/xenon/info.json b/keyboards/xenon/info.json
@@ -1,96 +0,0 @@
-{
- "keyboard_name": "Xenon",
- "manufacturer": "narinari",
- "url": "https://github.com/narinari/xenon-keyboard",
- "maintainer": "Kyrremann",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x3404",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"],
- "rows": ["D4", "C6", "D7", "E6", "B4"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B6", "pin_b": "B5"}
- ]
- },
- "split": {
- "enabled": true,
- "soft_serial_pin": "D2"
- },
- "processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 6], "x": 0, "y": 0.75},
- {"matrix": [0, 5], "x": 1, "y": 0.75},
- {"matrix": [0, 4], "x": 2, "y": 0.25},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 2], "x": 4, "y": 0.25},
- {"matrix": [0, 1], "x": 5, "y": 0.5},
-
- {"matrix": [5, 1], "x": 9, "y": 0.5},
- {"matrix": [5, 2], "x": 10, "y": 0.25},
- {"matrix": [5, 3], "x": 11, "y": 0},
- {"matrix": [5, 4], "x": 12, "y": 0.25},
- {"matrix": [5, 5], "x": 13, "y": 0.75},
- {"matrix": [5, 6], "x": 14, "y": 0.75},
-
- {"matrix": [1, 6], "x": 0, "y": 1.75},
- {"matrix": [1, 5], "x": 1, "y": 1.75},
- {"matrix": [1, 4], "x": 2, "y": 1.25},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 2], "x": 4, "y": 1.25},
- {"matrix": [1, 1], "x": 5, "y": 1.5},
-
- {"matrix": [6, 1], "x": 9, "y": 1.5},
- {"matrix": [6, 2], "x": 10, "y": 1.25},
- {"matrix": [6, 3], "x": 11, "y": 1},
- {"matrix": [6, 4], "x": 12, "y": 1.25},
- {"matrix": [6, 5], "x": 13, "y": 1.75},
- {"matrix": [6, 6], "x": 14, "y": 1.75},
-
- {"matrix": [2, 6], "x": 0, "y": 2.75},
- {"matrix": [2, 5], "x": 1, "y": 2.75},
- {"matrix": [2, 4], "x": 2, "y": 2.25},
- {"matrix": [2, 3], "x": 3, "y": 2},
- {"matrix": [2, 2], "x": 4, "y": 2.25},
- {"matrix": [2, 1], "x": 5, "y": 2.5},
-
- {"matrix": [7, 1], "x": 9, "y": 2.5},
- {"matrix": [7, 2], "x": 10, "y": 2.25},
- {"matrix": [7, 3], "x": 11, "y": 2},
- {"matrix": [7, 4], "x": 12, "y": 2.25},
- {"matrix": [7, 5], "x": 13, "y": 2.75},
- {"matrix": [7, 6], "x": 14, "y": 2.75},
-
- {"matrix": [3, 4], "x": 2, "y": 3.25},
- {"matrix": [3, 3], "x": 3, "y": 3},
- {"matrix": [3, 2], "x": 4, "y": 3.25},
- {"matrix": [3, 1], "x": 5, "y": 3.5},
- {"matrix": [3, 0], "x": 6, "y": 3.5},
-
- {"matrix": [8, 0], "x": 8, "y": 3.5},
- {"matrix": [8, 1], "x": 9, "y": 3.5},
- {"matrix": [8, 2], "x": 10, "y": 3.25},
- {"matrix": [8, 3], "x": 11, "y": 3},
- {"matrix": [8, 4], "x": 12, "y": 3.25},
-
- {"matrix": [4, 3], "x": 3, "y": 4},
- {"matrix": [4, 2], "x": 4, "y": 4.25},
- {"matrix": [4, 1], "x": 5, "y": 4.5},
- {"matrix": [4, 0], "x": 6, "y": 4.5},
-
- {"matrix": [9, 0], "x": 8, "y": 4.5},
- {"matrix": [9, 1], "x": 9, "y": 4.5},
- {"matrix": [9, 2], "x": 10, "y": 4.25},
- {"matrix": [9, 3], "x": 11, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/xenon/keyboard.json b/keyboards/xenon/keyboard.json
@@ -0,0 +1,111 @@
+{
+ "keyboard_name": "Xenon",
+ "manufacturer": "narinari",
+ "url": "https://github.com/narinari/xenon-keyboard",
+ "maintainer": "Kyrremann",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x3404",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": false,
+ "console": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "oled": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B6", "pin_b": "B5"}
+ ]
+ },
+ "split": {
+ "enabled": true,
+ "soft_serial_pin": "D2"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 6], "x": 0, "y": 0.75},
+ {"matrix": [0, 5], "x": 1, "y": 0.75},
+ {"matrix": [0, 4], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0.25},
+ {"matrix": [0, 1], "x": 5, "y": 0.5},
+
+ {"matrix": [5, 1], "x": 9, "y": 0.5},
+ {"matrix": [5, 2], "x": 10, "y": 0.25},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0.25},
+ {"matrix": [5, 5], "x": 13, "y": 0.75},
+ {"matrix": [5, 6], "x": 14, "y": 0.75},
+
+ {"matrix": [1, 6], "x": 0, "y": 1.75},
+ {"matrix": [1, 5], "x": 1, "y": 1.75},
+ {"matrix": [1, 4], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 2], "x": 4, "y": 1.25},
+ {"matrix": [1, 1], "x": 5, "y": 1.5},
+
+ {"matrix": [6, 1], "x": 9, "y": 1.5},
+ {"matrix": [6, 2], "x": 10, "y": 1.25},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1.25},
+ {"matrix": [6, 5], "x": 13, "y": 1.75},
+ {"matrix": [6, 6], "x": 14, "y": 1.75},
+
+ {"matrix": [2, 6], "x": 0, "y": 2.75},
+ {"matrix": [2, 5], "x": 1, "y": 2.75},
+ {"matrix": [2, 4], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2.25},
+ {"matrix": [2, 1], "x": 5, "y": 2.5},
+
+ {"matrix": [7, 1], "x": 9, "y": 2.5},
+ {"matrix": [7, 2], "x": 10, "y": 2.25},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2.25},
+ {"matrix": [7, 5], "x": 13, "y": 2.75},
+ {"matrix": [7, 6], "x": 14, "y": 2.75},
+
+ {"matrix": [3, 4], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 2], "x": 4, "y": 3.25},
+ {"matrix": [3, 1], "x": 5, "y": 3.5},
+ {"matrix": [3, 0], "x": 6, "y": 3.5},
+
+ {"matrix": [8, 0], "x": 8, "y": 3.5},
+ {"matrix": [8, 1], "x": 9, "y": 3.5},
+ {"matrix": [8, 2], "x": 10, "y": 3.25},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3.25},
+
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 2], "x": 4, "y": 4.25},
+ {"matrix": [4, 1], "x": 5, "y": 4.5},
+ {"matrix": [4, 0], "x": 6, "y": 4.5},
+
+ {"matrix": [9, 0], "x": 8, "y": 4.5},
+ {"matrix": [9, 1], "x": 9, "y": 4.5},
+ {"matrix": [9, 2], "x": 10, "y": 4.25},
+ {"matrix": [9, 3], "x": 11, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xenon/rules.mk b/keyboards/xenon/rules.mk
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/xiaomi/mk02/config.h b/keyboards/xiaomi/mk02/config.h
@@ -18,19 +18,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/xiaomi/mk02/info.json b/keyboards/xiaomi/mk02/info.json
@@ -1,122 +0,0 @@
-{
- "keyboard_name": "MK02",
- "manufacturer": "Xiaomi",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x0B91",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C14", "C15", "B11", "A1", "A2", "B12"],
- "rows": ["A3", "A4", "A5", "A6", "A7", "B0"]
- },
- "diode_direction": "ROW2COL",
- "layouts": {
- "LAYOUT_tkl_ansi": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
-
- {"matrix": [0, 1], "x": 2, "y": 0},
- {"matrix": [0, 2], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 4], "x": 5, "y": 0},
-
- {"matrix": [0, 5], "x": 6.5, "y": 0},
- {"matrix": [0, 6], "x": 7.5, "y": 0},
- {"matrix": [0, 7], "x": 8.5, "y": 0},
- {"matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"matrix": [0, 9], "x": 11, "y": 0},
- {"matrix": [0, 10], "x": 12, "y": 0},
- {"matrix": [0, 11], "x": 13, "y": 0},
- {"matrix": [0, 12], "x": 14, "y": 0},
-
- {"matrix": [0, 14], "x": 15.25, "y": 0},
- {"matrix": [0, 15], "x": 16.25, "y": 0},
- {"matrix": [0, 16], "x": 17.25, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1.5},
- {"matrix": [1, 1], "x": 1, "y": 1.5},
- {"matrix": [1, 2], "x": 2, "y": 1.5},
- {"matrix": [1, 3], "x": 3, "y": 1.5},
- {"matrix": [1, 4], "x": 4, "y": 1.5},
- {"matrix": [1, 5], "x": 5, "y": 1.5},
- {"matrix": [1, 6], "x": 6, "y": 1.5},
- {"matrix": [1, 7], "x": 7, "y": 1.5},
- {"matrix": [1, 8], "x": 8, "y": 1.5},
- {"matrix": [1, 9], "x": 9, "y": 1.5},
- {"matrix": [1, 10], "x": 10, "y": 1.5},
- {"matrix": [1, 11], "x": 11, "y": 1.5},
- {"matrix": [1, 12], "x": 12, "y": 1.5},
- {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
-
- {"matrix": [1, 14], "x": 15.25, "y": 1.5},
- {"matrix": [1, 15], "x": 16.25, "y": 1.5},
- {"matrix": [1, 16], "x": 17.25, "y": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2.5},
- {"matrix": [2, 2], "x": 2.5, "y": 2.5},
- {"matrix": [2, 3], "x": 3.5, "y": 2.5},
- {"matrix": [2, 4], "x": 4.5, "y": 2.5},
- {"matrix": [2, 5], "x": 5.5, "y": 2.5},
- {"matrix": [2, 6], "x": 6.5, "y": 2.5},
- {"matrix": [2, 7], "x": 7.5, "y": 2.5},
- {"matrix": [2, 8], "x": 8.5, "y": 2.5},
- {"matrix": [2, 9], "x": 9.5, "y": 2.5},
- {"matrix": [2, 10], "x": 10.5, "y": 2.5},
- {"matrix": [2, 11], "x": 11.5, "y": 2.5},
- {"matrix": [2, 12], "x": 12.5, "y": 2.5},
- {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
-
- {"matrix": [2, 14], "x": 15.25, "y": 2.5},
- {"matrix": [2, 15], "x": 16.25, "y": 2.5},
- {"matrix": [2, 16], "x": 17.25, "y": 2.5},
-
- {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3.5},
- {"matrix": [3, 2], "x": 2.75, "y": 3.5},
- {"matrix": [3, 3], "x": 3.75, "y": 3.5},
- {"matrix": [3, 4], "x": 4.75, "y": 3.5},
- {"matrix": [3, 5], "x": 5.75, "y": 3.5},
- {"matrix": [3, 6], "x": 6.75, "y": 3.5},
- {"matrix": [3, 7], "x": 7.75, "y": 3.5},
- {"matrix": [3, 8], "x": 8.75, "y": 3.5},
- {"matrix": [3, 9], "x": 9.75, "y": 3.5},
- {"matrix": [3, 10], "x": 10.75, "y": 3.5},
- {"matrix": [3, 11], "x": 11.75, "y": 3.5},
- {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
-
- {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
- {"matrix": [4, 1], "x": 2.25, "y": 4.5},
- {"matrix": [4, 2], "x": 3.25, "y": 4.5},
- {"matrix": [4, 3], "x": 4.25, "y": 4.5},
- {"matrix": [4, 4], "x": 5.25, "y": 4.5},
- {"matrix": [4, 5], "x": 6.25, "y": 4.5},
- {"matrix": [4, 6], "x": 7.25, "y": 4.5},
- {"matrix": [4, 7], "x": 8.25, "y": 4.5},
- {"matrix": [4, 8], "x": 9.25, "y": 4.5},
- {"matrix": [4, 9], "x": 10.25, "y": 4.5},
- {"matrix": [4, 10], "x": 11.25, "y": 4.5},
- {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
-
- {"matrix": [4, 14], "x": 16.25, "y": 4.5},
-
- {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
- {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
- {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
- {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
- {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
-
- {"matrix": [5, 13], "x": 15.25, "y": 5.5},
- {"matrix": [5, 14], "x": 16.25, "y": 5.5},
- {"matrix": [5, 15], "x": 17.25, "y": 5.5}
- ]
- }
- }
-}
diff --git a/keyboards/xiaomi/mk02/keyboard.json b/keyboards/xiaomi/mk02/keyboard.json
@@ -0,0 +1,124 @@
+{
+ "keyboard_name": "MK02",
+ "manufacturer": "Xiaomi",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0B91",
+ "device_version": "0.0.1"
+ },
+ "processor": "STM32F072",
+ "bootloader": "custom",
+ "matrix_pins": {
+ "cols": ["B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C14", "C15", "B11", "A1", "A2", "B12"],
+ "rows": ["A3", "A4", "A5", "A6", "A7", "B0"]
+ },
+ "diode_direction": "ROW2COL",
+ "layouts": {
+ "LAYOUT_tkl_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"matrix": [4, 14], "x": 16.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+ {"matrix": [5, 15], "x": 17.25, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xiaomi/mk02/rules.mk b/keyboards/xiaomi/mk02/rules.mk
@@ -1,19 +1,6 @@
-# MCU name
-MCU = STM32F072
+# custom bootloader
BOARD = ST_STM32F072B_DISCOVERY
MCU_LDSCRIPT = STM32F072_0x2000_bootloader
-# Bootloader selection
-BOOTLOADER = custom
-
DFU_ARGS = -d 0483:df11 -a 0 -s 0x08002000:leave
DFU_SUFFIX_ARGS = -v 0483 -p DF11
-
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes # This is broken on 072 for some reason
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/info.json
@@ -1,30 +0,0 @@
-{
- "keyboard_name": "XD002",
- "manufacturer": "XIUDI",
- "url": "https://kprepublic.com/products/xd002-xiudi-2-custom-mechanical-keyboard-2-keys-underglow-and-switch-rgb-pcb-programmed-hot-swappable-macro-key-aluminum-case",
- "maintainer": "zvecr",
- "usb": {
- "vid": "0x7844",
- "pid": "0x0202",
- "device_version": "0.0.1"
- },
- "rgblight": {
- "led_count": 2
- },
- "ws2812": {
- "pin": "B2"
- },
- "matrix_pins": {
- "direct": [
- ["B0", "B1"]
- ]
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"x": 0, "y": 0, "matrix": [0, 0]},
- {"x": 1, "y": 0, "matrix": [0, 1]}
- ]
- }
- }
-}
diff --git a/keyboards/xiudi/xd002/keyboard.json b/keyboards/xiudi/xd002/keyboard.json
@@ -0,0 +1,40 @@
+{
+ "keyboard_name": "XD002",
+ "manufacturer": "XIUDI",
+ "url": "https://kprepublic.com/products/xd002-xiudi-2-custom-mechanical-keyboard-2-keys-underglow-and-switch-rgb-pcb-programmed-hot-swappable-macro-key-aluminum-case",
+ "maintainer": "zvecr",
+ "usb": {
+ "vid": "0x7844",
+ "pid": "0x0202",
+ "device_version": "0.0.1"
+ },
+ "processor": "attiny85",
+ "bootloader": "custom",
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "grave_esc": false,
+ "magic": false,
+ "space_cadet": false
+ },
+ "rgblight": {
+ "led_count": 2
+ },
+ "ws2812": {
+ "pin": "B2"
+ },
+ "matrix_pins": {
+ "direct": [
+ ["B0", "B1"]
+ ]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xiudi/xd002/rules.mk b/keyboards/xiudi/xd002/rules.mk
@@ -1,26 +1,3 @@
-# MCU name
-MCU = attiny85
-
-# Bootloader selection
-BOOTLOADER = custom
+# custom bootloader
OPT_DEFS += -DBOOTLOADER_SIZE=1862
PROGRAM_CMD = micronucleus --run $(BUILD_DIR)/$(TARGET).hex
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-# Save as much space as we can...
-LTO_ENABLE = yes
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
-SPACE_CADET_ENABLE = no
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
@@ -16,28 +16,6 @@
#pragma once
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json
@@ -1,230 +0,0 @@
-{
- "keyboard_name": "XD84",
- "manufacturer": "KPrepublic",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x7844",
- "pid": "0x8484",
- "device_version": "0.0.1"
- },
- "backlight": {
- "pin": "B5",
- "levels": 10,
- "on_state": 0
- },
- "indicators": {
- "caps_lock": "B6",
- "on_state": 0
- },
- "rgblight": {
- "led_count": 7,
- "animations": {
- "breathing": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "snake": true,
- "knight": true,
- "christmas": true,
- "static_gradient": true,
- "rgb_test": true,
- "alternating": true,
- "twinkle": true
- }
- },
- "ws2812": {
- "pin": "C7"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "community_layouts": ["75_ansi", "75_iso"],
- "layouts": {
- "LAYOUT_75_ansi": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [5, 6], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1},
- {"matrix": [1, 6], "x": 6, "y": 1},
- {"matrix": [1, 7], "x": 7, "y": 1},
- {"matrix": [1, 8], "x": 8, "y": 1},
- {"matrix": [1, 9], "x": 9, "y": 1},
- {"matrix": [1, 10], "x": 10, "y": 1},
- {"matrix": [1, 11], "x": 11, "y": 1},
- {"matrix": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 11], "x": 11.25, "y": 4},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5},
- {"matrix": [5, 11], "x": 11, "y": 5},
- {"matrix": [5, 8], "x": 12, "y": 5},
- {"matrix": [5, 12], "x": 13, "y": 5},
- {"matrix": [5, 13], "x": 14, "y": 5},
- {"matrix": [5, 14], "x": 15, "y": 5}
- ]
- },
- "LAYOUT_75_iso": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [5, 6], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1},
- {"matrix": [1, 6], "x": 6, "y": 1},
- {"matrix": [1, 7], "x": 7, "y": 1},
- {"matrix": [1, 8], "x": 8, "y": 1},
- {"matrix": [1, 9], "x": 9, "y": 1},
- {"matrix": [1, 10], "x": 10, "y": 1},
- {"matrix": [1, 11], "x": 11, "y": 1},
- {"matrix": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
- {"matrix": [1, 14], "x": 15, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 14], "x": 15, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 12], "x": 12.75, "y": 3},
- {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
- {"matrix": [3, 14], "x": 15, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 11], "x": 11.25, "y": 4},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5},
- {"matrix": [5, 11], "x": 11, "y": 5},
- {"matrix": [5, 8], "x": 12, "y": 5},
- {"matrix": [5, 12], "x": 13, "y": 5},
- {"matrix": [5, 13], "x": 14, "y": 5},
- {"matrix": [5, 14], "x": 15, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/xiudi/xd84/keyboard.json b/keyboards/xiudi/xd84/keyboard.json
@@ -0,0 +1,247 @@
+{
+ "keyboard_name": "XD84",
+ "manufacturer": "KPrepublic",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x7844",
+ "pid": "0x8484",
+ "device_version": "0.0.1"
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "backlight": {
+ "pin": "B5",
+ "levels": 10,
+ "on_state": 0
+ },
+ "indicators": {
+ "caps_lock": "B6",
+ "on_state": 0
+ },
+ "rgblight": {
+ "led_count": 7,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "knight": true,
+ "christmas": true,
+ "static_gradient": true,
+ "rgb_test": true,
+ "alternating": true,
+ "twinkle": true
+ }
+ },
+ "ws2812": {
+ "pin": "C7"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["75_ansi", "75_iso"],
+ "layouts": {
+ "LAYOUT_75_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5},
+ {"matrix": [5, 11], "x": 11, "y": 5},
+ {"matrix": [5, 8], "x": 12, "y": 5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5}
+ ]
+ },
+ "LAYOUT_75_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5},
+ {"matrix": [5, 11], "x": 11, "y": 5},
+ {"matrix": [5, 8], "x": 12, "y": 5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xiudi/xd84/rules.mk b/keyboards/xiudi/xd84/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
-
# custom matrix setup
CUSTOM_MATRIX = lite
diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h
@@ -16,28 +16,6 @@
#pragma once
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 18
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json
@@ -1,373 +0,0 @@
-{
- "keyboard_name": "XD96",
- "manufacturer": "KPrepublic",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x7844",
- "pid": "0x9696",
- "device_version": "0.0.1"
- },
- "backlight": {
- "pin": "B5",
- "levels": 10
- },
- "rgblight": {
- "led_count": 16,
- "max_brightness": 50,
- "animations": {
- "breathing": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "snake": true,
- "knight": true,
- "christmas": true,
- "static_gradient": true,
- "rgb_test": true,
- "alternating": true,
- "twinkle": true
- }
- },
- "indicators": {
- "caps_lock": "B6",
- "num_lock": "C6",
- "on_state": 0
- },
- "ws2812": {
- "pin": "C7"
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_96_ansi": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [5, 6], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "y": 0},
- {"matrix": [0, 15], "x": 16, "y": 0},
- {"matrix": [0, 16], "x": 17, "y": 0},
- {"matrix": [0, 17], "x": 18, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1},
- {"matrix": [1, 6], "x": 6, "y": 1},
- {"matrix": [1, 7], "x": 7, "y": 1},
- {"matrix": [1, 8], "x": 8, "y": 1},
- {"matrix": [1, 9], "x": 9, "y": 1},
- {"matrix": [1, 10], "x": 10, "y": 1},
- {"matrix": [1, 11], "x": 11, "y": 1},
- {"matrix": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
- {"matrix": [1, 14], "x": 15, "y": 1},
- {"matrix": [1, 15], "x": 16, "y": 1},
- {"matrix": [1, 16], "x": 17, "y": 1},
- {"matrix": [1, 17], "x": 18, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
- {"matrix": [2, 14], "x": 15, "y": 2},
- {"matrix": [2, 15], "x": 16, "y": 2},
- {"matrix": [2, 16], "x": 17, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
- {"matrix": [3, 14], "x": 15, "y": 3},
- {"matrix": [3, 15], "x": 16, "y": 3},
- {"matrix": [3, 16], "x": 17, "y": 3},
- {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 11], "x": 11.25, "y": 4},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4},
- {"matrix": [4, 15], "x": 16, "y": 4},
- {"matrix": [4, 16], "x": 17, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
- {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
- {"matrix": [5, 12], "x": 13, "y": 5},
- {"matrix": [5, 13], "x": 14, "y": 5},
- {"matrix": [5, 14], "x": 15, "y": 5},
- {"matrix": [5, 15], "x": 16, "y": 5},
- {"matrix": [5, 16], "x": 17, "y": 5},
- {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
- ]
- },
- "LAYOUT_96_iso": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [5, 6], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "y": 0},
- {"matrix": [0, 15], "x": 16, "y": 0},
- {"matrix": [0, 16], "x": 17, "y": 0},
- {"matrix": [0, 17], "x": 18, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1},
- {"matrix": [1, 6], "x": 6, "y": 1},
- {"matrix": [1, 7], "x": 7, "y": 1},
- {"matrix": [1, 8], "x": 8, "y": 1},
- {"matrix": [1, 9], "x": 9, "y": 1},
- {"matrix": [1, 10], "x": 10, "y": 1},
- {"matrix": [1, 11], "x": 11, "y": 1},
- {"matrix": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
- {"matrix": [1, 14], "x": 15, "y": 1},
- {"matrix": [1, 15], "x": 16, "y": 1},
- {"matrix": [1, 16], "x": 17, "y": 1},
- {"matrix": [1, 17], "x": 18, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 14], "x": 15, "y": 2},
- {"matrix": [2, 15], "x": 16, "y": 2},
- {"matrix": [2, 16], "x": 17, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 12], "x": 12.75, "y": 3},
- {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
- {"matrix": [3, 14], "x": 15, "y": 3},
- {"matrix": [3, 15], "x": 16, "y": 3},
- {"matrix": [3, 16], "x": 17, "y": 3},
- {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 11], "x": 11.25, "y": 4},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4},
- {"matrix": [4, 15], "x": 16, "y": 4},
- {"matrix": [4, 16], "x": 17, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
- {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
- {"matrix": [5, 12], "x": 13, "y": 5},
- {"matrix": [5, 13], "x": 14, "y": 5},
- {"matrix": [5, 14], "x": 15, "y": 5},
- {"matrix": [5, 15], "x": 16, "y": 5},
- {"matrix": [5, 16], "x": 17, "y": 5},
- {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
- ]
- },
- "LAYOUT_all": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [5, 6], "x": 14, "y": 0},
- {"matrix": [0, 14], "x": 15, "y": 0},
- {"matrix": [0, 15], "x": 16, "y": 0},
- {"matrix": [0, 16], "x": 17, "y": 0},
- {"matrix": [0, 17], "x": 18, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1},
- {"matrix": [1, 1], "x": 1, "y": 1},
- {"matrix": [1, 2], "x": 2, "y": 1},
- {"matrix": [1, 3], "x": 3, "y": 1},
- {"matrix": [1, 4], "x": 4, "y": 1},
- {"matrix": [1, 5], "x": 5, "y": 1},
- {"matrix": [1, 6], "x": 6, "y": 1},
- {"matrix": [1, 7], "x": 7, "y": 1},
- {"matrix": [1, 8], "x": 8, "y": 1},
- {"matrix": [1, 9], "x": 9, "y": 1},
- {"matrix": [1, 10], "x": 10, "y": 1},
- {"matrix": [1, 11], "x": 11, "y": 1},
- {"matrix": [1, 12], "x": 12, "y": 1},
- {"matrix": [1, 13], "x": 13, "y": 1},
- {"matrix": [5, 9], "x": 14, "y": 1},
- {"matrix": [1, 14], "x": 15, "y": 1},
- {"matrix": [1, 15], "x": 16, "y": 1},
- {"matrix": [1, 16], "x": 17, "y": 1},
- {"matrix": [1, 17], "x": 18, "y": 1},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
- {"matrix": [2, 1], "x": 1.5, "y": 2},
- {"matrix": [2, 2], "x": 2.5, "y": 2},
- {"matrix": [2, 3], "x": 3.5, "y": 2},
- {"matrix": [2, 4], "x": 4.5, "y": 2},
- {"matrix": [2, 5], "x": 5.5, "y": 2},
- {"matrix": [2, 6], "x": 6.5, "y": 2},
- {"matrix": [2, 7], "x": 7.5, "y": 2},
- {"matrix": [2, 8], "x": 8.5, "y": 2},
- {"matrix": [2, 9], "x": 9.5, "y": 2},
- {"matrix": [2, 10], "x": 10.5, "y": 2},
- {"matrix": [2, 11], "x": 11.5, "y": 2},
- {"matrix": [2, 12], "x": 12.5, "y": 2},
- {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
- {"matrix": [2, 14], "x": 15, "y": 2},
- {"matrix": [2, 15], "x": 16, "y": 2},
- {"matrix": [2, 16], "x": 17, "y": 2},
- {"matrix": [2, 17], "x": 18, "y": 2},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
- {"matrix": [3, 1], "x": 1.75, "y": 3},
- {"matrix": [3, 2], "x": 2.75, "y": 3},
- {"matrix": [3, 3], "x": 3.75, "y": 3},
- {"matrix": [3, 4], "x": 4.75, "y": 3},
- {"matrix": [3, 5], "x": 5.75, "y": 3},
- {"matrix": [3, 6], "x": 6.75, "y": 3},
- {"matrix": [3, 7], "x": 7.75, "y": 3},
- {"matrix": [3, 8], "x": 8.75, "y": 3},
- {"matrix": [3, 9], "x": 9.75, "y": 3},
- {"matrix": [3, 10], "x": 10.75, "y": 3},
- {"matrix": [3, 11], "x": 11.75, "y": 3},
- {"matrix": [3, 12], "x": 12.75, "y": 3},
- {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
- {"matrix": [3, 14], "x": 15, "y": 3},
- {"matrix": [3, 15], "x": 16, "y": 3},
- {"matrix": [3, 16], "x": 17, "y": 3},
- {"matrix": [3, 17], "x": 18, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4},
- {"matrix": [4, 2], "x": 2.25, "y": 4},
- {"matrix": [4, 3], "x": 3.25, "y": 4},
- {"matrix": [4, 4], "x": 4.25, "y": 4},
- {"matrix": [4, 5], "x": 5.25, "y": 4},
- {"matrix": [4, 6], "x": 6.25, "y": 4},
- {"matrix": [4, 7], "x": 7.25, "y": 4},
- {"matrix": [4, 8], "x": 8.25, "y": 4},
- {"matrix": [4, 9], "x": 9.25, "y": 4},
- {"matrix": [4, 10], "x": 10.25, "y": 4},
- {"matrix": [4, 11], "x": 11.25, "y": 4},
- {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
- {"matrix": [4, 13], "x": 14, "y": 4},
- {"matrix": [4, 14], "x": 15, "y": 4},
- {"matrix": [4, 15], "x": 16, "y": 4},
- {"matrix": [4, 16], "x": 17, "y": 4},
- {"matrix": [4, 17], "x": 18, "y": 4},
-
- {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
- {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
- {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
- {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
- {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
- {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
- {"matrix": [5, 12], "x": 13, "y": 5},
- {"matrix": [5, 13], "x": 14, "y": 5},
- {"matrix": [5, 14], "x": 15, "y": 5},
- {"matrix": [5, 15], "x": 16, "y": 5},
- {"matrix": [5, 16], "x": 17, "y": 5},
- {"matrix": [5, 17], "x": 18, "y": 5}
- ]
- }
- }
-}
diff --git a/keyboards/xiudi/xd96/keyboard.json b/keyboards/xiudi/xd96/keyboard.json
@@ -0,0 +1,390 @@
+{
+ "keyboard_name": "XD96",
+ "manufacturer": "KPrepublic",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x7844",
+ "pid": "0x9696",
+ "device_version": "0.0.1"
+ },
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "backlight": {
+ "pin": "B5",
+ "levels": 10
+ },
+ "rgblight": {
+ "led_count": 16,
+ "max_brightness": 50,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "knight": true,
+ "christmas": true,
+ "static_gradient": true,
+ "rgb_test": true,
+ "alternating": true,
+ "twinkle": true
+ }
+ },
+ "indicators": {
+ "caps_lock": "B6",
+ "num_lock": "C6",
+ "on_state": 0
+ },
+ "ws2812": {
+ "pin": "C7"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT_96_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [0, 15], "x": 16, "y": 0},
+ {"matrix": [0, 16], "x": 17, "y": 0},
+ {"matrix": [0, 17], "x": 18, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [1, 15], "x": 16, "y": 1},
+ {"matrix": [1, 16], "x": 17, "y": 1},
+ {"matrix": [1, 17], "x": 18, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [2, 15], "x": 16, "y": 2},
+ {"matrix": [2, 16], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [3, 15], "x": 16, "y": 3},
+ {"matrix": [3, 16], "x": 17, "y": 3},
+ {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+ {"matrix": [4, 15], "x": 16, "y": 4},
+ {"matrix": [4, 16], "x": 17, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5},
+ {"matrix": [5, 15], "x": 16, "y": 5},
+ {"matrix": [5, 16], "x": 17, "y": 5},
+ {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
+ ]
+ },
+ "LAYOUT_96_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [0, 15], "x": 16, "y": 0},
+ {"matrix": [0, 16], "x": 17, "y": 0},
+ {"matrix": [0, 17], "x": 18, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [1, 15], "x": 16, "y": 1},
+ {"matrix": [1, 16], "x": 17, "y": 1},
+ {"matrix": [1, 17], "x": 18, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [2, 15], "x": 16, "y": 2},
+ {"matrix": [2, 16], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [3, 15], "x": 16, "y": 3},
+ {"matrix": [3, 16], "x": 17, "y": 3},
+ {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+ {"matrix": [4, 15], "x": 16, "y": 4},
+ {"matrix": [4, 16], "x": 17, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5},
+ {"matrix": [5, 15], "x": 16, "y": 5},
+ {"matrix": [5, 16], "x": 17, "y": 5},
+ {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [0, 15], "x": 16, "y": 0},
+ {"matrix": [0, 16], "x": 17, "y": 0},
+ {"matrix": [0, 17], "x": 18, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1},
+ {"matrix": [5, 9], "x": 14, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [1, 15], "x": 16, "y": 1},
+ {"matrix": [1, 16], "x": 17, "y": 1},
+ {"matrix": [1, 17], "x": 18, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [2, 15], "x": 16, "y": 2},
+ {"matrix": [2, 16], "x": 17, "y": 2},
+ {"matrix": [2, 17], "x": 18, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [3, 15], "x": 16, "y": 3},
+ {"matrix": [3, 16], "x": 17, "y": 3},
+ {"matrix": [3, 17], "x": 18, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+ {"matrix": [4, 15], "x": 16, "y": 4},
+ {"matrix": [4, 16], "x": 17, "y": 4},
+ {"matrix": [4, 17], "x": 18, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5},
+ {"matrix": [5, 15], "x": 16, "y": 5},
+ {"matrix": [5, 16], "x": 17, "y": 5},
+ {"matrix": [5, 17], "x": 18, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/xiudi/xd96/rules.mk b/keyboards/xiudi/xd96/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
-
# custom matrix setup
CUSTOM_MATRIX = lite
diff --git a/keyboards/xw60/config.h b/keyboards/xw60/config.h
@@ -1,9 +1,5 @@
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-
#define SOLENOID_PIN F6
#define SOLENOID_ACTIVE true
#define SOLENOID_DEFAULT_DWELL 75
diff --git a/keyboards/xw60/info.json b/keyboards/xw60/info.json
@@ -1,166 +0,0 @@
-{
- "keyboard_name": "XW60",
- "manufacturer": "Drclick",
- "url": "",
- "maintainer": "qmk",
- "usb": {
- "vid": "0xFEED",
- "pid": "0x6060",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
- "rows": ["D0", "D1", "D2", "D3", "D5"]
- },
- "diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [4, 9], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
- {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"matrix": [3, 1], "x": 1.25, "y": 3},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2},
- {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
- {"matrix": [4, 6], "x": 8, "y": 4, "w": 2},
- {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
- {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
- {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
- ]
- },
- "LAYOUT_pingjunior": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [4, 9], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"matrix": [1, 1], "x": 1.5, "y": 1},
- {"matrix": [1, 2], "x": 2.5, "y": 1},
- {"matrix": [1, 3], "x": 3.5, "y": 1},
- {"matrix": [1, 4], "x": 4.5, "y": 1},
- {"matrix": [1, 5], "x": 5.5, "y": 1},
- {"matrix": [1, 6], "x": 6.5, "y": 1},
- {"matrix": [1, 7], "x": 7.5, "y": 1},
- {"matrix": [1, 8], "x": 8.5, "y": 1},
- {"matrix": [1, 9], "x": 9.5, "y": 1},
- {"matrix": [1, 10], "x": 10.5, "y": 1},
- {"matrix": [1, 11], "x": 11.5, "y": 1},
- {"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 1], "x": 1.75, "y": 2},
- {"matrix": [2, 2], "x": 2.75, "y": 2},
- {"matrix": [2, 3], "x": 3.75, "y": 2},
- {"matrix": [2, 4], "x": 4.75, "y": 2},
- {"matrix": [2, 5], "x": 5.75, "y": 2},
- {"matrix": [2, 6], "x": 6.75, "y": 2},
- {"matrix": [2, 7], "x": 7.75, "y": 2},
- {"matrix": [2, 8], "x": 8.75, "y": 2},
- {"matrix": [2, 9], "x": 9.75, "y": 2},
- {"matrix": [2, 10], "x": 10.75, "y": 2},
- {"matrix": [2, 11], "x": 11.75, "y": 2},
- {"matrix": [2, 12], "x": 12.75, "y": 2},
- {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
- {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
- {"matrix": [3, 2], "x": 2.25, "y": 3},
- {"matrix": [3, 3], "x": 3.25, "y": 3},
- {"matrix": [3, 4], "x": 4.25, "y": 3},
- {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 6], "x": 6.25, "y": 3},
- {"matrix": [3, 7], "x": 7.25, "y": 3},
- {"matrix": [3, 8], "x": 8.25, "y": 3},
- {"matrix": [3, 9], "x": 9.25, "y": 3},
- {"matrix": [3, 10], "x": 10.25, "y": 3},
- {"matrix": [3, 11], "x": 11.25, "y": 3},
- {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
- {"matrix": [3, 12], "x": 14, "y": 3},
-
- {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
- {"matrix": [4, 1], "x": 1.5, "y": 4},
- {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
- {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
- {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
- {"matrix": [4, 12], "x": 12.5, "y": 4},
- {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
- ]
- }
- }
- }
diff --git a/keyboards/xw60/keyboard.json b/keyboards/xw60/keyboard.json
@@ -0,0 +1,178 @@
+{
+ "keyboard_name": "XW60",
+ "manufacturer": "Drclick",
+ "url": "",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x6060",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": false,
+ "haptic": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 2},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_pingjunior": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ }
+ }
+ }
diff --git a/keyboards/xw60/rules.mk b/keyboards/xw60/rules.mk
@@ -1,14 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-HAPTIC_ENABLE = yes
HAPTIC_DRIVER = solenoid
