diff options
Diffstat (limited to 'keyboards/0xcb')
-rw-r--r-- | keyboards/0xcb/1337/config.h | 3 | ||||
-rw-r--r-- | keyboards/0xcb/1337/info.json | 3 | ||||
-rw-r--r-- | keyboards/0xcb/splaytoraid/config.h | 2 | ||||
-rw-r--r-- | keyboards/0xcb/splaytoraid/info.json | 3 | ||||
-rw-r--r-- | keyboards/0xcb/splaytoraid/keymaps/pi/config.h | 3 | ||||
-rw-r--r-- | keyboards/0xcb/splaytoraid/rp2040_ce/info.json | 5 | ||||
-rw-r--r-- | keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/0xcb/static/config.h | 19 | ||||
-rw-r--r-- | keyboards/0xcb/static/info.json | 5 | ||||
-rw-r--r-- | keyboards/0xcb/static/static.c | 17 | ||||
-rw-r--r-- | keyboards/0xcb/tutelpad/config.h | 1 | ||||
-rw-r--r-- | keyboards/0xcb/tutelpad/info.json | 3 |
12 files changed, 19 insertions, 46 deletions
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h index a247d1b367..9eaded2188 100644 --- a/keyboards/0xcb/1337/config.h +++ b/keyboards/0xcb/1337/config.h @@ -20,8 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAP_CODE_DELAY 10 -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -44,7 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_DEFAULT_SAT 232 #define RGBLIGHT_DEFAULT_VAR 255 #define RGBLIGHT_DEFAULT_SPD 2 -#endif // clang-format on /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json index d34d7166bf..ac7db0ec13 100644 --- a/keyboards/0xcb/1337/info.json +++ b/keyboards/0xcb/1337/info.json @@ -21,6 +21,9 @@ "qmk_lufa_bootloader": { "led": "B0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "matrix_pins": { diff --git a/keyboards/0xcb/splaytoraid/config.h b/keyboards/0xcb/splaytoraid/config.h index 01eb276069..2f2eb82fee 100644 --- a/keyboards/0xcb/splaytoraid/config.h +++ b/keyboards/0xcb/splaytoraid/config.h @@ -3,8 +3,6 @@ #pragma once -#define RGB_DI_PIN D0 - #define RGB_MATRIX_LED_COUNT 18 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_BREATHING diff --git a/keyboards/0xcb/splaytoraid/info.json b/keyboards/0xcb/splaytoraid/info.json index 7b8177df9f..f6a8061e1e 100644 --- a/keyboards/0xcb/splaytoraid/info.json +++ b/keyboards/0xcb/splaytoraid/info.json @@ -62,6 +62,9 @@ { "flags": 4, "matrix": [0, 3], "x": 163, "y": 64 } ] }, + "ws2812": { + "pin": "D0" + }, "layouts": { "LAYOUT_36": { "layout": [ diff --git a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h index d955f36ab3..52e39aef65 100644 --- a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h +++ b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h @@ -5,9 +5,6 @@ #define TAPPING_TERM 180 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT - #undef LOCKING_SUPPORT_ENABLE #undef LOCKING_RESYNC_ENABLE diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json b/keyboards/0xcb/splaytoraid/rp2040_ce/info.json new file mode 100644 index 0000000000..9f0eb51118 --- /dev/null +++ b/keyboards/0xcb/splaytoraid/rp2040_ce/info.json @@ -0,0 +1,5 @@ +{ + "ws2812": { + "driver": "vendor" + } +} diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk b/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk index 4b30a1bae0..9617c1460e 100644 --- a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk +++ b/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk @@ -1,2 +1 @@ -WS2812_DRIVER = vendor CONVERT_TO = rp2040_ce diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h index f77002e8ab..10b1f88216 100644 --- a/keyboards/0xcb/static/config.h +++ b/keyboards/0xcb/static/config.h @@ -16,26 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -// clang-format off - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D5, D6, D7, B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { B5, D4, C0, C1, C2, C3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define TAP_CODE_DELAY 10 -// clang-format on /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json index a18bd7b313..6f3b2d06f0 100644 --- a/keyboards/0xcb/static/info.json +++ b/keyboards/0xcb/static/info.json @@ -8,6 +8,11 @@ "pid": "0xA455", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "D4", "C0", "C1", "C2", "C3"], + "rows": ["D5", "D6", "D7", "B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"} diff --git a/keyboards/0xcb/static/static.c b/keyboards/0xcb/static/static.c deleted file mode 100644 index c6f5601f29..0000000000 --- a/keyboards/0xcb/static/static.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 0xCB - Conor Burns - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#include "static.h" diff --git a/keyboards/0xcb/tutelpad/config.h b/keyboards/0xcb/tutelpad/config.h index cdb29e6bd1..b211d6f5f2 100644 --- a/keyboards/0xcb/tutelpad/config.h +++ b/keyboards/0xcb/tutelpad/config.h @@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define RGB_DI_PIN D3 // LED data pin on controller #define RGBLED_NUM 4 // Number of LEDs connected #define RGBLIGHT_HUE_STEP 10 // The number of steps to cycle through the hue by diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json index 646b4dc882..79fdf0af45 100644 --- a/keyboards/0xcb/tutelpad/info.json +++ b/keyboards/0xcb/tutelpad/info.json @@ -11,6 +11,9 @@ "bootmagic": { "matrix": [1, 0] }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { |