aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <[email protected]>2024-04-03 01:37:11 +1100
committerGitHub <[email protected]>2024-04-02 15:37:11 +0100
commit05731202a2e26682b3601ae0812e18b4e2c9d694 (patch)
tree9214ff86bb6207ac10baf7708fd7de70229405b7
parent1bea8b9d31fff260c55d515dd221f5572d85b8ff (diff)
downloadqmk_firmware-05731202a2e26682b3601ae0812e18b4e2c9d694.tar.gz
qmk_firmware-05731202a2e26682b3601ae0812e18b4e2c9d694.zip
0xcb/splaytoraid: remove `CONVERT_TO` at keyboard level (#23395)
-rw-r--r--keyboards/0xcb/splaytoraid/32u4/keyboard.json27
-rw-r--r--keyboards/0xcb/splaytoraid/32u4/rules.mk0
-rw-r--r--keyboards/0xcb/splaytoraid/info.json27
-rw-r--r--keyboards/0xcb/splaytoraid/rp2040_ce/keyboard.json (renamed from keyboards/0xcb/splaytoraid/rp2040_ce/info.json)38
-rw-r--r--keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk1
5 files changed, 57 insertions, 36 deletions
diff --git a/keyboards/0xcb/splaytoraid/32u4/keyboard.json b/keyboards/0xcb/splaytoraid/32u4/keyboard.json
new file mode 100644
index 0000000000..7c3f0590a6
--- /dev/null
+++ b/keyboards/0xcb/splaytoraid/32u4/keyboard.json
@@ -0,0 +1,27 @@
+{
+ "development_board": "promicro",
+ "bootloader": "qmk-dfu",
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "F4", "B3", "B1", "B2"],
+ "rows": ["D3", "D2", "D1", "D4", "D7", "E6", "B4", "C6"]
+ },
+ "diode_direction": "COL2ROW",
+ "rgb_matrix": {
+ "animations": {
+ "band_sat": true,
+ "band_spiral_val": true,
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "raindrops": true
+ }
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B5", "pin_b": "B6"}
+ ]
+ },
+ "ws2812": {
+ "pin": "D0"
+ }
+}
diff --git a/keyboards/0xcb/splaytoraid/32u4/rules.mk b/keyboards/0xcb/splaytoraid/32u4/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/0xcb/splaytoraid/32u4/rules.mk
+++ /dev/null
diff --git a/keyboards/0xcb/splaytoraid/info.json b/keyboards/0xcb/splaytoraid/info.json
index 1d47f7d77c..8c32b0dc11 100644
--- a/keyboards/0xcb/splaytoraid/info.json
+++ b/keyboards/0xcb/splaytoraid/info.json
@@ -3,13 +3,6 @@
"keyboard_name": "splaytoraid",
"maintainer": "freya-irl",
"url": "https://github.com/freya-irl/splaytoraid40",
- "development_board": "promicro",
- "bootloader": "qmk-dfu",
- "diode_direction": "COL2ROW",
- "matrix_pins": {
- "cols": ["F5", "F6", "F7", "F4", "B3", "B1", "B2"],
- "rows": ["D3", "D2", "D1", "D4", "D7", "E6", "B4", "C6"]
- },
"usb": {
"device_version": "1.0.0",
"pid": "0xCB00",
@@ -21,7 +14,8 @@
"bootmagic": true,
"console": true,
"mousekey": true,
- "nkro": true
+ "nkro": true,
+ "encoder": true
},
"bootmagic": {
"matrix": [1, 0]
@@ -29,21 +23,7 @@
"build": {
"lto": true
},
- "encoder": {
- "enabled": true,
- "rotary": [
- {"pin_a": "B5", "pin_b": "B6", "resolution": 4}
- ]
- },
"rgb_matrix": {
- "animations": {
- "breathing": true,
- "band_sat": true,
- "band_spiral_val": true,
- "cycle_all": true,
- "raindrops": true,
- "cycle_left_right": true
- },
"default": {
"animation": "breathing",
"hue": 152,
@@ -73,9 +53,6 @@
],
"max_brightness": 200
},
- "ws2812": {
- "pin": "D0"
- },
"layouts": {
"LAYOUT_36": {
"layout": [
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json b/keyboards/0xcb/splaytoraid/rp2040_ce/keyboard.json
index 49256b6482..b5a4f95c69 100644
--- a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json
+++ b/keyboards/0xcb/splaytoraid/rp2040_ce/keyboard.json
@@ -1,26 +1,44 @@
{
+ "development_board": "promicro_rp2040",
+ "matrix_pins": {
+ "cols": ["GP28", "GP27", "GP26", "GP29", "GP20", "GP22", "GP23"],
+ "rows": ["GP0", "GP1", "GP2", "GP4", "GP6", "GP7", "GP8", "GP5"]
+ },
+ "diode_direction": "COL2ROW",
"rgb_matrix": {
"animations": {
- "cycle_up_down": true,
- "jellybean_raindrops": true,
+ "band_sat": true,
+ "band_spiral_val": true,
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
"cycle_out_in": true,
"cycle_out_in_dual": true,
- "pixel_fractal": true,
- "rainbow_moving_chevron": true,
"cycle_pinwheel": true,
- "pixel_rain": true,
+ "cycle_up_down": true,
+ "digital_rain": true,
"dual_beacon": true,
"hue_breathing": true,
- "typing_heatmap": true,
- "digital_rain": true,
- "solid_reactive_simple": true,
+ "jellybean_raindrops": true,
+ "multisplash": true,
+ "pixel_fractal": true,
+ "pixel_rain": true,
+ "rainbow_moving_chevron": true,
+ "raindrops": true,
"solid_reactive": true,
+ "solid_reactive_simple": true,
+ "solid_splash": true,
"splash": true,
- "multisplash": true,
- "solid_splash": true
+ "typing_heatmap": true
}
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "GP9", "pin_b": "GP21"}
+ ]
+ },
"ws2812": {
+ "pin": "GP3",
"driver": "vendor"
}
}
diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk b/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk
deleted file mode 100644
index 9617c1460e..0000000000
--- a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONVERT_TO = rp2040_ce