aboutsummaryrefslogtreecommitdiff
path: root/keyboards/basekeys
diff options
context:
space:
mode:
authorJames Young <[email protected]>2024-04-11 14:21:32 -0700
committerGitHub <[email protected]>2024-04-11 14:21:32 -0700
commitcb81913d18fd567cb2dbadcd9a5c5c767f75ba60 (patch)
tree35e62d69a2b1e79d41bff00d074057da46b60d10 /keyboards/basekeys
parenta532d1cc5a785da3d73812330aad95555efb81fa (diff)
downloadqmk_firmware-cb81913d18fd567cb2dbadcd9a5c5c767f75ba60.tar.gz
qmk_firmware-cb81913d18fd567cb2dbadcd9a5c5c767f75ba60.zip
Data-Driven Keyboard Conversions: B (#23425)
Converts configuration definitions and rules to data-driven where applicable. Renames `info.json` to `keyboard.json` in instances where `rules.mk` can be safely deleted. Affects: - `bacca70` - `baguette` - `baion_808` - `bajjak` - `bandominedoni` - `bantam44` - `barleycorn_smd` - `barracuda` - `basekeys/slice/rev1` - `basekeys/slice/rev1_rgb` - `basekeys/trifecta` - `basketweave` - `bastardkb/dilemma/4x6_4` - `bbrfkr/dynamis` - `bear_face` - `beatervan` - `bemeier/bmek` - `biacco42/ergo42` - `biacco42/meishi` - `biacco42/meishi2` - `binepad/bn003` - `binepad/bn009/r1` - `binepad/bnr1` - `bioi/g60` - `bioi/g60ble` - `bioi/morgan65` - `bioi/s65` - `blackplum` - `blank/blank01` - `blank_tehnologii/manibus` - `blockey` - `bluebell/swoop` - `boardrun/bizarre` - `boardrun/classic` - `boardsource/equals/48` - `boardsource/equals/60` - `boardwalk` - `bop` - `boston` - `boston_meetup/2019` - `box75` - `bpiphany/four_banger` - `bpiphany/frosty_flake` - `bpiphany/ghost_squid` - `bpiphany/hid_liber` - `bpiphany/kitten_paw` - `bpiphany/tiger_lily` - `bpiphany/unloved_bastard` - `bt66tech/bt66tech60` - `bubble75/hotswap` - `budgy` - `buildakb/potato65` - `buildakb/potato65hs` - `buildakb/potato65s` - `buzzard`
Diffstat (limited to 'keyboards/basekeys')
-rw-r--r--keyboards/basekeys/slice/rev1/config.h5
-rw-r--r--keyboards/basekeys/slice/rev1/keyboard.json (renamed from keyboards/basekeys/slice/rev1/info.json)12
-rw-r--r--keyboards/basekeys/slice/rev1/rules.mk12
-rw-r--r--keyboards/basekeys/slice/rev1_rgb/config.h5
-rw-r--r--keyboards/basekeys/slice/rev1_rgb/keyboard.json (renamed from keyboards/basekeys/slice/rev1_rgb/info.json)17
-rw-r--r--keyboards/basekeys/slice/rev1_rgb/rules.mk16
-rw-r--r--keyboards/basekeys/trifecta/config.h23
-rw-r--r--keyboards/basekeys/trifecta/keyboard.json91
-rw-r--r--keyboards/basekeys/trifecta/trifecta.c61
9 files changed, 119 insertions, 123 deletions
diff --git a/keyboards/basekeys/slice/rev1/config.h b/keyboards/basekeys/slice/rev1/config.h
index c1008da9b8..aecd34737d 100644
--- a/keyboards/basekeys/slice/rev1/config.h
+++ b/keyboards/basekeys/slice/rev1/config.h
@@ -21,8 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define EE_HANDS
#define MASTER_LEFT
//#define MASTER_RIGHT
-
-/* 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/basekeys/slice/rev1/info.json b/keyboards/basekeys/slice/rev1/keyboard.json
index 6b97d0c9ec..c341597ee6 100644
--- a/keyboards/basekeys/slice/rev1/info.json
+++ b/keyboards/basekeys/slice/rev1/keyboard.json
@@ -8,12 +8,24 @@
"pid": "0xEC17",
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"processor": "atmega32u4",
diff --git a/keyboards/basekeys/slice/rev1/rules.mk b/keyboards/basekeys/slice/rev1/rules.mk
deleted file mode 100644
index 992af66fa2..0000000000
--- a/keyboards/basekeys/slice/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# this is split keyboard.
-SPLIT_KEYBOARD = yes
-
-# 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
diff --git a/keyboards/basekeys/slice/rev1_rgb/config.h b/keyboards/basekeys/slice/rev1_rgb/config.h
index 8a0c1946c1..2594d39f2a 100644
--- a/keyboards/basekeys/slice/rev1_rgb/config.h
+++ b/keyboards/basekeys/slice/rev1_rgb/config.h
@@ -21,9 +21,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MASTER_LEFT
//#define MASTER_RIGHT
-/* 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 OLED_FONT_H "keyboards/basekeys/slice/slice_font.c"
diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/keyboard.json
index faec5a9953..a666f26661 100644
--- a/keyboards/basekeys/slice/rev1_rgb/info.json
+++ b/keyboards/basekeys/slice/rev1_rgb/keyboard.json
@@ -8,12 +8,29 @@
"pid": "0xEC15",
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "rgblight": true,
+ "oled": true
+ },
+ "build": {
+ "lto": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D2"
},
"ws2812": {
diff --git a/keyboards/basekeys/slice/rev1_rgb/rules.mk b/keyboards/basekeys/slice/rev1_rgb/rules.mk
deleted file mode 100644
index 1e24ec177f..0000000000
--- a/keyboards/basekeys/slice/rev1_rgb/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# this is split keyboard.
-SPLIT_KEYBOARD = yes
-
-# 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
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-OLED_ENABLE = yes
-
-LTO_ENABLE = yes
diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
deleted file mode 100644
index 584a6e4bfc..0000000000
--- a/keyboards/basekeys/trifecta/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Swiftrax and Basekeys.com
- *
- * 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/basekeys/trifecta/keyboard.json b/keyboards/basekeys/trifecta/keyboard.json
index 8777b1ffa9..8660156f64 100644
--- a/keyboards/basekeys/trifecta/keyboard.json
+++ b/keyboards/basekeys/trifecta/keyboard.json
@@ -18,6 +18,12 @@
"nkro": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "D1", "B2", "D0", "B3"],
"rows": ["B0", "B7", "F7", "B1", "B6", "C6", "C7", "B5", "F6", "D2"]
@@ -54,6 +60,7 @@
}
},
"rgb_matrix": {
+ "driver": "ws2812",
"sat_steps": 8,
"val_steps": 8,
"speed_steps": 10,
@@ -102,7 +109,89 @@
"multisplash": true,
"solid_splash": true,
"solid_multisplash": true
- }
+ },
+ "layout": [
+ {"x": 218, "y": 7, "flags": 2},
+ {"x": 214, "y": 45, "flags": 2},
+ {"x": 180, "y": 47, "flags": 2},
+ {"x": 147, "y": 50, "flags": 2},
+ {"x": 94, "y": 62, "flags": 2},
+ {"x": 37, "y": 51, "flags": 2},
+ {"x": 4, "y": 8, "flags": 2},
+ {"x": 36, "y": 15, "flags": 2},
+ {"x": 62, "y": 18, "flags": 2},
+ {"x": 78, "y": 5, "flags": 2},
+ {"x": 119, "y": 7, "flags": 2},
+ {"x": 145, "y": 16, "flags": 2},
+ {"x": 166, "y": 3, "flags": 2},
+ {"x": 200, "y": 16, "flags": 2},
+ {"matrix": [0, 7], "x": 185, "y": 11, "flags": 4},
+ {"matrix": [2, 7], "x": 191, "y": 22, "flags": 4},
+ {"matrix": [4, 7], "x": 188, "y": 33, "flags": 4},
+ {"matrix": [6, 7], "x": 200, "y": 46, "flags": 4},
+ {"matrix": [8, 7], "x": 200, "y": 57, "flags": 4},
+ {"matrix": [9, 7], "x": 212, "y": 57, "flags": 4},
+ {"matrix": [9, 6], "x": 188, "y": 57, "flags": 4},
+ {"matrix": [7, 6], "x": 181, "y": 44, "flags": 4},
+ {"matrix": [3, 6], "x": 176, "y": 22, "flags": 4},
+ {"matrix": [1, 6], "x": 168, "y": 11, "flags": 4},
+ {"matrix": [0, 6], "x": 155, "y": 11, "flags": 4},
+ {"matrix": [2, 6], "x": 164, "y": 22, "flags": 4},
+ {"matrix": [5, 6], "x": 169, "y": 32, "flags": 4},
+ {"matrix": [6, 6], "x": 165, "y": 44, "flags": 4},
+ {"matrix": [8, 6], "x": 172, "y": 55, "flags": 4},
+ {"matrix": [9, 5], "x": 157, "y": 54, "flags": 4},
+ {"matrix": [7, 5], "x": 153, "y": 44, "flags": 4},
+ {"matrix": [4, 5], "x": 156, "y": 33, "flags": 4},
+ {"matrix": [3, 5], "x": 153, "y": 22, "flags": 4},
+ {"matrix": [1, 5], "x": 142, "y": 12, "flags": 4},
+ {"matrix": [0, 5], "x": 130, "y": 13, "flags": 4},
+ {"matrix": [2, 5], "x": 138, "y": 23, "flags": 4},
+ {"matrix": [5, 5], "x": 143, "y": 33, "flags": 4},
+ {"matrix": [6, 5], "x": 140, "y": 45, "flags": 4},
+ {"matrix": [8, 5], "x": 137, "y": 56, "flags": 4},
+ {"matrix": [7, 4], "x": 128, "y": 47, "flags": 4},
+ {"matrix": [4, 4], "x": 132, "y": 35, "flags": 4},
+ {"matrix": [3, 4], "x": 127, "y": 25, "flags": 4},
+ {"matrix": [1, 4], "x": 119, "y": 16, "flags": 4},
+ {"matrix": [0, 4], "x": 107, "y": 17, "flags": 4},
+ {"matrix": [2, 4], "x": 115, "y": 27, "flags": 4},
+ {"matrix": [5, 4], "x": 120, "y": 37, "flags": 4},
+ {"matrix": [6, 4], "x": 116, "y": 48, "flags": 4},
+ {"matrix": [9, 4], "x": 117, "y": 59, "flags": 4},
+ {"matrix": [7, 3], "x": 104, "y": 51, "flags": 4},
+ {"matrix": [4, 3], "x": 109, "y": 39, "flags": 4},
+ {"matrix": [3, 3], "x": 104, "y": 29, "flags": 4},
+ {"matrix": [1, 3], "x": 86, "y": 19, "flags": 4},
+ {"matrix": [0, 3], "x": 74, "y": 16, "flags": 4},
+ {"matrix": [2, 3], "x": 78, "y": 28, "flags": 4},
+ {"matrix": [5, 3], "x": 79, "y": 39, "flags": 4},
+ {"matrix": [6, 3], "x": 82, "y": 50, "flags": 4},
+ {"matrix": [8, 2], "x": 73, "y": 60, "flags": 4},
+ {"matrix": [7, 2], "x": 71, "y": 48, "flags": 4},
+ {"matrix": [4, 2], "x": 67, "y": 37, "flags": 4},
+ {"matrix": [3, 2], "x": 66, "y": 26, "flags": 4},
+ {"matrix": [1, 2], "x": 63, "y": 15, "flags": 4},
+ {"matrix": [0, 2], "x": 50, "y": 12, "flags": 4},
+ {"matrix": [2, 2], "x": 55, "y": 24, "flags": 4},
+ {"matrix": [5, 2], "x": 55, "y": 35, "flags": 4},
+ {"matrix": [6, 2], "x": 59, "y": 47, "flags": 4},
+ {"matrix": [9, 1], "x": 50, "y": 56, "flags": 4},
+ {"matrix": [7, 1], "x": 47, "y": 45, "flags": 4},
+ {"matrix": [4, 1], "x": 43, "y": 33, "flags": 4},
+ {"matrix": [3, 1], "x": 43, "y": 22, "flags": 4},
+ {"matrix": [1, 1], "x": 39, "y": 10, "flags": 4},
+ {"matrix": [0, 1], "x": 25, "y": 11, "flags": 4},
+ {"matrix": [2, 1], "x": 29, "y": 22, "flags": 4},
+ {"matrix": [5, 1], "x": 30, "y": 33, "flags": 4},
+ {"matrix": [6, 1], "x": 34, "y": 44, "flags": 4},
+ {"matrix": [8, 1], "x": 24, "y": 54, "flags": 4},
+ {"matrix": [9, 0], "x": 9, "y": 55, "flags": 4},
+ {"matrix": [7, 0], "x": 15, "y": 44, "flags": 4},
+ {"matrix": [4, 0], "x": 14, "y": 33, "flags": 4},
+ {"matrix": [3, 0], "x": 14, "y": 22, "flags": 4},
+ {"matrix": [1, 0], "x": 14, "y": 11, "flags": 4}
+ ]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
diff --git a/keyboards/basekeys/trifecta/trifecta.c b/keyboards/basekeys/trifecta/trifecta.c
deleted file mode 100644
index 926180d996..0000000000
--- a/keyboards/basekeys/trifecta/trifecta.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2020 Swiftrax and Basekeys.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-
-led_config_t g_led_config = { {
- { NO_LED, 70, 61, 52, 43, 34, 24, 14 },
- { 79, 69, 60, 51, 42, 33, 23, NO_LED },
- { NO_LED, 71, 62, 53, 44, 35, 25, 15 },
- { 78, 68, 59, 50, 41, 32, 22, NO_LED },
- { 77, 67, 58, 49, 40, 31, NO_LED, 16 },
- { NO_LED, 72, 63, 54, 45, 36, 26, NO_LED },
- { NO_LED, 73, 64, 55, 46, 37, 27, 17 },
- { 76, 66, 57, 48, 39, 30, 21, NO_LED },
- { NO_LED, 74, 56, NO_LED, NO_LED, 38, 28, 18 },
- { 75, 65, NO_LED, NO_LED, 47, 29, 20, 19 }
-}, {
- // Underglow
- { 218, 7 }, { 214, 45 }, { 180, 47 }, { 147, 50 }, { 94, 62 }, { 37, 51 }, { 4, 8 }, { 36, 15 },
- { 62, 18 }, { 78, 5 }, { 119, 7 }, { 145, 16 }, { 166, 3 }, { 200, 16 },
-
- //Per Key
- { 185, 11 }, { 191, 22 }, { 188, 33 }, { 200, 46 }, { 200, 57 }, { 212, 57 }, { 188, 57 }, { 181, 44 },
- { 176, 22 }, { 168, 11 }, { 155, 11 }, { 164, 22 }, { 169, 32 }, { 165, 44 }, { 172, 55 }, { 157, 54 },
- { 153, 44 }, { 156, 33 }, { 153, 22 }, { 142, 12 }, { 130, 13 }, { 138, 23 }, { 143, 33 }, { 140, 45 },
- { 137, 56 }, { 128, 47 }, { 132, 35 }, { 127, 25 }, { 119, 16 }, { 107, 17 }, { 115, 27 }, { 120, 37 },
- { 116, 48 }, { 117, 59 }, { 104, 51 }, { 109, 39 }, { 104, 29 }, { 86, 19 }, { 74, 16 }, { 78, 28 },
- { 79, 39 }, { 82, 50 }, { 73, 60 }, { 71, 48 }, { 67, 37 }, { 66, 26 }, { 63, 15 }, { 50, 12 },
- { 55, 24 }, { 55, 35 }, { 59, 47 }, { 50, 56 }, { 47, 45 }, { 43, 33 }, { 43, 22 }, { 39, 10 },
- { 25, 11 }, { 29, 22 }, { 30, 33 }, { 34, 44 }, { 24, 54 }, { 9, 55 }, { 15, 44 }, { 14, 33 },
- { 14, 22 }, { 14, 11 }
-}, {
- 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2,
-
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4
-} };
-#endif \ No newline at end of file