aboutsummaryrefslogtreecommitdiff
path: root/keyboards/0xcb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/0xcb')
-rw-r--r--keyboards/0xcb/1337/config.h4
-rw-r--r--keyboards/0xcb/1337/keyboard.json (renamed from keyboards/0xcb/1337/info.json)21
-rw-r--r--keyboards/0xcb/1337/rules.mk16
-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
-rw-r--r--keyboards/0xcb/static/config.h5
-rw-r--r--keyboards/0xcb/static/keyboard.json (renamed from keyboards/0xcb/static/info.json)17
-rw-r--r--keyboards/0xcb/static/rules.mk16
-rw-r--r--keyboards/0xcb/tutelpad/keyboard.json (renamed from keyboards/0xcb/tutelpad/info.json)10
-rw-r--r--keyboards/0xcb/tutelpad/rules.mk13
13 files changed, 105 insertions, 90 deletions
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index 5791b324b6..5fec622271 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* default setup after eeprom reset */
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2
-/* 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
/* Oled Size */
#define OLED_DISPLAY_128X64
#define OLED_FONT_END 255
diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/keyboard.json
index d492f8e3be..f264d4ed06 100644
--- a/keyboards/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/keyboard.json
@@ -19,6 +19,10 @@
]
},
"qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ },
"tap_keycode_delay": 10
},
"qmk_lufa_bootloader": {
@@ -52,6 +56,21 @@
},
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "oled": true,
+ "rgblight": true
+ },
"matrix_pins": {
"direct": [
["D2", "D4", "F4"],
@@ -65,9 +84,11 @@
{"x": 0, "y": 0, "matrix": [0, 0]},
{"x": 1, "y": 0, "matrix": [0, 1]},
{"x": 2, "y": 0, "matrix": [0, 2]},
+
{"x": 0, "y": 1, "matrix": [1, 0]},
{"x": 1, "y": 1, "matrix": [1, 1]},
{"x": 2, "y": 1, "matrix": [1, 2]},
+
{"x": 0, "y": 2, "matrix": [2, 0]},
{"x": 1, "y": 2, "matrix": [2, 1]},
{"x": 2, "y": 2, "matrix": [2, 2]}
diff --git a/keyboards/0xcb/1337/rules.mk b/keyboards/0xcb/1337/rules.mk
deleted file mode 100644
index 60cbfd4df6..0000000000
--- a/keyboards/0xcb/1337/rules.mk
+++ /dev/null
@@ -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 = 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
-
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-OLED_ENABLE = yes
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
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h
index 179c84088b..60d9ff232a 100644
--- a/keyboards/0xcb/static/config.h
+++ b/keyboards/0xcb/static/config.h
@@ -16,11 +16,6 @@ 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
-
/* oled custom font */
#define OLED_FONT_END 255
#define OLED_FONT_H "gfxfont.c"
diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/keyboard.json
index 97f5e53cad..73a6a802cc 100644
--- a/keyboards/0xcb/static/info.json
+++ b/keyboards/0xcb/static/keyboard.json
@@ -8,6 +8,19 @@
"pid": "0xA455",
"device_version": "0.0.1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "oled": true
+ },
"matrix_pins": {
"cols": ["B5", "D4", "C0", "C1", "C2", "C3"],
"rows": ["D5", "D6", "D7", "B0", "B1", "B2", "B3", "B4"]
@@ -19,6 +32,10 @@
]
},
"qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ },
"tap_keycode_delay": 10
},
"processor": "atmega328p",
diff --git a/keyboards/0xcb/static/rules.mk b/keyboards/0xcb/static/rules.mk
deleted file mode 100644
index fe8dabeab7..0000000000
--- a/keyboards/0xcb/static/rules.mk
+++ /dev/null
@@ -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 = 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
-
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-OLED_ENABLE = yes
diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/keyboard.json
index e4c7fce98a..2885377262 100644
--- a/keyboards/0xcb/tutelpad/info.json
+++ b/keyboards/0xcb/tutelpad/keyboard.json
@@ -33,6 +33,16 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "oled": true,
+ "rgblight": true
+ },
"matrix_pins": {
"direct": [
["E6", "D7", "B1", "B3"],
diff --git a/keyboards/0xcb/tutelpad/rules.mk b/keyboards/0xcb/tutelpad/rules.mk
deleted file mode 100644
index f06d31c5f1..0000000000
--- a/keyboards/0xcb/tutelpad/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-OLED_ENABLE = yes