From 45d60214f46c21ce83f7352b48cb31e3534621da Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Tue, 16 Apr 2024 15:55:40 -0700 Subject: [PATCH 1/6] [Keyboard] ZSA Voyager (#22181) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ryan Co-authored-by: László Bácsi Co-authored-by: Joel Challis --- keyboards/zsa/voyager/config.h | 14 + keyboards/zsa/voyager/halconf.h | 20 ++ keyboards/zsa/voyager/info.json | 219 ++++++++++++ .../zsa/voyager/keymaps/default/keymap.c | 29 ++ keyboards/zsa/voyager/ld/voyager.ld | 85 +++++ keyboards/zsa/voyager/matrix.c | 204 ++++++++++++ keyboards/zsa/voyager/mcuconf.h | 23 ++ keyboards/zsa/voyager/readme.md | 40 +++ keyboards/zsa/voyager/rules.mk | 10 + keyboards/zsa/voyager/voyager.c | 312 ++++++++++++++++++ keyboards/zsa/voyager/voyager.h | 35 ++ 11 files changed, 991 insertions(+) create mode 100644 keyboards/zsa/voyager/config.h create mode 100644 keyboards/zsa/voyager/halconf.h create mode 100644 keyboards/zsa/voyager/info.json create mode 100644 keyboards/zsa/voyager/keymaps/default/keymap.c create mode 100644 keyboards/zsa/voyager/ld/voyager.ld create mode 100644 keyboards/zsa/voyager/matrix.c create mode 100644 keyboards/zsa/voyager/mcuconf.h create mode 100644 keyboards/zsa/voyager/readme.md create mode 100644 keyboards/zsa/voyager/rules.mk create mode 100644 keyboards/zsa/voyager/voyager.c create mode 100644 keyboards/zsa/voyager/voyager.h diff --git a/keyboards/zsa/voyager/config.h b/keyboards/zsa/voyager/config.h new file mode 100644 index 00000000000..630c01fc809 --- /dev/null +++ b/keyboards/zsa/voyager/config.h @@ -0,0 +1,14 @@ +// Copyright 2023 ZSA Technology Labs, Inc <@zsa> +// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND +#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC + +#define IS31FL3731_I2C_TIMEOUT 5 + +#define MOUSEKEY_WHEEL_INTERVAL MOUSEKEY_INTERVAL +#define MOUSEKEY_WHEEL_MAX_SPEED MOUSEKEY_MAX_SPEED +#define MOUSEKEY_WHEEL_TIME_TO_MAX MOUSEKEY_TIME_TO_MAX diff --git a/keyboards/zsa/voyager/halconf.h b/keyboards/zsa/voyager/halconf.h new file mode 100644 index 00000000000..d9f29a11cb1 --- /dev/null +++ b/keyboards/zsa/voyager/halconf.h @@ -0,0 +1,20 @@ +/* Copyright 2021 QMK + * + * 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 3 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 . + */ +#pragma once + +#define HAL_USE_I2C TRUE + +#include_next diff --git a/keyboards/zsa/voyager/info.json b/keyboards/zsa/voyager/info.json new file mode 100644 index 00000000000..14e7584f5cc --- /dev/null +++ b/keyboards/zsa/voyager/info.json @@ -0,0 +1,219 @@ +{ + "manufacturer": "ZSA Technology Labs", + "keyboard_name": "Voyager", + "maintainer": "ZSA Technology Labs", + "url": "zsa.io/voyager", + "processor": "STM32F303", + "bootloader": "custom", + "usb": { + "vid": "0x3297", + "pid": "0x1977", + "device_version": "0.0.1", + "shared_endpoint": { + "mouse": false + } + }, + "features": { + "bootmagic": true, + "caps_word": true, + "deferred_exec": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "swap_hands": true, + "rgb_matrix": true + }, + "bootmagic": { + "matrix": [0, 1] + }, + "diode_direction": "ROW2COL", + "matrix_size": { + "cols": 7, + "rows": 12 + }, + "mousekey": { + "delay": 0, + "interval": 20, + "max_speed": 7, + "time_to_max": 60, + "wheel_delay": 400 + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "rgb_matrix": { + "driver": "is31fl3731", + "led_flush_limit": 26, + "led_process_limit": 5, + "max_brightness": 175, + "sleep": true, + "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, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "rainbow_moving_chevron": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "flower_blooming": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_fractal": true, + "pixel_flow": true, + "pixel_rain": 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, + "starlight": true, + "starlight_dual_sat": true, + "starlight_dual_hue": true, + "riverflow": true + }, + "layout": [ + {"matrix": [0, 1], "x": 0, "y": 10, "flags": 1}, + {"matrix": [0, 2], "x": 17, "y": 10, "flags": 4}, + {"matrix": [0, 3], "x": 34, "y": 8, "flags": 4}, + {"matrix": [0, 4], "x": 52, "y": 5, "flags": 4}, + {"matrix": [0, 5], "x": 69, "y": 8, "flags": 4}, + {"matrix": [0, 6], "x": 86, "y": 10, "flags": 4}, + {"matrix": [1, 1], "x": 0, "y": 21, "flags": 1}, + {"matrix": [1, 2], "x": 17, "y": 21, "flags": 4}, + {"matrix": [1, 3], "x": 34, "y": 19, "flags": 4}, + {"matrix": [1, 4], "x": 52, "y": 17, "flags": 4}, + {"matrix": [1, 5], "x": 69, "y": 19, "flags": 4}, + {"matrix": [1, 6], "x": 86, "y": 21, "flags": 4}, + {"matrix": [2, 1], "x": 0, "y": 32, "flags": 1}, + {"matrix": [2, 2], "x": 17, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 34, "y": 30, "flags": 4}, + {"matrix": [2, 4], "x": 52, "y": 28, "flags": 4}, + {"matrix": [2, 5], "x": 69, "y": 30, "flags": 4}, + {"matrix": [2, 6], "x": 86, "y": 32, "flags": 4}, + {"matrix": [3, 1], "x": 0, "y": 43, "flags": 1}, + {"matrix": [3, 2], "x": 17, "y": 43, "flags": 4}, + {"matrix": [3, 3], "x": 34, "y": 41, "flags": 4}, + {"matrix": [3, 4], "x": 52, "y": 39, "flags": 4}, + {"matrix": [3, 5], "x": 69, "y": 41, "flags": 4}, + {"matrix": [4, 4], "x": 86, "y": 43, "flags": 4}, + {"matrix": [5, 0], "x": 86, "y": 53, "flags": 1}, + {"matrix": [5, 1], "x": 96, "y": 58, "flags": 1}, + {"matrix": [6, 0], "x": 138, "y": 10, "flags": 4}, + {"matrix": [6, 1], "x": 155, "y": 10, "flags": 4}, + {"matrix": [6, 2], "x": 172, "y": 8, "flags": 4}, + {"matrix": [6, 3], "x": 190, "y": 5, "flags": 4}, + {"matrix": [6, 4], "x": 207, "y": 8, "flags": 4}, + {"matrix": [6, 5], "x": 224, "y": 10, "flags": 1}, + {"matrix": [7, 0], "x": 138, "y": 21, "flags": 4}, + {"matrix": [7, 1], "x": 155, "y": 21, "flags": 4}, + {"matrix": [7, 2], "x": 172, "y": 19, "flags": 4}, + {"matrix": [7, 3], "x": 190, "y": 17, "flags": 4}, + {"matrix": [7, 4], "x": 207, "y": 19, "flags": 4}, + {"matrix": [7, 5], "x": 224, "y": 21, "flags": 1}, + {"matrix": [8, 0], "x": 138, "y": 32, "flags": 4}, + {"matrix": [8, 1], "x": 155, "y": 32, "flags": 4}, + {"matrix": [8, 2], "x": 172, "y": 30, "flags": 4}, + {"matrix": [8, 3], "x": 190, "y": 28, "flags": 4}, + {"matrix": [8, 4], "x": 207, "y": 30, "flags": 4}, + {"matrix": [8, 5], "x": 224, "y": 32, "flags": 1}, + {"matrix": [10, 2], "x": 138, "y": 43, "flags": 4}, + {"matrix": [9, 1], "x": 155, "y": 43, "flags": 4}, + {"matrix": [9, 2], "x": 172, "y": 41, "flags": 4}, + {"matrix": [9, 3], "x": 190, "y": 39, "flags": 4}, + {"matrix": [9, 4], "x": 207, "y": 41, "flags": 4}, + {"matrix": [9, 5], "x": 224, "y": 43, "flags": 1}, + {"matrix": [11, 5], "x": 128, "y": 58, "flags": 1}, + {"matrix": [11, 6], "x": 138, "y": 53, "flags": 1} + ] + }, + "layout_aliases": { + "LAYOUT_voyager": "LAYOUT" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k00", "matrix": [0, 1], "x": 3, "y": 0}, + {"label": "k01", "matrix": [0, 2], "x": 12, "y": 0}, + {"label": "k02", "matrix": [0, 3], "x": 2, "y": 0.25}, + {"label": "k03", "matrix": [0, 4], "x": 4, "y": 0.25}, + {"label": "k04", "matrix": [0, 5], "x": 11, "y": 0.25}, + {"label": "k05", "matrix": [0, 6], "x": 13, "y": 0.25}, + {"label": "k26", "matrix": [6, 0], "x": 0, "y": 0.5}, + {"label": "k27", "matrix": [6, 1], "x": 1, "y": 0.5}, + {"label": "k28", "matrix": [6, 2], "x": 5, "y": 0.5}, + {"label": "k29", "matrix": [6, 3], "x": 10, "y": 0.5}, + {"label": "k30", "matrix": [6, 4], "x": 14, "y": 0.5}, + {"label": "k31", "matrix": [6, 5], "x": 15, "y": 0.5}, + {"label": "k06", "matrix": [1, 1], "x": 3, "y": 1}, + {"label": "k07", "matrix": [1, 2], "x": 12, "y": 1}, + {"label": "k08", "matrix": [1, 3], "x": 2, "y": 1.25}, + {"label": "k09", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "k10", "matrix": [1, 5], "x": 11, "y": 1.25}, + {"label": "k11", "matrix": [1, 6], "x": 13, "y": 1.25}, + {"label": "k32", "matrix": [7, 0], "x": 0, "y": 1.5}, + {"label": "k33", "matrix": [7, 1], "x": 1, "y": 1.5}, + {"label": "k34", "matrix": [7, 2], "x": 5, "y": 1.5}, + {"label": "k35", "matrix": [7, 3], "x": 10, "y": 1.5}, + {"label": "k36", "matrix": [7, 4], "x": 14, "y": 1.5}, + {"label": "k37", "matrix": [7, 5], "x": 15, "y": 1.5}, + {"label": "k12", "matrix": [2, 1], "x": 3, "y": 2}, + {"label": "k13", "matrix": [2, 2], "x": 12, "y": 2}, + {"label": "k14", "matrix": [2, 3], "x": 2, "y": 2.25}, + {"label": "k15", "matrix": [2, 4], "x": 4, "y": 2.25}, + {"label": "k16", "matrix": [2, 5], "x": 11, "y": 2.25}, + {"label": "k17", "matrix": [2, 6], "x": 13, "y": 2.25}, + {"label": "k38", "matrix": [8, 0], "x": 0, "y": 2.5}, + {"label": "k39", "matrix": [8, 1], "x": 1, "y": 2.5}, + {"label": "k40", "matrix": [8, 2], "x": 5, "y": 2.5}, + {"label": "k41", "matrix": [8, 3], "x": 10, "y": 2.5}, + {"label": "k42", "matrix": [8, 4], "x": 14, "y": 2.5}, + {"label": "k43", "matrix": [8, 5], "x": 15, "y": 2.5}, + {"label": "k18", "matrix": [3, 1], "x": 3, "y": 3}, + {"label": "k19", "matrix": [3, 2], "x": 12, "y": 3}, + {"label": "k20", "matrix": [3, 3], "x": 2, "y": 3.25}, + {"label": "k21", "matrix": [3, 4], "x": 4, "y": 3.25}, + {"label": "k22", "matrix": [3, 5], "x": 11, "y": 3.25}, + {"label": "k23", "matrix": [4, 4], "x": 13, "y": 3.25}, + {"label": "k44", "matrix": [10, 2], "x": 0, "y": 3.5}, + {"label": "k45", "matrix": [9, 1], "x": 1, "y": 3.5}, + {"label": "k46", "matrix": [9, 2], "x": 5, "y": 3.5}, + {"label": "k47", "matrix": [9, 3], "x": 10, "y": 3.5}, + {"label": "k48", "matrix": [9, 4], "x": 14, "y": 3.5}, + {"label": "k49", "matrix": [9, 5], "x": 15, "y": 3.5}, + {"label": "k24", "matrix": [5, 0], "x": 5, "y": 4.5}, + {"label": "k25", "matrix": [5, 1], "x": 6, "y": 4.75}, + {"label": "k50", "matrix": [11, 5], "x": 9, "y": 4.75}, + {"label": "k51", "matrix": [11, 6], "x": 10, "y": 4.5} + ] + } + } +} diff --git a/keyboards/zsa/voyager/keymaps/default/keymap.c b/keyboards/zsa/voyager/keymaps/default/keymap.c new file mode 100644 index 00000000000..e05794de756 --- /dev/null +++ b/keyboards/zsa/voyager/keymaps/default/keymap.c @@ -0,0 +1,29 @@ +// Copyright 2023 ZSA Technology Labs, Inc <@zsa> +// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + CW_TOGG, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + SFT_T(KC_BSPC),KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RSFT_T(KC_QUOT), + KC_LGUI, ALT_T(KC_Z),KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA,KC_DOT, RALT_T(KC_SLSH), KC_RCTL, + LT(1,KC_ENT), CTL_T(KC_TAB), SFT_T(KC_BSPC), LT(2,KC_SPC) + ), + [1] = LAYOUT( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_7, KC_8, KC_9, KC_MINS, KC_SLSH, KC_F12, + _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_4, KC_5, KC_6, KC_PLUS, KC_ASTR, KC_BSPC, + _______, _______, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, KC_DOT, KC_EQL, KC_ENT, + _______, _______, _______, KC_0 + ), + [2] = LAYOUT( + RGB_TOG, QK_KB, RGB_MOD, RGB_M_P, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, QK_BOOT, + _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_PGUP, KC_HOME, KC_UP, KC_END, _______, _______, + _______, KC_MPRV, KC_MNXT, KC_MSTP, KC_MPLY, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, C(S(KC_TAB)), C(KC_TAB), _______, _______, _______, + _______, _______, _______, _______ + ), +}; diff --git a/keyboards/zsa/voyager/ld/voyager.ld b/keyboards/zsa/voyager/ld/voyager.ld new file mode 100644 index 00000000000..0619983beb0 --- /dev/null +++ b/keyboards/zsa/voyager/ld/voyager.ld @@ -0,0 +1,85 @@ +/* + ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/* + * STM32F303xC memory setup. + */ +MEMORY +{ + flash0 (rx) : org = 0x08002000, len = 256k - 0x2000 + flash1 (rx) : org = 0x00000000, len = 0 + flash2 (rx) : org = 0x00000000, len = 0 + flash3 (rx) : org = 0x00000000, len = 0 + flash4 (rx) : org = 0x00000000, len = 0 + flash5 (rx) : org = 0x00000000, len = 0 + flash6 (rx) : org = 0x00000000, len = 0 + flash7 (rx) : org = 0x00000000, len = 0 + ram0 (wx) : org = 0x20000000, len = 40k + ram1 (wx) : org = 0x00000000, len = 0 + ram2 (wx) : org = 0x00000000, len = 0 + ram3 (wx) : org = 0x00000000, len = 0 + ram4 (wx) : org = 0x10000000, len = 8k + ram5 (wx) : org = 0x00000000, len = 0 + ram6 (wx) : org = 0x00000000, len = 0 + ram7 (wx) : org = 0x00000000, len = 0 +} + +/* For each data/text section two region are defined, a virtual region + and a load region (_LMA suffix).*/ + +/* Flash region to be used for exception vectors.*/ +REGION_ALIAS("VECTORS_FLASH", flash0); +REGION_ALIAS("VECTORS_FLASH_LMA", flash0); + +/* Flash region to be used for constructors and destructors.*/ +REGION_ALIAS("XTORS_FLASH", flash0); +REGION_ALIAS("XTORS_FLASH_LMA", flash0); + +/* Flash region to be used for code text.*/ +REGION_ALIAS("TEXT_FLASH", flash0); +REGION_ALIAS("TEXT_FLASH_LMA", flash0); + +/* Flash region to be used for read only data.*/ +REGION_ALIAS("RODATA_FLASH", flash0); +REGION_ALIAS("RODATA_FLASH_LMA", flash0); + +/* Flash region to be used for various.*/ +REGION_ALIAS("VARIOUS_FLASH", flash0); +REGION_ALIAS("VARIOUS_FLASH_LMA", flash0); + +/* Flash region to be used for RAM(n) initialization data.*/ +REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0); + +/* RAM region to be used for Main stack. This stack accommodates the processing + of all exceptions and interrupts.*/ +REGION_ALIAS("MAIN_STACK_RAM", ram0); + +/* RAM region to be used for the process stack. This is the stack used by + the main() function.*/ +REGION_ALIAS("PROCESS_STACK_RAM", ram0); + +/* RAM region to be used for data segment.*/ +REGION_ALIAS("DATA_RAM", ram0); +REGION_ALIAS("DATA_RAM_LMA", flash0); + +/* RAM region to be used for BSS segment.*/ +REGION_ALIAS("BSS_RAM", ram0); + +/* RAM region to be used for the default heap.*/ +REGION_ALIAS("HEAP_RAM", ram0); + +/* Generic rules inclusion.*/ +INCLUDE rules.ld \ No newline at end of file diff --git a/keyboards/zsa/voyager/matrix.c b/keyboards/zsa/voyager/matrix.c new file mode 100644 index 00000000000..614c3ffa041 --- /dev/null +++ b/keyboards/zsa/voyager/matrix.c @@ -0,0 +1,204 @@ +// Copyright 2023 ZSA Technology Labs, Inc <@zsa> +// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include "voyager.h" +#include "mcp23018.h" + +#pragma GCC push_options +#pragma GCC optimize("-O3") + +extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values +extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values +static matrix_row_t raw_matrix_right[MATRIX_COLS]; + +#define MCP_ROWS_PER_HAND (MATRIX_ROWS / 2) +#ifndef VOYAGER_I2C_TIMEOUT +# define VOYAGER_I2C_TIMEOUT 100 +#endif +// Delay between each i2c io expander ops (in MCU cycles) +#ifndef IO_EXPANDER_OP_DELAY +# define IO_EXPANDER_OP_DELAY 500 +#endif + +extern bool mcp23018_leds[2]; +extern bool is_launching; + +static uint16_t mcp23018_reset_loop; +uint8_t mcp23018_errors; + +bool io_expander_ready(void) { + uint8_t tx; + return mcp23018_readPins(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTA, &tx); +} + +void matrix_init_custom(void) { + // outputs + gpio_set_pin_output(B10); + gpio_set_pin_output(B11); + gpio_set_pin_output(B12); + gpio_set_pin_output(B13); + gpio_set_pin_output(B14); + gpio_set_pin_output(B15); + + // inputs + gpio_set_pin_input_low(A0); + gpio_set_pin_input_low(A1); + gpio_set_pin_input_low(A2); + gpio_set_pin_input_low(A3); + gpio_set_pin_input_low(A6); + gpio_set_pin_input_low(A7); + gpio_set_pin_input_low(B0); + + mcp23018_init(MCP23018_DEFAULT_ADDRESS); + mcp23018_errors += !mcp23018_set_config(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTA, 0b00000000); + mcp23018_errors += !mcp23018_set_config(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTB, 0b00111111); + + if (!mcp23018_errors) { + is_launching = true; + } +} + +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + bool changed = false; + // Attempt to reset the mcp23018 if it's not initialized + if (mcp23018_errors) { + if (++mcp23018_reset_loop > 0x1FFF) { + if (io_expander_ready()) { + // If we managed to initialize the mcp23018 - we need to reinitialize the matrix / layer state. During an electric discharge the i2c peripherals might be in a weird state. Giving a delay and resetting the MCU allows to recover from this. + wait_ms(200); + mcu_reset(); + } + } + } + + // Scanning left and right side of the keyboard for key presses. + // Left side is scanned by reading the gpio pins directly, right side is scanned by reading the mcp23018 registers. + + matrix_row_t data = 0; + for (uint8_t row = 0; row <= MCP_ROWS_PER_HAND; row++) { + // strobe row + switch (row) { + case 0: + gpio_write_pin_high(B10); + break; + case 1: + gpio_write_pin_high(B11); + break; + case 2: + gpio_write_pin_high(B12); + break; + case 3: + gpio_write_pin_high(B13); + break; + case 4: + gpio_write_pin_high(B14); + break; + case 5: + gpio_write_pin_high(B15); + break; + case 6: + break; // Left hand has 6 rows + } + + // Selecting the row on the right side of the keyboard. + if (!mcp23018_errors) { + // select row + mcp23018_errors += !mcp23018_set_output(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTA, 0b01111111 & ~(1 << (row))); + mcp23018_errors += !mcp23018_set_output(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTB, ((uint8_t)!mcp23018_leds[1] << 6) | ((uint8_t)!mcp23018_leds[0] << 7)); + } + // Reading the left side of the keyboard. + if (row < MCP_ROWS_PER_HAND) { + // i2c comm incur enough wait time + if (mcp23018_errors) { + // need wait to settle pin state + matrix_io_delay(); + } + // read col data + data = ((readPin(A0) << 0) | (readPin(A1) << 1) | (readPin(A2) << 2) | (readPin(A3) << 3) | (readPin(A6) << 4) | (readPin(A7) << 5) | (readPin(B0) << 6)); + // unstrobe row + switch (row) { + case 0: + gpio_write_pin_low(B10); + break; + case 1: + gpio_write_pin_low(B11); + break; + case 2: + gpio_write_pin_low(B12); + break; + case 3: + gpio_write_pin_low(B13); + break; + case 4: + gpio_write_pin_low(B14); + break; + case 5: + gpio_write_pin_low(B15); + break; + case 6: + break; + } + + if (current_matrix[row] != data) { + current_matrix[row] = data; + changed = true; + } + } + + // Reading the right side of the keyboard. + if (!mcp23018_errors) { + for (uint16_t i = 0; i < IO_EXPANDER_OP_DELAY; i++) { + __asm__("nop"); + } + uint8_t rx; + mcp23018_errors += !mcp23018_readPins(MCP23018_DEFAULT_ADDRESS, mcp23018_PORTB, &rx); + data = ~(rx & 0b00111111); + for (uint16_t i = 0; i < IO_EXPANDER_OP_DELAY; i++) { + __asm__("nop"); + } + } else { + data = 0; + } + + if (raw_matrix_right[row] != data) { + raw_matrix_right[row] = data; + changed = true; + } + } + + for (uint8_t row = 0; row < MCP_ROWS_PER_HAND; row++) { + current_matrix[11 - row] = 0; + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + current_matrix[11 - row] |= ((raw_matrix_right[6 - col] & (1 << row) ? 1 : 0) << col); + } + } + return changed; +} + +// DO NOT REMOVE +// Needed for proper wake/sleep +void matrix_power_up(void) { + bool temp_launching = is_launching; + + matrix_init_custom(); + + is_launching = temp_launching; + if (!temp_launching) { + STATUS_LED_1(false); + STATUS_LED_2(false); + STATUS_LED_3(false); + STATUS_LED_4(false); + } + + // initialize matrix state: all keys off + for (uint8_t i = 0; i < MATRIX_ROWS; i++) { + matrix[i] = 0; + } +} + +bool is_transport_connected(void) { + return (bool)(mcp23018_errors == 0); +} +#pragma GCC pop_options diff --git a/keyboards/zsa/voyager/mcuconf.h b/keyboards/zsa/voyager/mcuconf.h new file mode 100644 index 00000000000..f75edce3e9b --- /dev/null +++ b/keyboards/zsa/voyager/mcuconf.h @@ -0,0 +1,23 @@ +/* Copyright 2021 QMK + * + * 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 3 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 . + */ + +#pragma once + +#include_next + +// for i2c expander, and ISSI +#undef STM32_I2C_USE_I2C1 +#define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/zsa/voyager/readme.md b/keyboards/zsa/voyager/readme.md new file mode 100644 index 00000000000..4a602ee1374 --- /dev/null +++ b/keyboards/zsa/voyager/readme.md @@ -0,0 +1,40 @@ +# Voyager + +A next-gen split, ergonomic keyboard with an active left side, USB type C, and low profile switches. + +* Keyboard Maintainer: [drashna](https://github.com/drashna), [ZSA](https://github.com/zsa/) +* Hardware Supported: Voyager (STM32F303xC) +* Hardware Availability: [ZSA Store](https://zsa.io/voyager/) + +Make example for this keyboard (after setting up your build environment): + + make zsa/voyager:default + +Flashing example for this keyboard: + + make zsa/voyager:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + + +## Voyager Customization + +### Indicator LEDs + +There are 4 functions for enabling and disabling the LEDs on the top of the boards. The functions are `STATUS_LED_1(bool)` through `STATUS_LED_4(bool)`, with the first LED being the top most LED on the left hand, and the fourth LED being the bottom most LED on the right side. + +By default, the Indicator LEDs are used to indicate the layer state for the keyboard. If you wish to change this (and indicate caps/num/scroll lock status instead), then define `VOYAGER_USER_LEDS` in your `config.h` file. + +### Detecting split / Gaming mode + +To make it extra gaming friendly, you can configure what happens when you disconnect the right half. This is especially useful when using gaming unfriendly layers or layouts (e.g. home row mods, dvorak, colemak). + +Example for enabling a specific layer while right side is disconnected: + +```c +void housekeeping_task_user(void) { + if (!is_transport_connected()) { + // set layer + } +} +``` diff --git a/keyboards/zsa/voyager/rules.mk b/keyboards/zsa/voyager/rules.mk new file mode 100644 index 00000000000..bb95224d2bf --- /dev/null +++ b/keyboards/zsa/voyager/rules.mk @@ -0,0 +1,10 @@ +MCU_LDSCRIPT = voyager + +CUSTOM_MATRIX = lite +PROGRAM_CMD = $(call EXEC_DFU) +DFU_ARGS = -d 3297:0791 -a 0 -s 0x08002000:leave +DFU_SUFFIX_ARGS = -v 3297 -p 0791 + +VPATH += drivers/gpio +SRC += matrix.c mcp23018.c +I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/zsa/voyager/voyager.c b/keyboards/zsa/voyager/voyager.c new file mode 100644 index 00000000000..d70f1be3eff --- /dev/null +++ b/keyboards/zsa/voyager/voyager.c @@ -0,0 +1,312 @@ +// Copyright 2023 ZSA Technology Labs, Inc <@zsa> +// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "voyager.h" + +keyboard_config_t keyboard_config; + +bool mcp23018_leds[2] = {0, 0}; +bool is_launching = false; + +#if defined(DEFERRED_EXEC_ENABLE) +# if defined(DYNAMIC_MACRO_ENABLE) +deferred_token dynamic_macro_token = INVALID_DEFERRED_TOKEN; + +static uint32_t dynamic_macro_led(uint32_t trigger_time, void *cb_arg) { + static bool led_state = true; + if (!is_launching) { + led_state = !led_state; + STATUS_LED_3(led_state); + } + return 100; +} + +void dynamic_macro_record_start_user(void) { + if (my_token == INVALID_DEFERRED_TOKEN) { + STATUS_LED_3(true); + dynamic_macro_token = defer_exec(100, dynamic_macro_led, NULL); + } +} + +void dynamic_macro_record_end_user(int8_t direction) { + if (cancel_deferred_exec(dynamic_macro_token)) { + dynamic_macro_token = INVALID_DEFERRED_TOKEN; + STATUS_LED_3(false); + } +} +# endif + +static uint32_t startup_exec(uint32_t trigger_time, void *cb_arg) { + static uint8_t startup_loop = 0; + + switch (startup_loop++) { + case 0: + STATUS_LED_1(true); + STATUS_LED_2(false); + STATUS_LED_3(false); + STATUS_LED_4(false); + break; + case 1: + STATUS_LED_2(true); + break; + case 2: + STATUS_LED_3(true); + break; + case 3: + STATUS_LED_4(true); + break; + case 4: + STATUS_LED_1(false); + break; + case 5: + STATUS_LED_2(false); + break; + case 6: + STATUS_LED_3(false); + break; + case 7: + STATUS_LED_4(false); + break; + case 8: + is_launching = false; + layer_state_set_kb(layer_state); + return 0; + } + return 250; +} +#endif + +void keyboard_pre_init_kb(void) { + // Initialize Reset pins + gpio_set_pin_input(A8); + gpio_set_pin_output(A9); + gpio_write_pin_low(A9); + + gpio_set_pin_output(B5); + gpio_set_pin_output(B4); + gpio_set_pin_output(B3); + + gpio_write_pin_low(B5); + gpio_write_pin_low(B4); + gpio_write_pin_low(B3); + + keyboard_pre_init_user(); +} + +#if !defined(VOYAGER_USER_LEDS) +layer_state_t layer_state_set_kb(layer_state_t state) { + state = layer_state_set_user(state); + if (is_launching || !keyboard_config.led_level) return state; + + uint8_t layer = get_highest_layer(state); + + STATUS_LED_1(layer & (1 << 0)); + STATUS_LED_2(layer & (1 << 1)); + STATUS_LED_3(layer & (1 << 2)); + +# if !defined(CAPS_LOCK_STATUS) + STATUS_LED_4(layer & (1 << 3)); +# endif + return state; +} +#endif + +#ifdef RGB_MATRIX_ENABLE +// clang-format off +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to IS31 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, C2_2, C1_2, C4_3}, + {0, C2_3, C1_3, C3_3}, + {0, C2_4, C1_4, C3_4}, + {0, C2_5, C1_5, C3_5}, + {0, C2_6, C1_6, C3_6}, + {0, C2_7, C1_7, C3_7}, + {0, C2_8, C1_8, C3_8}, + {0, C8_1, C7_1, C9_1}, + {0, C8_2, C7_2, C9_2}, + {0, C8_3, C7_3, C9_3}, + {0, C8_4, C7_4, C9_4}, + {0, C8_5, C7_5, C9_5}, + {0, C8_6, C7_6, C9_6}, + {0, C2_10, C1_10, C4_11}, + {0, C2_11, C1_11, C3_11}, + {0, C2_12, C1_12, C3_12}, + {0, C2_13, C1_13, C3_13}, + {0, C2_14, C1_14, C3_14}, + {0, C2_15, C1_15, C3_15}, + {0, C2_16, C1_16, C3_16}, + {0, C8_9, C7_9, C9_9}, + {0, C8_10, C7_10, C9_10}, + {0, C8_11, C7_11, C9_11}, + {0, C8_12, C7_12, C9_12}, + {0, C8_13, C7_13, C9_13}, + {0, C8_14, C7_14, C9_14}, + + {1, C2_7, C1_7, C3_7}, + {1, C2_6, C1_6, C3_6}, + {1, C2_5, C1_5, C3_5}, + {1, C2_4, C1_4, C3_4}, + {1, C2_3, C1_3, C3_3}, + {1, C2_2, C1_2, C4_3}, + + {1, C8_5, C7_5, C9_5}, + {1, C8_4, C7_4, C9_4}, + {1, C8_3, C7_3, C9_3}, + {1, C8_2, C7_2, C9_2}, + {1, C8_1, C7_1, C9_1}, + {1, C2_8, C1_8, C3_8}, + + {1, C2_14, C1_14, C3_14}, + {1, C2_13, C1_13, C3_13}, + {1, C2_12, C1_12, C3_12}, + {1, C2_11, C1_11, C3_11}, + {1, C2_10, C1_10, C4_11}, + {1, C8_6, C7_6, C9_6}, + + {1, C8_12, C7_12, C9_12}, + {1, C8_11, C7_11, C9_11}, + {1, C8_10, C7_10, C9_10}, + {1, C8_9, C7_9, C9_9}, + {1, C2_16, C1_16, C3_16}, + {1, C2_15, C1_15, C3_15}, + + {1, C8_14, C7_14, C9_14}, + {1, C8_13, C7_13, C9_13}, +}; +// clang-format on +#endif + +#ifdef SWAP_HANDS_ENABLE +// swap-hands action needs a matrix to define the swap +// clang-format off +const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { + /* Left hand, matrix positions */ + {{6,6}, {5,6}, {4,6}, {3,6}, {2,6}, {1,6},{0,6}}, + {{6,7}, {5,7}, {4,7}, {3,7}, {2,7}, {1,7},{0,7}}, + {{6,8}, {5,8}, {4,8}, {3,8}, {2,8}, {1,8},{0,8}}, + {{6,9}, {5,9}, {4,9}, {3,9}, {2,9}, {1,9},{0,9}}, + {{6,10},{5,10},{4,10},{3,10},{2,10},{1,10},{0,10}}, + {{6,11},{5,11},{4,11},{3,11},{2,11},{1,11},{0,11}}, + /* Right hand, matrix positions */ + {{6,0}, {5,0}, {4,0}, {3,0}, {2,0}, {1,0},{0,0}}, + {{6,1}, {5,1}, {4,1}, {3,1}, {2,1}, {1,1},{0,1}}, + {{6,2}, {5,2}, {4,2}, {3,2}, {2,2}, {1,2},{0,2}}, + {{6,3}, {5,3}, {4,3}, {3,3}, {2,3}, {1,3},{0,3}}, + {{6,4}, {5,4}, {4,4}, {3,4}, {2,4}, {1,4},{0,4}}, + {{6,5}, {5,5}, {4,5}, {3,5}, {2,5}, {1,5},{0,5}}, +}; +// clang-format on +#endif + +#ifdef CAPS_LOCK_STATUS +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + if (res) { + STATUS_LED_4(led_state.caps_lock); + } + return res; +} +#endif + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + if (!process_record_user(keycode, record)) { + return false; + } + switch (keycode) { +#if !defined(VOYAGER_USER_LEDS) + case LED_LEVEL: + if (record->event.pressed) { + keyboard_config.led_level ^= 1; + eeconfig_update_kb(keyboard_config.raw); + if (keyboard_config.led_level) { + layer_state_set_kb(layer_state); + } else { + STATUS_LED_1(false); + STATUS_LED_2(false); + STATUS_LED_3(false); + STATUS_LED_4(false); + } + } + break; +#endif +#ifdef RGB_MATRIX_ENABLE + case TOGGLE_LAYER_COLOR: + if (record->event.pressed) { + keyboard_config.disable_layer_led ^= 1; + if (keyboard_config.disable_layer_led) rgb_matrix_set_color_all(0, 0, 0); + } + break; + case RGB_TOG: + if (record->event.pressed) { + switch (rgb_matrix_get_flags()) { + case LED_FLAG_ALL: { + rgb_matrix_set_flags(LED_FLAG_NONE); + rgb_matrix_set_color_all(0, 0, 0); + } break; + default: { + rgb_matrix_set_flags(LED_FLAG_ALL); + } break; + } + } + return false; +#endif + } + return true; +} + +void keyboard_post_init_kb(void) { +#ifdef RGB_MATRIX_ENABLE + rgb_matrix_enable_noeeprom(); +#endif + + keyboard_config.raw = eeconfig_read_kb(); + + if (!keyboard_config.led_level && !keyboard_config.led_level_res) { + keyboard_config.led_level = true; + keyboard_config.led_level_res = 0b11; + eeconfig_update_kb(keyboard_config.raw); + } +#if defined(DEFERRED_EXEC_ENABLE) + is_launching = true; + defer_exec(500, startup_exec, NULL); +#endif + keyboard_post_init_user(); +} + +void eeconfig_init_kb(void) { // EEPROM is getting reset! + keyboard_config.raw = 0; + keyboard_config.led_level = true; + keyboard_config.led_level_res = 0b11; + eeconfig_update_kb(keyboard_config.raw); + eeconfig_init_user(); +} + +__attribute__((weak)) void bootloader_jump(void) { + // The ignition bootloader is checking for a high signal on A8 for 100ms when powering on the board. + // Setting both A8 and A9 high will charge the capacitor quickly. + // Setting A9 low before reset will cause the capacitor to discharge + // thus making the bootloder unlikely to trigger twice between power cycles. + gpio_set_pin_output_push_pull(A9); + gpio_set_pin_output_push_pull(A8); + gpio_write_pin_high(A9); + gpio_write_pin_high(A8); + wait_ms(500); + gpio_write_pin_low(A9); + + NVIC_SystemReset(); +} + +__attribute__((weak)) void mcu_reset(void) { + gpio_set_pin_output_push_pull(A9); + gpio_set_pin_output_push_pull(A8); + gpio_write_pin_low(A8); + gpio_write_pin_low(A9); + + NVIC_SystemReset(); +} diff --git a/keyboards/zsa/voyager/voyager.h b/keyboards/zsa/voyager/voyager.h new file mode 100644 index 00000000000..a00cc995c62 --- /dev/null +++ b/keyboards/zsa/voyager/voyager.h @@ -0,0 +1,35 @@ +// Copyright 2023 ZSA Technology Labs, Inc <@zsa> +// Copyright 2023 Christopher Courtney, aka Drashna Jael're (@drashna) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "quantum.h" + +extern bool mcp23018_leds[]; + +#define MCP23018_DEFAULT_ADDRESS 0b0100000 + +#define STATUS_LED_1(status) gpio_write_pin(B5, (bool)(status)) +#define STATUS_LED_2(status) gpio_write_pin(B4, (bool)(status)) +#define STATUS_LED_3(status) mcp23018_leds[0] = (bool)(status) +#define STATUS_LED_4(status) mcp23018_leds[1] = (bool)(status) + +enum voyager_keycodes { + TOGGLE_LAYER_COLOR = QK_KB, + LED_LEVEL, +}; + +typedef union { + uint32_t raw; + struct { + bool disable_layer_led : 1; + bool placeholder : 1; + bool led_level : 1; + uint8_t led_level_res : 2; // DO NOT REMOVE + }; +} keyboard_config_t; + +extern keyboard_config_t keyboard_config; + +bool is_transport_connected(void); From 7be23a9cb4f40841fc5394395ecf572a13636943 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:15:34 -0700 Subject: [PATCH 2/6] Data-Driven Keyboard Conversions: I (#23533) --- keyboards/ibm/model_m/mschwingen/info.json | 12 +++++++++++ keyboards/ibm/model_m/mschwingen/rules.mk | 20 +------------------ .../teensypp/{info.json => keyboard.json} | 5 +++++ keyboards/ibm/model_m/teensypp/rules.mk | 12 ----------- .../model_m_4th_gen/overnumpad_1xb/info.json | 11 +++++++++- .../model_m_4th_gen/overnumpad_1xb/rules.mk | 16 --------------- .../rev1/{info.json => keyboard.json} | 6 ++++++ keyboards/ibnuda/squiggle/rev1/rules.mk | 12 ----------- .../idobao/id42/{info.json => keyboard.json} | 3 ++- keyboards/idobao/id42/rules.mk | 4 ---- .../idobao/id61/{info.json => keyboard.json} | 3 ++- keyboards/idobao/id61/rules.mk | 5 ----- .../idobao/id63/{info.json => keyboard.json} | 3 ++- keyboards/idobao/id63/rules.mk | 4 ---- .../idobao/id67/{info.json => keyboard.json} | 3 ++- keyboards/idobao/id67/rules.mk | 4 ---- .../id80/v3/ansi/{info.json => keyboard.json} | 3 ++- keyboards/idobao/id80/v3/ansi/rules.mk | 4 ---- .../id87/v2/{info.json => keyboard.json} | 3 ++- keyboards/idobao/id87/v2/rules.mk | 4 ---- .../montex/v2/{info.json => keyboard.json} | 3 ++- keyboards/idobao/montex/v2/rules.mk | 4 ---- keyboards/ingrained/info.json | 12 ++++++++++- keyboards/ingrained/rules.mk | 15 -------------- keyboards/inland/kb83/info.json | 9 +++++++++ keyboards/inland/kb83/rules.mk | 18 +---------------- .../input_club/ergodox_infinity/info.json | 12 +++++++++++ .../input_club/ergodox_infinity/rules.mk | 19 ------------------ 28 files changed, 81 insertions(+), 148 deletions(-) rename keyboards/ibm/model_m/teensypp/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/ibm/model_m/teensypp/rules.mk rename keyboards/ibnuda/squiggle/rev1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/ibnuda/squiggle/rev1/rules.mk rename keyboards/idobao/id42/{info.json => keyboard.json} (99%) delete mode 100755 keyboards/idobao/id42/rules.mk rename keyboards/idobao/id61/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/idobao/id61/rules.mk rename keyboards/idobao/id63/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/idobao/id63/rules.mk rename keyboards/idobao/id67/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/idobao/id67/rules.mk rename keyboards/idobao/id80/v3/ansi/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/idobao/id80/v3/ansi/rules.mk rename keyboards/idobao/id87/v2/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/idobao/id87/v2/rules.mk rename keyboards/idobao/montex/v2/{info.json => keyboard.json} (98%) delete mode 100755 keyboards/idobao/montex/v2/rules.mk diff --git a/keyboards/ibm/model_m/mschwingen/info.json b/keyboards/ibm/model_m/mschwingen/info.json index ce740e4a548..0deb57ed038 100644 --- a/keyboards/ibm/model_m/mschwingen/info.json +++ b/keyboards/ibm/model_m/mschwingen/info.json @@ -16,6 +16,18 @@ }, "processor": "atmega32u4", "bootloader": "lufa-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "key_lock": true, + "dynamic_macro": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ibm/model_m/mschwingen/rules.mk b/keyboards/ibm/model_m/mschwingen/rules.mk index 7d81ffe326b..c86801e4090 100644 --- a/keyboards/ibm/model_m/mschwingen/rules.mk +++ b/keyboards/ibm/model_m/mschwingen/rules.mk @@ -1,20 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # 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 - CUSTOM_MATRIX = lite -KEY_LOCK_ENABLE = yes - -DYNAMIC_MACRO_ENABLE = yes UART_DEBUG = no @@ -22,8 +6,6 @@ SRC += matrix.c UART_DRIVER_REQUIRED = yes SPI_DRIVER_REQUIRED = yes -OPT_DEFS += -DSLEEP_LED_ENABLE # we need our own sleep callbacks to turn of WS2812 LEDs - -LTO_ENABLE = yes +OPT_DEFS += -DSLEEP_LED_ENABLE DEFAULT_FOLDER = ibm/model_m/mschwingen/led_wired diff --git a/keyboards/ibm/model_m/teensypp/info.json b/keyboards/ibm/model_m/teensypp/keyboard.json similarity index 98% rename from keyboards/ibm/model_m/teensypp/info.json rename to keyboards/ibm/model_m/teensypp/keyboard.json index dcbed72aebf..4464a299f6d 100644 --- a/keyboards/ibm/model_m/teensypp/info.json +++ b/keyboards/ibm/model_m/teensypp/keyboard.json @@ -15,6 +15,11 @@ "diode_direction": "ROW2COL", "processor": "at90usb1286", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ibm/model_m/teensypp/rules.mk b/keyboards/ibm/model_m/teensypp/rules.mk deleted file mode 100644 index 1eeda920b40..00000000000 --- a/keyboards/ibm/model_m/teensypp/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json index 37fddaaf8f1..0f67e6606d7 100644 --- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json +++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json @@ -6,7 +6,10 @@ "usb": { "vid": "0x16C0", "pid": "0x27DB", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "indicators": { "caps_lock": "C11", @@ -16,6 +19,12 @@ "processor": "STM32F446", // RET6 "bootloader": "stm32-dfu", "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "haptic": true + }, "matrix_pins": { // All pins in order from left-to-right, as seen on the keyboard: // C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10, diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk index 9131708828a..a521203b326 100644 --- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk +++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk @@ -1,17 +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 = 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 -ENCODER_ENABLE = no # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra - -HAPTIC_ENABLE = yes HAPTIC_DRIVER = solenoid diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/keyboard.json similarity index 99% rename from keyboards/ibnuda/squiggle/rev1/info.json rename to keyboards/ibnuda/squiggle/rev1/keyboard.json index 862b6323b02..3baafefc841 100644 --- a/keyboards/ibnuda/squiggle/rev1/info.json +++ b/keyboards/ibnuda/squiggle/rev1/keyboard.json @@ -19,6 +19,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "console": true + }, "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT": { diff --git a/keyboards/ibnuda/squiggle/rev1/rules.mk b/keyboards/ibnuda/squiggle/rev1/rules.mk deleted file mode 100644 index 2382d570350..00000000000 --- a/keyboards/ibnuda/squiggle/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 = 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 diff --git a/keyboards/idobao/id42/info.json b/keyboards/idobao/id42/keyboard.json similarity index 99% rename from keyboards/idobao/id42/info.json rename to keyboards/idobao/id42/keyboard.json index ace2033493b..14db7641eab 100644 --- a/keyboards/idobao/id42/info.json +++ b/keyboards/idobao/id42/keyboard.json @@ -10,7 +10,8 @@ "extrakey": true, "console": false, "command": false, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "ws2812": { "pin": "B3" diff --git a/keyboards/idobao/id42/rules.mk b/keyboards/idobao/id42/rules.mk deleted file mode 100755 index 58e39b17a55..00000000000 --- a/keyboards/idobao/id42/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# This file intentionally left blank -# ** settings are data driven & stored in `info.json` ** - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/keyboard.json similarity index 99% rename from keyboards/idobao/id61/info.json rename to keyboards/idobao/id61/keyboard.json index 0b1c51279de..cb55f1750dd 100644 --- a/keyboards/idobao/id61/info.json +++ b/keyboards/idobao/id61/keyboard.json @@ -10,7 +10,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "ws2812": { "pin": "F0" diff --git a/keyboards/idobao/id61/rules.mk b/keyboards/idobao/id61/rules.mk deleted file mode 100644 index ed51a576218..00000000000 --- a/keyboards/idobao/id61/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2022 Vino Rodrigues (@vinorodrigues) -# SPDX-License-Identifier: GPL-2.0-or-later -# ** settings are data driven & stored in `info.json` ** - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/idobao/id63/info.json b/keyboards/idobao/id63/keyboard.json similarity index 99% rename from keyboards/idobao/id63/info.json rename to keyboards/idobao/id63/keyboard.json index 573fb440303..1969ca4cf75 100644 --- a/keyboards/idobao/id63/info.json +++ b/keyboards/idobao/id63/keyboard.json @@ -10,7 +10,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "ws2812": { "pin": "B7" diff --git a/keyboards/idobao/id63/rules.mk b/keyboards/idobao/id63/rules.mk deleted file mode 100644 index 58e39b17a55..00000000000 --- a/keyboards/idobao/id63/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# This file intentionally left blank -# ** settings are data driven & stored in `info.json` ** - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/keyboard.json similarity index 99% rename from keyboards/idobao/id67/info.json rename to keyboards/idobao/id67/keyboard.json index 7c5308d3156..64c3623fd69 100644 --- a/keyboards/idobao/id67/info.json +++ b/keyboards/idobao/id67/keyboard.json @@ -10,7 +10,8 @@ "extrakey": true, "command": false, "console": false, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "ws2812": { "pin": "F0" diff --git a/keyboards/idobao/id67/rules.mk b/keyboards/idobao/id67/rules.mk deleted file mode 100644 index 4341508fde4..00000000000 --- a/keyboards/idobao/id67/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# -RGB_MATRIX_ENABLE = yes # Enable RGB Matrix feature diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/keyboard.json similarity index 99% rename from keyboards/idobao/id80/v3/ansi/info.json rename to keyboards/idobao/id80/v3/ansi/keyboard.json index 19dc8c67a70..6200c2e88c9 100644 --- a/keyboards/idobao/id80/v3/ansi/info.json +++ b/keyboards/idobao/id80/v3/ansi/keyboard.json @@ -10,7 +10,8 @@ "extrakey": true, "console": false, "command": false, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "rgb_matrix": { "animations": { diff --git a/keyboards/idobao/id80/v3/ansi/rules.mk b/keyboards/idobao/id80/v3/ansi/rules.mk deleted file mode 100644 index 58e39b17a55..00000000000 --- a/keyboards/idobao/id80/v3/ansi/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# This file intentionally left blank -# ** settings are data driven & stored in `info.json` ** - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/keyboard.json similarity index 99% rename from keyboards/idobao/id87/v2/info.json rename to keyboards/idobao/id87/v2/keyboard.json index 4a6099207c2..0ece932274f 100644 --- a/keyboards/idobao/id87/v2/info.json +++ b/keyboards/idobao/id87/v2/keyboard.json @@ -10,7 +10,8 @@ "extrakey": true, "console": false, "command": false, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "ws2812": { "pin": "E2" diff --git a/keyboards/idobao/id87/v2/rules.mk b/keyboards/idobao/id87/v2/rules.mk deleted file mode 100644 index 58e39b17a55..00000000000 --- a/keyboards/idobao/id87/v2/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# This file intentionally left blank -# ** settings are data driven & stored in `info.json` ** - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/keyboard.json similarity index 98% rename from keyboards/idobao/montex/v2/info.json rename to keyboards/idobao/montex/v2/keyboard.json index aefc3e45611..6c00fd538d5 100755 --- a/keyboards/idobao/montex/v2/info.json +++ b/keyboards/idobao/montex/v2/keyboard.json @@ -10,7 +10,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "ws2812": { "pin": "B1" diff --git a/keyboards/idobao/montex/v2/rules.mk b/keyboards/idobao/montex/v2/rules.mk deleted file mode 100755 index d249ac15a7c..00000000000 --- a/keyboards/idobao/montex/v2/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# This file intentionally mostly left blank -# ** settings are data driven & stored in `info.json` ** - -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/info.json index d9259d5f322..ec6422fb0ff 100644 --- a/keyboards/ingrained/info.json +++ b/keyboards/ingrained/info.json @@ -6,10 +6,20 @@ "usb": { "vid": "0xB33F", "pid": "0x58E4", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "unicode": true + }, + "build": { + "lto": true + }, "community_layouts": ["split_3x5_3", "split_3x6_3"], "layouts": { "LAYOUT_split_3x6_3": { diff --git a/keyboards/ingrained/rules.mk b/keyboards/ingrained/rules.mk index e9a8002f902..c04c3c92ed3 100644 --- a/keyboards/ingrained/rules.mk +++ b/keyboards/ingrained/rules.mk @@ -1,19 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # 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 -UNICODE_ENABLE = yes CUSTOM_MATRIX = lite -NO_USB_STARTUP_CHECK = yes -LTO_ENABLE = yes SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/inland/kb83/info.json b/keyboards/inland/kb83/info.json index b4396fb630e..31ca8f1bda9 100644 --- a/keyboards/inland/kb83/info.json +++ b/keyboards/inland/kb83/info.json @@ -34,6 +34,15 @@ }, "processor": "WB32FQ95", "bootloader": "wb32-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true, + "dip_switch": true, + "encoder": true + }, "matrix_pins": { "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] diff --git a/keyboards/inland/kb83/rules.mk b/keyboards/inland/kb83/rules.mk index aefdb5a168d..2bdd4fd92e8 100644 --- a/keyboards/inland/kb83/rules.mk +++ b/keyboards/inland/kb83/rules.mk @@ -1,17 +1 @@ -# 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 -KEYBOARD_SHARED_EP = no -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 -DIP_SWITCH_ENABLE = yes # DPI Switch -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes -#RGB_MATRIX_CUSTOM_USER = yes #Add turnoff LED +#RGB_MATRIX_CUSTOM_USER = yes diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json index 51bf7a5f126..6f47d72685f 100644 --- a/keyboards/input_club/ergodox_infinity/info.json +++ b/keyboards/input_club/ergodox_infinity/info.json @@ -43,6 +43,18 @@ }, "processor": "MK20DX256", "bootloader": "kiibohd", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "led_matrix": true, + "unicode": true, + "swap_hands": true, + "sleep_led": true, + "st7565": true + }, "board": "IC_TEENSY_3_1", "tapping": { "toggle": 1 diff --git a/keyboards/input_club/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk index da68a7f25d1..c6e29883213 100644 --- a/keyboards/input_club/ergodox_infinity/rules.mk +++ b/keyboards/input_club/ergodox_infinity/rules.mk @@ -1,20 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -UNICODE_ENABLE = yes # Unicode -SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard -SLEEP_LED_ENABLE = yes - -RGBLIGHT_ENABLE = no - SERIAL_DRIVER = usart - -ST7565_ENABLE = yes - -LED_MATRIX_ENABLE = yes From baa6000ed33f1f190f43bcd993f84f3b057e952d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:36:21 -0700 Subject: [PATCH 3/6] Data-Driven Keyboard Conversions: H, Part 3 (#23530) --- .../novem/{info.json => keyboard.json} | 5 +++++ keyboards/handwired/novem/rules.mk | 12 ------------ .../handwired/onekey/bluepill_f103c6/info.json | 3 +++ .../handwired/onekey/bluepill_f103c6/rules.mk | 3 --- .../onekey/kb2040/{info.json => keyboard.json} | 3 +++ keyboards/handwired/onekey/kb2040/rules.mk | 1 - .../orbweaver/{info.json => keyboard.json} | 3 ++- keyboards/handwired/orbweaver/rules.mk | 2 -- keyboards/handwired/ortho_brass/info.json | 6 ++++++ keyboards/handwired/ortho_brass/rules.mk | 10 ---------- .../osborne1/{info.json => keyboard.json} | 3 ++- keyboards/handwired/osborne1/rules.mk | 1 - keyboards/handwired/owlet60/info.json | 7 +++++++ keyboards/handwired/owlet60/rules.mk | 13 ------------- .../mini/{info.json => keyboard.json} | 9 ++++++++- keyboards/handwired/postageboard/mini/rules.mk | 12 ------------ .../r1/{info.json => keyboard.json} | 9 ++++++++- keyboards/handwired/postageboard/r1/rules.mk | 12 ------------ keyboards/handwired/promethium/info.json | 12 ++++++++++++ keyboards/handwired/promethium/rules.mk | 17 ----------------- keyboards/handwired/pterodactyl/info.json | 9 +++++++++ keyboards/handwired/pterodactyl/rules.mk | 14 -------------- .../riblee_f401/{info.json => keyboard.json} | 12 +++++++++++- keyboards/handwired/riblee_f401/rules.mk | 13 ------------- .../riblee_f411/{info.json => keyboard.json} | 11 ++++++++++- keyboards/handwired/riblee_f411/rules.mk | 13 ------------- .../scottoslant/{info.json => keyboard.json} | 3 +++ .../handwired/scottokeebs/scottoslant/rules.mk | 1 - keyboards/handwired/slash/info.json | 6 ++++++ keyboards/handwired/slash/rules.mk | 14 -------------- keyboards/handwired/split65/stm32/info.json | 7 +++++++ keyboards/handwired/split65/stm32/rules.mk | 13 ------------- .../handwired/splittest/bluepill/keyboard.json | 8 +++++++- .../handwired/splittest/promicro/keyboard.json | 8 +++++++- keyboards/handwired/splittest/rules.mk | 12 ------------ .../handwired/splittest/teensy_2/keyboard.json | 8 +++++++- keyboards/handwired/trackpoint/info.json | 9 +++++++++ keyboards/handwired/trackpoint/rules.mk | 14 -------------- .../tractyl_manuform/4x6_right/info.json | 7 +++++++ .../tractyl_manuform/4x6_right/rules.mk | 15 --------------- .../elite_c/{info.json => keyboard.json} | 5 ++++- .../tractyl_manuform/5x6_right/elite_c/rules.mk | 5 ----- .../tractyl_manuform/5x6_right/f303/info.json | 5 ++++- .../tractyl_manuform/5x6_right/f303/rules.mk | 1 - .../tractyl_manuform/5x6_right/f411/info.json | 3 +++ .../tractyl_manuform/5x6_right/f411/rules.mk | 1 - .../tractyl_manuform/5x6_right/info.json | 8 ++++++++ .../tractyl_manuform/5x6_right/rules.mk | 15 --------------- keyboards/handwired/twadlee/tp69/info.json | 7 +++++++ keyboards/handwired/twadlee/tp69/rules.mk | 15 --------------- keyboards/handwired/unk/rev1/keyboard.json | 6 ++++++ keyboards/handwired/unk/rules.mk | 13 ------------- keyboards/handwired/uthol/rev3/info.json | 9 +++++++++ keyboards/handwired/uthol/rev3/rules.mk | 10 ---------- keyboards/handwired/wulkan/info.json | 6 ++++++ keyboards/handwired/wulkan/rules.mk | 12 ------------ keyboards/handwired/xealous/rev1/keyboard.json | 9 +++++++++ keyboards/handwired/xealous/rules.mk | 13 ------------- 58 files changed, 195 insertions(+), 288 deletions(-) rename keyboards/handwired/novem/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/handwired/novem/rules.mk rename keyboards/handwired/onekey/kb2040/{info.json => keyboard.json} (83%) delete mode 100644 keyboards/handwired/onekey/kb2040/rules.mk rename keyboards/handwired/orbweaver/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/handwired/orbweaver/rules.mk rename keyboards/handwired/osborne1/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/handwired/osborne1/rules.mk rename keyboards/handwired/postageboard/mini/{info.json => keyboard.json} (53%) delete mode 100644 keyboards/handwired/postageboard/mini/rules.mk rename keyboards/handwired/postageboard/r1/{info.json => keyboard.json} (53%) delete mode 100644 keyboards/handwired/postageboard/r1/rules.mk rename keyboards/handwired/riblee_f401/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/handwired/riblee_f401/rules.mk rename keyboards/handwired/riblee_f411/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/handwired/riblee_f411/rules.mk rename keyboards/handwired/scottokeebs/scottoslant/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/handwired/scottokeebs/scottoslant/rules.mk rename keyboards/handwired/tractyl_manuform/5x6_right/elite_c/{info.json => keyboard.json} (88%) delete mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk diff --git a/keyboards/handwired/novem/info.json b/keyboards/handwired/novem/keyboard.json similarity index 90% rename from keyboards/handwired/novem/info.json rename to keyboards/handwired/novem/keyboard.json index bc70d64ed44..bc4fe2c1c95 100644 --- a/keyboards/handwired/novem/info.json +++ b/keyboards/handwired/novem/keyboard.json @@ -15,6 +15,11 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/novem/rules.mk b/keyboards/handwired/novem/rules.mk deleted file mode 100644 index ca9d24172d0..00000000000 --- a/keyboards/handwired/novem/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/info.json index 9460b43f5f4..4267222cfc9 100644 --- a/keyboards/handwired/onekey/bluepill_f103c6/info.json +++ b/keyboards/handwired/onekey/bluepill_f103c6/info.json @@ -15,5 +15,8 @@ "apa102": { "data_pin": "A1", "clock_pin": "A2" + }, + "build": { + "lto": true } } diff --git a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk index 71bc488563a..c37cc1dc1fa 100644 --- a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk +++ b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk @@ -7,9 +7,6 @@ BOOTLOADER_TYPE = stm32duino DFU_ARGS = -d 1EAF:0003 -a 2 -R DFU_SUFFIX_ARGS = -v 1EAF -p 0003 -# LTO is required to fit the firmware into the available 24K of flash -LTO_ENABLE = yes - # EEPROM emulation not supported yet (need to implement a proper firmware size # check first, otherwise the chance of the EEPROM backing store overwriting # some part of the firmware code is really high). diff --git a/keyboards/handwired/onekey/kb2040/info.json b/keyboards/handwired/onekey/kb2040/keyboard.json similarity index 83% rename from keyboards/handwired/onekey/kb2040/info.json rename to keyboards/handwired/onekey/kb2040/keyboard.json index 5c0c92ef5de..3c099342271 100644 --- a/keyboards/handwired/onekey/kb2040/info.json +++ b/keyboards/handwired/onekey/kb2040/keyboard.json @@ -8,5 +8,8 @@ "ws2812": { "pin": "GP17", "driver": "vendor" + }, + "features": { + "oled": true } } diff --git a/keyboards/handwired/onekey/kb2040/rules.mk b/keyboards/handwired/onekey/kb2040/rules.mk deleted file mode 100644 index dd68e9d3b09..00000000000 --- a/keyboards/handwired/onekey/kb2040/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = yes diff --git a/keyboards/handwired/orbweaver/info.json b/keyboards/handwired/orbweaver/keyboard.json similarity index 97% rename from keyboards/handwired/orbweaver/info.json rename to keyboards/handwired/orbweaver/keyboard.json index 14c87182563..5ba08dfc2d5 100644 --- a/keyboards/handwired/orbweaver/info.json +++ b/keyboards/handwired/orbweaver/keyboard.json @@ -10,7 +10,8 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "rgb_matrix": true }, "rgb_matrix": { "center_point": [40, 30], diff --git a/keyboards/handwired/orbweaver/rules.mk b/keyboards/handwired/orbweaver/rules.mk deleted file mode 100644 index 01f9d9397ae..00000000000 --- a/keyboards/handwired/orbweaver/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# Add support for 3731 RGB matrix controller -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/info.json index b2280b62040..5cd01b1f6d6 100644 --- a/keyboards/handwired/ortho_brass/info.json +++ b/keyboards/handwired/ortho_brass/info.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true + }, "community_layouts": ["ortho_4x12"], "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" diff --git a/keyboards/handwired/ortho_brass/rules.mk b/keyboards/handwired/ortho_brass/rules.mk index 36acc6fd924..6642cf3a9c4 100644 --- a/keyboards/handwired/ortho_brass/rules.mk +++ b/keyboards/handwired/ortho_brass/rules.mk @@ -1,11 +1 @@ -# Build Options -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 -RGBLIGHT_ENABLE = no # Enable RGB underlight. - RGBLIGHT_SUPPORTED = no diff --git a/keyboards/handwired/osborne1/info.json b/keyboards/handwired/osborne1/keyboard.json similarity index 98% rename from keyboards/handwired/osborne1/info.json rename to keyboards/handwired/osborne1/keyboard.json index 2f613b5876d..8cbcb3cc8bb 100644 --- a/keyboards/handwired/osborne1/info.json +++ b/keyboards/handwired/osborne1/keyboard.json @@ -10,7 +10,8 @@ "console": true, "extrakey": false, "mousekey": false, - "nkro": false + "nkro": false, + "bluetooth": true }, "bluetooth": { "driver": "bluefruit_le" diff --git a/keyboards/handwired/osborne1/rules.mk b/keyboards/handwired/osborne1/rules.mk deleted file mode 100644 index 9ccac102c70..00000000000 --- a/keyboards/handwired/osborne1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -BLUETOOTH_ENABLE = yes diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json index f6bd2d2f239..8108f51985d 100644 --- a/keyboards/handwired/owlet60/info.json +++ b/keyboards/handwired/owlet60/info.json @@ -32,6 +32,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "debounce": 9, "community_layouts": ["alice", "alice_split_bs"], "layout_aliases": { diff --git a/keyboards/handwired/owlet60/rules.mk b/keyboards/handwired/owlet60/rules.mk index dd125034f29..09c02c88b0d 100644 --- a/keyboards/handwired/owlet60/rules.mk +++ b/keyboards/handwired/owlet60/rules.mk @@ -1,16 +1,3 @@ -# 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 = 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 = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = yes -OLED_ENABLE = no SRC += matrix.c diff --git a/keyboards/handwired/postageboard/mini/info.json b/keyboards/handwired/postageboard/mini/keyboard.json similarity index 53% rename from keyboards/handwired/postageboard/mini/info.json rename to keyboards/handwired/postageboard/mini/keyboard.json index b6944f2916d..13e83147bbd 100644 --- a/keyboards/handwired/postageboard/mini/info.json +++ b/keyboards/handwired/postageboard/mini/keyboard.json @@ -8,5 +8,12 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + } } diff --git a/keyboards/handwired/postageboard/mini/rules.mk b/keyboards/handwired/postageboard/mini/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/handwired/postageboard/mini/rules.mk +++ /dev/null @@ -1,12 +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 = yes # 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 diff --git a/keyboards/handwired/postageboard/r1/info.json b/keyboards/handwired/postageboard/r1/keyboard.json similarity index 53% rename from keyboards/handwired/postageboard/r1/info.json rename to keyboards/handwired/postageboard/r1/keyboard.json index a1ea87df869..78ab5d028e0 100644 --- a/keyboards/handwired/postageboard/r1/info.json +++ b/keyboards/handwired/postageboard/r1/keyboard.json @@ -8,5 +8,12 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + } } diff --git a/keyboards/handwired/postageboard/r1/rules.mk b/keyboards/handwired/postageboard/r1/rules.mk deleted file mode 100644 index 309e55c9f4c..00000000000 --- a/keyboards/handwired/postageboard/r1/rules.mk +++ /dev/null @@ -1,12 +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 = yes # 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 diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json index c26325069b4..6ee1ed8ca19 100644 --- a/keyboards/handwired/promethium/info.json +++ b/keyboards/handwired/promethium/info.json @@ -16,6 +16,18 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "ps2_mouse": true, + "ps2": true, + "bluetooth": true + }, + "build": { + "lto": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/promethium/rules.mk b/keyboards/handwired/promethium/rules.mk index d6b97ed8100..7f208800663 100644 --- a/keyboards/handwired/promethium/rules.mk +++ b/keyboards/handwired/promethium/rules.mk @@ -1,28 +1,11 @@ # Processor frequency F_CPU = 8000000 -# 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 = 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. -PS2_MOUSE_ENABLE = yes -PS2_ENABLE = yes PS2_DRIVER = interrupt CUSTOM_MATRIX = yes -BLUETOOTH_ENABLE = yes WS2812_DRIVER_REQUIRED = yes ANALOG_DRIVER_REQUIRED = yes SRC += rgbsps.c SRC += matrix.c - -LTO_ENABLE = yes diff --git a/keyboards/handwired/pterodactyl/info.json b/keyboards/handwired/pterodactyl/info.json index ad83f34999d..fac20aeebe1 100644 --- a/keyboards/handwired/pterodactyl/info.json +++ b/keyboards/handwired/pterodactyl/info.json @@ -10,6 +10,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "nkro": true, + "unicode": true, + "bluetooth": true + }, "debounce": 0, "tapping": { "toggle": 1 diff --git a/keyboards/handwired/pterodactyl/rules.mk b/keyboards/handwired/pterodactyl/rules.mk index 108e1498a83..e332a03eaac 100644 --- a/keyboards/handwired/pterodactyl/rules.mk +++ b/keyboards/handwired/pterodactyl/rules.mk @@ -1,21 +1,7 @@ # Processor frequency F_CPU = 8000000 -# 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes CUSTOM_MATRIX = yes -BLUETOOTH_ENABLE = yes SRC += matrix.c I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/keyboard.json similarity index 93% rename from keyboards/handwired/riblee_f401/info.json rename to keyboards/handwired/riblee_f401/keyboard.json index 933973d5f39..18d46b55cd0 100644 --- a/keyboards/handwired/riblee_f401/info.json +++ b/keyboards/handwired/riblee_f401/keyboard.json @@ -6,7 +6,10 @@ "usb": { "vid": "0xFEED", "pid": "0x002A", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "tapping": { "term": 175 @@ -22,6 +25,13 @@ }, "processor": "STM32F401", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true + }, "board": "BLACKPILL_STM32_F401", "community_layouts": ["ortho_5x12"], "layouts": { diff --git a/keyboards/handwired/riblee_f401/rules.mk b/keyboards/handwired/riblee_f401/rules.mk deleted file mode 100644 index 4c2d255a184..00000000000 --- a/keyboards/handwired/riblee_f401/rules.mk +++ /dev/null @@ -1,13 +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 -KEYBOARD_SHARED_EP = yes -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/riblee_f411/info.json b/keyboards/handwired/riblee_f411/keyboard.json similarity index 94% rename from keyboards/handwired/riblee_f411/info.json rename to keyboards/handwired/riblee_f411/keyboard.json index 1c957e99404..9c7df63b3e1 100644 --- a/keyboards/handwired/riblee_f411/info.json +++ b/keyboards/handwired/riblee_f411/keyboard.json @@ -6,7 +6,10 @@ "usb": { "vid": "0xFEED", "pid": "0x002B", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "tapping": { "term": 175 @@ -18,6 +21,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "board": "BLACKPILL_STM32_F411", "community_layouts": ["ortho_5x12"], "layouts": { diff --git a/keyboards/handwired/riblee_f411/rules.mk b/keyboards/handwired/riblee_f411/rules.mk deleted file mode 100644 index 4741169e4db..00000000000 --- a/keyboards/handwired/riblee_f411/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra -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 diff --git a/keyboards/handwired/scottokeebs/scottoslant/info.json b/keyboards/handwired/scottokeebs/scottoslant/keyboard.json similarity index 98% rename from keyboards/handwired/scottokeebs/scottoslant/info.json rename to keyboards/handwired/scottokeebs/scottoslant/keyboard.json index ebaa1b530c2..8c9de39cd6d 100644 --- a/keyboards/handwired/scottokeebs/scottoslant/info.json +++ b/keyboards/handwired/scottokeebs/scottoslant/keyboard.json @@ -12,6 +12,9 @@ "mousekey": true, "nkro": true }, + "build": { + "lto": true + }, "matrix_pins": { "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"], "rows": ["B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/scottokeebs/scottoslant/rules.mk b/keyboards/handwired/scottokeebs/scottoslant/rules.mk deleted file mode 100644 index 4da205a168c..00000000000 --- a/keyboards/handwired/scottokeebs/scottoslant/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes diff --git a/keyboards/handwired/slash/info.json b/keyboards/handwired/slash/info.json index 95abaeb9c71..4fd99ebeee3 100644 --- a/keyboards/handwired/slash/info.json +++ b/keyboards/handwired/slash/info.json @@ -18,6 +18,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "bluetooth": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/slash/rules.mk b/keyboards/handwired/slash/rules.mk index ca7f6f843fb..3437a35bdf1 100644 --- a/keyboards/handwired/slash/rules.mk +++ b/keyboards/handwired/slash/rules.mk @@ -1,16 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # 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 -BLUETOOTH_ENABLE = yes diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json index a9693b3a5b9..d49339da021 100644 --- a/keyboards/handwired/split65/stm32/info.json +++ b/keyboards/handwired/split65/stm32/info.json @@ -11,6 +11,13 @@ }, "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "audio": true, + "oled": true + }, "board": "QMK_PROTON_C", "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/split65/stm32/rules.mk b/keyboards/handwired/split65/stm32/rules.mk index 94186bf8c72..c6e29883213 100644 --- a/keyboards/handwired/split65/stm32/rules.mk +++ b/keyboards/handwired/split65/stm32/rules.mk @@ -1,14 +1 @@ -# 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 = yes # Audio output -OLED_ENABLE = yes SERIAL_DRIVER = usart diff --git a/keyboards/handwired/splittest/bluepill/keyboard.json b/keyboards/handwired/splittest/bluepill/keyboard.json index 17b7f86a6f8..28e7d091f83 100644 --- a/keyboards/handwired/splittest/bluepill/keyboard.json +++ b/keyboards/handwired/splittest/bluepill/keyboard.json @@ -5,5 +5,11 @@ }, "diode_direction": "COL2ROW", "processor": "STM32F103", - "bootloader": "stm32duino" + "bootloader": "stm32duino", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "console": true + } } diff --git a/keyboards/handwired/splittest/promicro/keyboard.json b/keyboards/handwired/splittest/promicro/keyboard.json index f3765207656..2f5929cc008 100644 --- a/keyboards/handwired/splittest/promicro/keyboard.json +++ b/keyboards/handwired/splittest/promicro/keyboard.json @@ -11,5 +11,11 @@ "pin": "D3" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "console": true + } } diff --git a/keyboards/handwired/splittest/rules.mk b/keyboards/handwired/splittest/rules.mk index 8d00fcc579f..ae4d823b53e 100644 --- a/keyboards/handwired/splittest/rules.mk +++ b/keyboards/handwired/splittest/rules.mk @@ -1,13 +1 @@ -# 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 = 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 -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = handwired/splittest/promicro diff --git a/keyboards/handwired/splittest/teensy_2/keyboard.json b/keyboards/handwired/splittest/teensy_2/keyboard.json index 72e9d022b94..68ab3f92c4e 100644 --- a/keyboards/handwired/splittest/teensy_2/keyboard.json +++ b/keyboards/handwired/splittest/teensy_2/keyboard.json @@ -11,5 +11,11 @@ "pin": "D3" }, "processor": "atmega32u4", - "bootloader": "halfkay" + "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "console": true + } } diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/info.json index 92098b09c64..94ed022878f 100644 --- a/keyboards/handwired/trackpoint/info.json +++ b/keyboards/handwired/trackpoint/info.json @@ -15,6 +15,15 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "ps2": true, + "ps2_mouse": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/trackpoint/rules.mk b/keyboards/handwired/trackpoint/rules.mk index ca3836ef06b..74035c9903b 100644 --- a/keyboards/handwired/trackpoint/rules.mk +++ b/keyboards/handwired/trackpoint/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - -PS2_MOUSE_ENABLE = yes -PS2_ENABLE = yes PS2_DRIVER = usart diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json index aa01e763eb4..825c59ac725 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json @@ -29,6 +29,13 @@ }, "processor": "at90usb1286", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "pointing_device": true + }, "layouts": { "LAYOUT_4x6_right": { "layout": [ diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk index 0b23bdc61ff..0f3d0657aa4 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk +++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk @@ -1,17 +1,2 @@ -# 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 = no - -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = yes diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json similarity index 88% rename from keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json rename to keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json index 92e0baace1f..e6c0e42bde9 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json @@ -22,5 +22,8 @@ "split_count": [10, 10] }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "build": { + "lto": true + } } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk deleted file mode 100644 index 16c76d7f49b..00000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -LTO_ENABLE := yes -RGBLIGHT_ENABLE = no -OLED_ENABLE = no -AUDIO_ENABLE = no -ENCODER_ENABLE = no diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json index eafb77fce2b..0bcc02fd743 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json @@ -22,5 +22,8 @@ ] }, "processor": "STM32F303", - "bootloader": "stm32-dfu" + "bootloader": "stm32-dfu", + "features": { + "console": true + } } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk index ab601e31f9a..23f790a1ad4 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk @@ -1,5 +1,4 @@ # KEYBOARD_SHARED_EP = yes -CONSOLE_ENABLE = yes SERIAL_DRIVER = usart AUDIO_DRIVER = dac_additive diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json index e5a6dc6c7a2..3821f0380f2 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json @@ -26,5 +26,8 @@ }, "processor": "STM32F411", "bootloader": "stm32-dfu", + "features": { + "console": true + }, "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk index 0c4b05ee7e2..e75692030f7 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk @@ -1,5 +1,4 @@ KEYBOARD_SHARED_EP = yes -CONSOLE_ENABLE = yes MOUSE_SHARED_EP = yes SERIAL_DRIVER = usart diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json index c9fe6e89cff..b28f309fdbb 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json @@ -10,6 +10,14 @@ "matrix": [6, 5] } }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "swap_hands": true, + "pointing_device": true + }, "layouts": { "LAYOUT_5x6_right": { "layout": [ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk index 220a361a4cc..b7f7c949ec4 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk @@ -1,18 +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 -SWAP_HANDS_ENABLE = yes - -POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pmw3360 MOUSE_SHARED_EP = yes diff --git a/keyboards/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/info.json index afd79a9bcc6..27e0325f92d 100644 --- a/keyboards/handwired/twadlee/tp69/info.json +++ b/keyboards/handwired/twadlee/tp69/info.json @@ -15,6 +15,13 @@ "diode_direction": "COL2ROW", "processor": "MKL26Z64", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/twadlee/tp69/rules.mk b/keyboards/handwired/twadlee/tp69/rules.mk index b73afc0e44a..43b04f34f77 100644 --- a/keyboards/handwired/twadlee/tp69/rules.mk +++ b/keyboards/handwired/twadlee/tp69/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # 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 -PS2_MOUSE_ENABLE = no - USE_CHIBIOS_CONTRIB = yes - diff --git a/keyboards/handwired/unk/rev1/keyboard.json b/keyboards/handwired/unk/rev1/keyboard.json index fc1cfc90b72..acaca15f3b3 100644 --- a/keyboards/handwired/unk/rev1/keyboard.json +++ b/keyboards/handwired/unk/rev1/keyboard.json @@ -31,6 +31,12 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/unk/rules.mk b/keyboards/handwired/unk/rules.mk index a03f28dbf5f..d4536e0cbb6 100644 --- a/keyboards/handwired/unk/rules.mk +++ b/keyboards/handwired/unk/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # 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 - DEFAULT_FOLDER = handwired/unk/rev1 diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json index dbbce9139dc..a90e7a4a895 100644 --- a/keyboards/handwired/uthol/rev3/info.json +++ b/keyboards/handwired/uthol/rev3/info.json @@ -39,5 +39,14 @@ }, "processor": "STM32F401", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "nkro": true, + "oled": true, + "wpm": true, + "extrakey": true, + "encoder": true, + "rgblight": true + }, "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/handwired/uthol/rev3/rules.mk b/keyboards/handwired/uthol/rev3/rules.mk index 1577cf8a775..1071cf62ee3 100644 --- a/keyboards/handwired/uthol/rev3/rules.mk +++ b/keyboards/handwired/uthol/rev3/rules.mk @@ -1,11 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes -NKRO_ENABLE = yes KEYBOARD_SHARED_EP = yes -OLED_ENABLE = yes -WPM_ENABLE = yes -EXTRAKEY_ENABLE = yes -ENCODER_ENABLE = yes -RGBLIGHT_ENABLE = yes diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/info.json index 9bb1d9cd940..b6823af5396 100644 --- a/keyboards/handwired/wulkan/info.json +++ b/keyboards/handwired/wulkan/info.json @@ -16,6 +16,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "board": "QMK_PROTON_C", "community_layouts": ["ortho_4x12"], "layout_aliases": { diff --git a/keyboards/handwired/wulkan/rules.mk b/keyboards/handwired/wulkan/rules.mk index e664c345408..934dd273a65 100644 --- a/keyboards/handwired/wulkan/rules.mk +++ b/keyboards/handwired/wulkan/rules.mk @@ -1,13 +1 @@ -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = no -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 -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no NO_SUSPEND_POWER_DOWN = yes diff --git a/keyboards/handwired/xealous/rev1/keyboard.json b/keyboards/handwired/xealous/rev1/keyboard.json index 001cd82074c..9f926a36021 100644 --- a/keyboards/handwired/xealous/rev1/keyboard.json +++ b/keyboards/handwired/xealous/rev1/keyboard.json @@ -22,6 +22,15 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "audio": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk index aa77674920d..4a97d066df7 100644 --- a/keyboards/handwired/xealous/rules.mk +++ b/keyboards/handwired/xealous/rules.mk @@ -1,16 +1,3 @@ -# 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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - SRC += matrix.c DEFAULT_FOLDER = handwired/xealous/rev1 From e869c80af74a91d28e51628da495e66da0cbc3ce Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 17 Apr 2024 02:49:17 +0100 Subject: [PATCH 4/6] Migrate build target markers to keyboard.json - HI (#23540) --- .../hadron/ver3/{info.json => keyboard.json} | 0 .../halfcliff/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../handwired/42/{info.json => keyboard.json} | 0 .../aball/{info.json => keyboard.json} | 0 .../alcor_dactyl/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../bdn9_ble/{info.json => keyboard.json} | 0 .../cyberstar/{info.json => keyboard.json} | 0 .../d48/{info.json => keyboard.json} | 0 .../dactyl/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../datahand/{info.json => keyboard.json} | 0 .../dqz11n1g/{info.json => keyboard.json} | 0 .../frenchdev/{info.json => keyboard.json} | 0 .../fruity60/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../lagrange/{info.json => keyboard.json} | 0 .../5x5_macropad/{info.json => keyboard.json} | 0 .../f411/{info.json => keyboard.json} | 0 .../meck_tkl/blackpill_f401/info.json | 14 ----- .../keyboard.json} | 23 ++++++++- .../meck_tkl/blackpill_f401/rules.mk | 4 -- keyboards/handwired/meck_tkl/config.h | 9 ---- .../{info.json => keyboard.json} | 5 ++ .../handwired/onekey/blackpill_f401/rules.mk | 1 - .../{info.json => keyboard.json} | 5 ++ .../onekey/blackpill_f401_tinyuf2/rules.mk | 1 - .../{info.json => keyboard.json} | 5 ++ .../handwired/onekey/blackpill_f411/rules.mk | 1 - .../{info.json => keyboard.json} | 5 ++ .../onekey/blackpill_f411_tinyuf2/rules.mk | 1 - .../{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../evb_wb32fq95/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../teensy_lc/{info.json => keyboard.json} | 0 .../ortho_brass/{info.json => keyboard.json} | 0 .../owlet60/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 5 ++ .../handwired/pill60/blackpill_f401/rules.mk | 4 -- .../{info.json => keyboard.json} | 5 ++ .../handwired/pill60/blackpill_f411/rules.mk | 4 -- .../feather/{info.json => keyboard.json} | 10 ++++ keyboards/handwired/prkl30/feather/rules.mk | 16 ------ .../promethium/{info.json => keyboard.json} | 0 .../pterodactyl/{info.json => keyboard.json} | 0 .../riblee_split/{info.json => keyboard.json} | 0 .../slash/{info.json => keyboard.json} | 0 .../stm32/{info.json => keyboard.json} | 0 .../trackpoint/{info.json => keyboard.json} | 0 .../4x6_right/{info.json => keyboard.json} | 0 .../f303/{info.json => keyboard.json} | 0 .../f411/{info.json => keyboard.json} | 0 .../twadlee/tp69/{info.json => keyboard.json} | 0 .../uthol/rev3/{info.json => keyboard.json} | 5 +- keyboards/handwired/uthol/rev3/rules.mk | 1 - .../wulkan/{info.json => keyboard.json} | 0 .../handwire/{info.json => keyboard.json} | 0 .../bad_wings/{info.json => keyboard.json} | 0 .../ansi/32u2/{info.json => keyboard.json} | 0 .../hhkb/jp/{info.json => keyboard.json} | 0 .../hhkb/yang/{info.json => keyboard.json} | 0 .../46/0_1/{info.json => keyboard.json} | 0 keyboards/hillside/46/0_1/rules.mk | 5 -- .../48/0_1/{info.json => keyboard.json} | 0 keyboards/hillside/48/0_1/rules.mk | 5 -- .../52/0_1/{info.json => keyboard.json} | 0 keyboards/hillside/52/0_1/rules.mk | 5 -- .../hbcp/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../lemon40/{info.json => keyboard.json} | 0 .../nyx/rev1/{info.json => keyboard.json} | 0 keyboards/hotdox/{info.json => keyboard.json} | 0 .../hs60/v1/{info.json => keyboard.json} | 0 .../hs60/v2/ansi/{info.json => keyboard.json} | 0 .../hs60/v2/hhkb/{info.json => keyboard.json} | 0 .../hs60/v2/iso/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../ingrained/{info.json => keyboard.json} | 0 .../inland/kb83/{info.json => keyboard.json} | 0 keyboards/inland/kb83/rgb_matrix_kb.inc | 51 ------------------- keyboards/inland/kb83/rules.mk | 1 - .../{info.json => keyboard.json} | 0 84 files changed, 66 insertions(+), 125 deletions(-) rename keyboards/hadron/ver3/{info.json => keyboard.json} (100%) rename keyboards/halfcliff/{info.json => keyboard.json} (100%) rename keyboards/handwired/108key_trackpoint/{info.json => keyboard.json} (100%) rename keyboards/handwired/42/{info.json => keyboard.json} (100%) rename keyboards/handwired/aball/{info.json => keyboard.json} (100%) rename keyboards/handwired/alcor_dactyl/{info.json => keyboard.json} (100%) rename keyboards/handwired/battleship_gamepad/{info.json => keyboard.json} (100%) rename keyboards/handwired/bdn9_ble/{info.json => keyboard.json} (100%) rename keyboards/handwired/cyberstar/{info.json => keyboard.json} (100%) rename keyboards/handwired/d48/{info.json => keyboard.json} (100%) rename keyboards/handwired/dactyl/{info.json => keyboard.json} (100%) rename keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/{info.json => keyboard.json} (100%) rename keyboards/handwired/datahand/{info.json => keyboard.json} (100%) rename keyboards/handwired/dqz11n1g/{info.json => keyboard.json} (100%) rename keyboards/handwired/frenchdev/{info.json => keyboard.json} (100%) rename keyboards/handwired/fruity60/{info.json => keyboard.json} (100%) rename keyboards/handwired/jankrp2040dactyl/{info.json => keyboard.json} (100%) rename keyboards/handwired/lagrange/{info.json => keyboard.json} (100%) rename keyboards/handwired/m40/5x5_macropad/{info.json => keyboard.json} (100%) rename keyboards/handwired/macroboard/f411/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/meck_tkl/blackpill_f401/info.json rename keyboards/handwired/meck_tkl/{info.json => blackpill_f401/keyboard.json} (89%) delete mode 100644 keyboards/handwired/meck_tkl/blackpill_f401/rules.mk delete mode 100644 keyboards/handwired/meck_tkl/config.h rename keyboards/handwired/onekey/blackpill_f401/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/handwired/onekey/blackpill_f401/rules.mk rename keyboards/handwired/onekey/blackpill_f401_tinyuf2/{info.json => keyboard.json} (80%) delete mode 100755 keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk rename keyboards/handwired/onekey/blackpill_f411/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/handwired/onekey/blackpill_f411/rules.mk rename keyboards/handwired/onekey/blackpill_f411_tinyuf2/{info.json => keyboard.json} (80%) delete mode 100755 keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk rename keyboards/handwired/onekey/bluepill_f103c6/{info.json => keyboard.json} (100%) rename keyboards/handwired/onekey/evb_wb32f3g71/{info.json => keyboard.json} (100%) rename keyboards/handwired/onekey/evb_wb32fq95/{info.json => keyboard.json} (100%) rename keyboards/handwired/onekey/sipeed_longan_nano/{info.json => keyboard.json} (100%) rename keyboards/handwired/onekey/teensy_lc/{info.json => keyboard.json} (100%) rename keyboards/handwired/ortho_brass/{info.json => keyboard.json} (100%) rename keyboards/handwired/owlet60/{info.json => keyboard.json} (100%) rename keyboards/handwired/pill60/blackpill_f401/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/handwired/pill60/blackpill_f401/rules.mk rename keyboards/handwired/pill60/blackpill_f411/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/handwired/pill60/blackpill_f411/rules.mk rename keyboards/handwired/prkl30/feather/{info.json => keyboard.json} (78%) rename keyboards/handwired/promethium/{info.json => keyboard.json} (100%) rename keyboards/handwired/pterodactyl/{info.json => keyboard.json} (100%) rename keyboards/handwired/riblee_split/{info.json => keyboard.json} (100%) rename keyboards/handwired/slash/{info.json => keyboard.json} (100%) rename keyboards/handwired/split65/stm32/{info.json => keyboard.json} (100%) rename keyboards/handwired/trackpoint/{info.json => keyboard.json} (100%) rename keyboards/handwired/tractyl_manuform/4x6_right/{info.json => keyboard.json} (100%) rename keyboards/handwired/tractyl_manuform/5x6_right/f303/{info.json => keyboard.json} (100%) rename keyboards/handwired/tractyl_manuform/5x6_right/f411/{info.json => keyboard.json} (100%) rename keyboards/handwired/twadlee/tp69/{info.json => keyboard.json} (100%) rename keyboards/handwired/uthol/rev3/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/handwired/uthol/rev3/rules.mk rename keyboards/handwired/wulkan/{info.json => keyboard.json} (100%) rename keyboards/hardwareabstraction/handwire/{info.json => keyboard.json} (100%) rename keyboards/hazel/bad_wings/{info.json => keyboard.json} (100%) rename keyboards/hhkb/ansi/32u2/{info.json => keyboard.json} (100%) rename keyboards/hhkb/jp/{info.json => keyboard.json} (100%) rename keyboards/hhkb/yang/{info.json => keyboard.json} (100%) rename keyboards/hillside/46/0_1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hillside/46/0_1/rules.mk rename keyboards/hillside/48/0_1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hillside/48/0_1/rules.mk rename keyboards/hillside/52/0_1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hillside/52/0_1/rules.mk rename keyboards/hineybush/hbcp/{info.json => keyboard.json} (100%) rename keyboards/horrortroll/handwired_k552/{info.json => keyboard.json} (100%) rename keyboards/horrortroll/lemon40/{info.json => keyboard.json} (100%) rename keyboards/horrortroll/nyx/rev1/{info.json => keyboard.json} (100%) rename keyboards/hotdox/{info.json => keyboard.json} (100%) rename keyboards/hs60/v1/{info.json => keyboard.json} (100%) rename keyboards/hs60/v2/ansi/{info.json => keyboard.json} (100%) rename keyboards/hs60/v2/hhkb/{info.json => keyboard.json} (100%) rename keyboards/hs60/v2/iso/{info.json => keyboard.json} (100%) rename keyboards/ibm/model_m_4th_gen/overnumpad_1xb/{info.json => keyboard.json} (100%) rename keyboards/ingrained/{info.json => keyboard.json} (100%) rename keyboards/inland/kb83/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/inland/kb83/rgb_matrix_kb.inc delete mode 100644 keyboards/inland/kb83/rules.mk rename keyboards/input_club/ergodox_infinity/{info.json => keyboard.json} (100%) diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/keyboard.json similarity index 100% rename from keyboards/hadron/ver3/info.json rename to keyboards/hadron/ver3/keyboard.json diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/keyboard.json similarity index 100% rename from keyboards/halfcliff/info.json rename to keyboards/halfcliff/keyboard.json diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/keyboard.json similarity index 100% rename from keyboards/handwired/108key_trackpoint/info.json rename to keyboards/handwired/108key_trackpoint/keyboard.json diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/keyboard.json similarity index 100% rename from keyboards/handwired/42/info.json rename to keyboards/handwired/42/keyboard.json diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/keyboard.json similarity index 100% rename from keyboards/handwired/aball/info.json rename to keyboards/handwired/aball/keyboard.json diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/keyboard.json similarity index 100% rename from keyboards/handwired/alcor_dactyl/info.json rename to keyboards/handwired/alcor_dactyl/keyboard.json diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/keyboard.json similarity index 100% rename from keyboards/handwired/battleship_gamepad/info.json rename to keyboards/handwired/battleship_gamepad/keyboard.json diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/keyboard.json similarity index 100% rename from keyboards/handwired/bdn9_ble/info.json rename to keyboards/handwired/bdn9_ble/keyboard.json diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/keyboard.json similarity index 100% rename from keyboards/handwired/cyberstar/info.json rename to keyboards/handwired/cyberstar/keyboard.json diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/keyboard.json similarity index 100% rename from keyboards/handwired/d48/info.json rename to keyboards/handwired/d48/keyboard.json diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl/info.json rename to keyboards/handwired/dactyl/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json rename to keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/keyboard.json similarity index 100% rename from keyboards/handwired/datahand/info.json rename to keyboards/handwired/datahand/keyboard.json diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/keyboard.json similarity index 100% rename from keyboards/handwired/dqz11n1g/info.json rename to keyboards/handwired/dqz11n1g/keyboard.json diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/keyboard.json similarity index 100% rename from keyboards/handwired/frenchdev/info.json rename to keyboards/handwired/frenchdev/keyboard.json diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/keyboard.json similarity index 100% rename from keyboards/handwired/fruity60/info.json rename to keyboards/handwired/fruity60/keyboard.json diff --git a/keyboards/handwired/jankrp2040dactyl/info.json b/keyboards/handwired/jankrp2040dactyl/keyboard.json similarity index 100% rename from keyboards/handwired/jankrp2040dactyl/info.json rename to keyboards/handwired/jankrp2040dactyl/keyboard.json diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/keyboard.json similarity index 100% rename from keyboards/handwired/lagrange/info.json rename to keyboards/handwired/lagrange/keyboard.json diff --git a/keyboards/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/keyboard.json similarity index 100% rename from keyboards/handwired/m40/5x5_macropad/info.json rename to keyboards/handwired/m40/5x5_macropad/keyboard.json diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/keyboard.json similarity index 100% rename from keyboards/handwired/macroboard/f411/info.json rename to keyboards/handwired/macroboard/f411/keyboard.json diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/info.json deleted file mode 100644 index eeaa9c392be..00000000000 --- a/keyboards/handwired/meck_tkl/blackpill_f401/info.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "matrix_pins": { - "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"], - "rows": ["B15", "A8", "A9", "B14", "A15", "B3"] - }, - "diode_direction": "COL2ROW", - "indicators": { - "caps_lock": "C13", - "on_state": 0 - }, - "processor": "STM32F401", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F401" -} diff --git a/keyboards/handwired/meck_tkl/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json similarity index 89% rename from keyboards/handwired/meck_tkl/info.json rename to keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json index 5147d96ee02..4a9e2a5380a 100644 --- a/keyboards/handwired/meck_tkl/info.json +++ b/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json @@ -6,7 +6,10 @@ "usb": { "vid": "0x474B", "pid": "0x0001", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "features": { "bootmagic": true, @@ -15,6 +18,24 @@ "console": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "matrix_pins": { + "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"], + "rows": ["B15", "A8", "A9", "B14", "A15", "B3"] + }, + "diode_direction": "COL2ROW", + "indicators": { + "caps_lock": "C13", + "on_state": 0 + }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401", "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk deleted file mode 100644 index b5f27c93eab..00000000000 --- a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/meck_tkl/config.h b/keyboards/handwired/meck_tkl/config.h deleted file mode 100644 index 30221cc2168..00000000000 --- a/keyboards/handwired/meck_tkl/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2021 Gabriel Kim (@gabrielkim13) -// SPDX-License-Identifier: GPL-2.0-or-later - -#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/handwired/onekey/blackpill_f401/info.json b/keyboards/handwired/onekey/blackpill_f401/keyboard.json similarity index 79% rename from keyboards/handwired/onekey/blackpill_f401/info.json rename to keyboards/handwired/onekey/blackpill_f401/keyboard.json index 69a7ea87a75..29e2f3f17d6 100644 --- a/keyboards/handwired/onekey/blackpill_f401/info.json +++ b/keyboards/handwired/onekey/blackpill_f401/keyboard.json @@ -1,6 +1,11 @@ { "keyboard_name": "Onekey Blackpill STM32F401", "development_board": "blackpill_f401", + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["B0"], "rows": ["A7"] diff --git a/keyboards/handwired/onekey/blackpill_f401/rules.mk b/keyboards/handwired/onekey/blackpill_f401/rules.mk deleted file mode 100644 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/onekey/blackpill_f401/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json similarity index 80% rename from keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json rename to keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json index ed9435c740b..413bf7a7f34 100644 --- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json +++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json @@ -2,6 +2,11 @@ "keyboard_name": "Onekey Blackpill STM32F401 TinyUF2", "development_board": "blackpill_f401", "bootloader": "tinyuf2", + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["B0"], "rows": ["A7"] diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk deleted file mode 100755 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/onekey/blackpill_f411/info.json b/keyboards/handwired/onekey/blackpill_f411/keyboard.json similarity index 79% rename from keyboards/handwired/onekey/blackpill_f411/info.json rename to keyboards/handwired/onekey/blackpill_f411/keyboard.json index 5ee8ec3d5ed..077fee4b3bd 100644 --- a/keyboards/handwired/onekey/blackpill_f411/info.json +++ b/keyboards/handwired/onekey/blackpill_f411/keyboard.json @@ -1,6 +1,11 @@ { "keyboard_name": "Onekey Blackpill STM32F411", "development_board": "blackpill_f411", + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["B0"], "rows": ["A7"] diff --git a/keyboards/handwired/onekey/blackpill_f411/rules.mk b/keyboards/handwired/onekey/blackpill_f411/rules.mk deleted file mode 100644 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/onekey/blackpill_f411/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json similarity index 80% rename from keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json rename to keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json index 8e8b52080ad..e37bf6f54dc 100644 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json +++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json @@ -2,6 +2,11 @@ "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2", "development_board": "blackpill_f411", "bootloader": "tinyuf2", + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["B0"], "rows": ["A7"] diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk deleted file mode 100755 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/bluepill_f103c6/info.json rename to keyboards/handwired/onekey/bluepill_f103c6/keyboard.json diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/evb_wb32f3g71/info.json rename to keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/evb_wb32fq95/info.json rename to keyboards/handwired/onekey/evb_wb32fq95/keyboard.json diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/info.json b/keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/sipeed_longan_nano/info.json rename to keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json diff --git a/keyboards/handwired/onekey/teensy_lc/info.json b/keyboards/handwired/onekey/teensy_lc/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/teensy_lc/info.json rename to keyboards/handwired/onekey/teensy_lc/keyboard.json diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/keyboard.json similarity index 100% rename from keyboards/handwired/ortho_brass/info.json rename to keyboards/handwired/ortho_brass/keyboard.json diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/keyboard.json similarity index 100% rename from keyboards/handwired/owlet60/info.json rename to keyboards/handwired/owlet60/keyboard.json diff --git a/keyboards/handwired/pill60/blackpill_f401/info.json b/keyboards/handwired/pill60/blackpill_f401/keyboard.json similarity index 78% rename from keyboards/handwired/pill60/blackpill_f401/info.json rename to keyboards/handwired/pill60/blackpill_f401/keyboard.json index 8d85a2e9300..9b3530b9583 100644 --- a/keyboards/handwired/pill60/blackpill_f401/info.json +++ b/keyboards/handwired/pill60/blackpill_f401/keyboard.json @@ -1,4 +1,9 @@ { + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"], "rows": ["B4", "B3", "A15", "B13", "B5"] diff --git a/keyboards/handwired/pill60/blackpill_f401/rules.mk b/keyboards/handwired/pill60/blackpill_f401/rules.mk deleted file mode 100644 index 3d2bfceea99..00000000000 --- a/keyboards/handwired/pill60/blackpill_f401/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/pill60/blackpill_f411/info.json b/keyboards/handwired/pill60/blackpill_f411/keyboard.json similarity index 78% rename from keyboards/handwired/pill60/blackpill_f411/info.json rename to keyboards/handwired/pill60/blackpill_f411/keyboard.json index 4e0935f79ce..1961d616ddb 100644 --- a/keyboards/handwired/pill60/blackpill_f411/info.json +++ b/keyboards/handwired/pill60/blackpill_f411/keyboard.json @@ -1,4 +1,9 @@ { + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"], "rows": ["B4", "B3", "A15", "B13", "B5"] diff --git a/keyboards/handwired/pill60/blackpill_f411/rules.mk b/keyboards/handwired/pill60/blackpill_f411/rules.mk deleted file mode 100644 index b5f27c93eab..00000000000 --- a/keyboards/handwired/pill60/blackpill_f411/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/keyboard.json similarity index 78% rename from keyboards/handwired/prkl30/feather/info.json rename to keyboards/handwired/prkl30/feather/keyboard.json index a89fe9ec57f..721107e0646 100644 --- a/keyboards/handwired/prkl30/feather/info.json +++ b/keyboards/handwired/prkl30/feather/keyboard.json @@ -1,4 +1,14 @@ { + "features": { + "bluetooth": true, + "bootmagic": true, + "command": true, + "console": true, + "encoder": true, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/handwired/prkl30/feather/rules.mk b/keyboards/handwired/prkl30/feather/rules.mk index aaab95b9e04..3437a35bdf1 100644 --- a/keyboards/handwired/prkl30/feather/rules.mk +++ b/keyboards/handwired/prkl30/feather/rules.mk @@ -1,18 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -ENCODER_ENABLE = yes -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no -AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port. - -BLUETOOTH_ENABLE = yes diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/keyboard.json similarity index 100% rename from keyboards/handwired/promethium/info.json rename to keyboards/handwired/promethium/keyboard.json diff --git a/keyboards/handwired/pterodactyl/info.json b/keyboards/handwired/pterodactyl/keyboard.json similarity index 100% rename from keyboards/handwired/pterodactyl/info.json rename to keyboards/handwired/pterodactyl/keyboard.json diff --git a/keyboards/handwired/riblee_split/info.json b/keyboards/handwired/riblee_split/keyboard.json similarity index 100% rename from keyboards/handwired/riblee_split/info.json rename to keyboards/handwired/riblee_split/keyboard.json diff --git a/keyboards/handwired/slash/info.json b/keyboards/handwired/slash/keyboard.json similarity index 100% rename from keyboards/handwired/slash/info.json rename to keyboards/handwired/slash/keyboard.json diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/keyboard.json similarity index 100% rename from keyboards/handwired/split65/stm32/info.json rename to keyboards/handwired/split65/stm32/keyboard.json diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/keyboard.json similarity index 100% rename from keyboards/handwired/trackpoint/info.json rename to keyboards/handwired/trackpoint/keyboard.json diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json similarity index 100% rename from keyboards/handwired/tractyl_manuform/4x6_right/info.json rename to keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json similarity index 100% rename from keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json rename to keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json similarity index 100% rename from keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json rename to keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json diff --git a/keyboards/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/keyboard.json similarity index 100% rename from keyboards/handwired/twadlee/tp69/info.json rename to keyboards/handwired/twadlee/tp69/keyboard.json diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/keyboard.json similarity index 92% rename from keyboards/handwired/uthol/rev3/info.json rename to keyboards/handwired/uthol/rev3/keyboard.json index a90e7a4a895..9b1a476b87c 100644 --- a/keyboards/handwired/uthol/rev3/info.json +++ b/keyboards/handwired/uthol/rev3/keyboard.json @@ -1,7 +1,10 @@ { "keyboard_name": "UtholThree", "usb": { - "device_version": "0.0.3" + "device_version": "0.0.3", + "shared_endpoint": { + "keyboard": true + } }, "rgblight": { "led_count": 39, diff --git a/keyboards/handwired/uthol/rev3/rules.mk b/keyboards/handwired/uthol/rev3/rules.mk deleted file mode 100644 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/uthol/rev3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/keyboard.json similarity index 100% rename from keyboards/handwired/wulkan/info.json rename to keyboards/handwired/wulkan/keyboard.json diff --git a/keyboards/hardwareabstraction/handwire/info.json b/keyboards/hardwareabstraction/handwire/keyboard.json similarity index 100% rename from keyboards/hardwareabstraction/handwire/info.json rename to keyboards/hardwareabstraction/handwire/keyboard.json diff --git a/keyboards/hazel/bad_wings/info.json b/keyboards/hazel/bad_wings/keyboard.json similarity index 100% rename from keyboards/hazel/bad_wings/info.json rename to keyboards/hazel/bad_wings/keyboard.json diff --git a/keyboards/hhkb/ansi/32u2/info.json b/keyboards/hhkb/ansi/32u2/keyboard.json similarity index 100% rename from keyboards/hhkb/ansi/32u2/info.json rename to keyboards/hhkb/ansi/32u2/keyboard.json diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/keyboard.json similarity index 100% rename from keyboards/hhkb/jp/info.json rename to keyboards/hhkb/jp/keyboard.json diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/keyboard.json similarity index 100% rename from keyboards/hhkb/yang/info.json rename to keyboards/hhkb/yang/keyboard.json diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/keyboard.json similarity index 100% rename from keyboards/hillside/46/0_1/info.json rename to keyboards/hillside/46/0_1/keyboard.json diff --git a/keyboards/hillside/46/0_1/rules.mk b/keyboards/hillside/46/0_1/rules.mk deleted file mode 100644 index 89c84d8be9d..00000000000 --- a/keyboards/hillside/46/0_1/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# If you add a haptic board, -# enable it and set its driver here or in your keymap folder -# The Pimoroni board's driver is DRV2605L -# HAPTIC_ENABLE = yes # Enable haptic driver -# HAPTIC_DRIVER = drv2605l diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/keyboard.json similarity index 100% rename from keyboards/hillside/48/0_1/info.json rename to keyboards/hillside/48/0_1/keyboard.json diff --git a/keyboards/hillside/48/0_1/rules.mk b/keyboards/hillside/48/0_1/rules.mk deleted file mode 100644 index 89c84d8be9d..00000000000 --- a/keyboards/hillside/48/0_1/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# If you add a haptic board, -# enable it and set its driver here or in your keymap folder -# The Pimoroni board's driver is DRV2605L -# HAPTIC_ENABLE = yes # Enable haptic driver -# HAPTIC_DRIVER = drv2605l diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/keyboard.json similarity index 100% rename from keyboards/hillside/52/0_1/info.json rename to keyboards/hillside/52/0_1/keyboard.json diff --git a/keyboards/hillside/52/0_1/rules.mk b/keyboards/hillside/52/0_1/rules.mk deleted file mode 100644 index 89c84d8be9d..00000000000 --- a/keyboards/hillside/52/0_1/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# If you add a haptic board, -# enable it and set its driver here or in your keymap folder -# The Pimoroni board's driver is DRV2605L -# HAPTIC_ENABLE = yes # Enable haptic driver -# HAPTIC_DRIVER = drv2605l diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/keyboard.json similarity index 100% rename from keyboards/hineybush/hbcp/info.json rename to keyboards/hineybush/hbcp/keyboard.json diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/keyboard.json similarity index 100% rename from keyboards/horrortroll/handwired_k552/info.json rename to keyboards/horrortroll/handwired_k552/keyboard.json diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/keyboard.json similarity index 100% rename from keyboards/horrortroll/lemon40/info.json rename to keyboards/horrortroll/lemon40/keyboard.json diff --git a/keyboards/horrortroll/nyx/rev1/info.json b/keyboards/horrortroll/nyx/rev1/keyboard.json similarity index 100% rename from keyboards/horrortroll/nyx/rev1/info.json rename to keyboards/horrortroll/nyx/rev1/keyboard.json diff --git a/keyboards/hotdox/info.json b/keyboards/hotdox/keyboard.json similarity index 100% rename from keyboards/hotdox/info.json rename to keyboards/hotdox/keyboard.json diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/keyboard.json similarity index 100% rename from keyboards/hs60/v1/info.json rename to keyboards/hs60/v1/keyboard.json diff --git a/keyboards/hs60/v2/ansi/info.json b/keyboards/hs60/v2/ansi/keyboard.json similarity index 100% rename from keyboards/hs60/v2/ansi/info.json rename to keyboards/hs60/v2/ansi/keyboard.json diff --git a/keyboards/hs60/v2/hhkb/info.json b/keyboards/hs60/v2/hhkb/keyboard.json similarity index 100% rename from keyboards/hs60/v2/hhkb/info.json rename to keyboards/hs60/v2/hhkb/keyboard.json diff --git a/keyboards/hs60/v2/iso/info.json b/keyboards/hs60/v2/iso/keyboard.json similarity index 100% rename from keyboards/hs60/v2/iso/info.json rename to keyboards/hs60/v2/iso/keyboard.json diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json similarity index 100% rename from keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json rename to keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/keyboard.json similarity index 100% rename from keyboards/ingrained/info.json rename to keyboards/ingrained/keyboard.json diff --git a/keyboards/inland/kb83/info.json b/keyboards/inland/kb83/keyboard.json similarity index 100% rename from keyboards/inland/kb83/info.json rename to keyboards/inland/kb83/keyboard.json diff --git a/keyboards/inland/kb83/rgb_matrix_kb.inc b/keyboards/inland/kb83/rgb_matrix_kb.inc deleted file mode 100644 index 56e2bd31cbb..00000000000 --- a/keyboards/inland/kb83/rgb_matrix_kb.inc +++ /dev/null @@ -1,51 +0,0 @@ -// !!! DO NOT ADD #pragma once !!! // - -// Step 1. -// Declare custom effects using the RGB_MATRIX_EFFECT macro -// (note the lack of semicolon after the macro!) - -RGB_MATRIX_EFFECT(turn_off_rgb) -RGB_MATRIX_EFFECT(kb_reset_rgb) - -// Step 2. -// Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block - -#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS - -// e.g: A simple effect, self-contained within a single method -static bool turn_off_rgb(effect_params_t *params) { - RGB_MATRIX_USE_LIMITS(led_min, led_max); - for (uint8_t i = led_min; i < led_max; i++) { - rgb_matrix_set_color(i, 0x00, 0x00, 0x00); - } - return rgb_matrix_check_finished_leds(led_max); -} - -// e.g: A more complex effect, relying on external methods and state, with -// dedicated init and run methods -static uint8_t some_global_state; -static void kb_reset_rgb_init(effect_params_t* params) { - some_global_state = 0; -} -static bool kb_reset_rgb_run(effect_params_t* params) { - RGB_MATRIX_USE_LIMITS(led_min, led_max); - some_global_state++; - if(some_global_state&0x01){ - for (uint8_t i = led_min; i < led_max; i++) - rgb_matrix_set_color(i, 0, 0, 0); - } - else{ - for (uint8_t i = led_min; i < led_max; i++) - rgb_matrix_set_color(i, 0xc0, 0xc0, 0xc0); - } - if(some_global_state>=7) - rgb_matrix_init(); - return rgb_matrix_check_finished_leds(led_max); -} - -static bool kb_reset_rgb(effect_params_t* params) { - if (params->init) kb_reset_rgb_init(params); - return kb_reset_rgb_run(params); -} - -#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS diff --git a/keyboards/inland/kb83/rules.mk b/keyboards/inland/kb83/rules.mk deleted file mode 100644 index 2bdd4fd92e8..00000000000 --- a/keyboards/inland/kb83/rules.mk +++ /dev/null @@ -1 +0,0 @@ -#RGB_MATRIX_CUSTOM_USER = yes diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/keyboard.json similarity index 100% rename from keyboards/input_club/ergodox_infinity/info.json rename to keyboards/input_club/ergodox_infinity/keyboard.json From 36a6f2ba3c248e9f0498bc27be3788542ea3a972 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 17 Apr 2024 03:15:02 +0100 Subject: [PATCH 5/6] Migrate build target markers to keyboard.json - S (#23532) --- .../satt/comet46/{info.json => keyboard.json} | 6 +++ keyboards/satt/comet46/rules.mk | 12 ------ .../grs_70ec/{info.json => keyboard.json} | 7 ++++ keyboards/sekigon/grs_70ec/rules.mk | 12 ------ .../hotswap/{info.json => keyboard.json} | 4 +- .../shandoncodes/mino_plus/hotswap/rules.mk | 2 - .../soldered/{info.json => keyboard.json} | 4 +- .../shandoncodes/mino_plus/soldered/rules.mk | 2 - .../{info.json => keyboard.json} | 0 keyboards/sharkoon/skiller_sgk50_s2/rules.mk | 1 - .../3_0/elitec/{info.json => keyboard.json} | 6 +++ keyboards/signum/3_0/elitec/rules.mk | 13 ------ .../3_0/teensy/{info.json => keyboard.json} | 6 +++ keyboards/signum/3_0/teensy/rules.mk | 13 ------ .../{info.json => keyboard.json} | 11 +++++ keyboards/silverbullet44/rules.mk | 14 ------- .../uni660/rev1/{info.json => keyboard.json} | 9 ++++ keyboards/sirius/uni660/rev1/rules.mk | 13 ------ .../unigo66/{info.json => keyboard.json} | 8 ++++ keyboards/sirius/unigo66/rules.mk | 15 ------- .../sixkeyboard/{info.json => keyboard.json} | 6 +++ keyboards/sixkeyboard/rules.mk | 11 ----- keyboards/skergo/config.h | 23 ----------- keyboards/skergo/{info.json => keyboard.json} | 12 ++++++ keyboards/skergo/rules.mk | 13 ------ .../skippys_custom_pcs/rooboard65/config.h | 41 ------------------- .../rooboard65/{info.json => keyboard.json} | 14 +++++++ .../skippys_custom_pcs/rooboard65/rules.mk | 13 ------ .../roopad/{info.json => keyboard.json} | 7 ++++ keyboards/skippys_custom_pcs/roopad/rules.mk | 13 ------ .../skmt/15k/{info.json => keyboard.json} | 3 ++ keyboards/skmt/15k/rules.mk | 1 - .../{info.json => keyboard.json} | 7 ++++ keyboards/smallkeyboard/rules.mk | 15 ------- .../iron160_h/{info.json => keyboard.json} | 8 ++++ .../smithrune/iron160/iron160_h/rules.mk | 16 -------- .../iron160_s/{info.json => keyboard.json} | 8 ++++ .../smithrune/iron160/iron160_s/rules.mk | 16 -------- .../f072/{info.json => keyboard.json} | 12 ++++++ keyboards/smithrune/iron165r2/f072/rules.mk | 15 ------- .../f411/{info.json => keyboard.json} | 12 ++++++ keyboards/smithrune/iron165r2/f411/rules.mk | 14 ------- .../{info.json => keyboard.json} | 0 keyboards/soda/cherish/config.h | 39 ------------------ .../soda/cherish/{info.json => keyboard.json} | 15 +++++++ keyboards/soda/cherish/rules.mk | 14 ------- .../nebula12/{info.json => keyboard.json} | 7 ++++ keyboards/spaceholdings/nebula12/rules.mk | 15 +------ .../nebula68/{info.json => keyboard.json} | 7 ++++ keyboards/spaceholdings/nebula68/rules.mk | 15 +------ .../rev1/feather/{info.json => keyboard.json} | 9 ++++ .../spaceman/pancake/rev1/feather/rules.mk | 14 ------- .../promicro/{info.json => keyboard.json} | 8 ++++ .../spaceman/pancake/rev1/promicro/rules.mk | 13 ------ keyboards/specskeys/config.h | 39 ------------------ .../specskeys/{info.json => keyboard.json} | 13 ++++++ keyboards/specskeys/rules.mk | 13 ------ .../split78/{info.json => keyboard.json} | 7 ++++ keyboards/spiderisland/split78/rules.mk | 11 ----- keyboards/spleeb/{info.json => keyboard.json} | 0 .../splitkb/zima/{info.json => keyboard.json} | 14 +++++++ keyboards/splitkb/zima/rules.mk | 18 -------- .../lagom/{info.json => keyboard.json} | 0 keyboards/sthlmkb/lagom/rules.mk | 6 +-- keyboards/stront/{info.json => keyboard.json} | 0 .../supersplit/{info.json => keyboard.json} | 0 .../southpaw_65/{info.json => keyboard.json} | 11 +++++ keyboards/switchplate/southpaw_65/rules.mk | 14 ------- keyboards/sx60/{info.json => keyboard.json} | 7 ++++ keyboards/sx60/rules.mk | 12 ------ .../launch_1/{info.json => keyboard.json} | 12 ++++++ keyboards/system76/launch_1/rules.mk | 15 ------- 72 files changed, 261 insertions(+), 525 deletions(-) rename keyboards/satt/comet46/{info.json => keyboard.json} (95%) rename keyboards/sekigon/grs_70ec/{info.json => keyboard.json} (96%) rename keyboards/shandoncodes/mino_plus/hotswap/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/shandoncodes/mino_plus/hotswap/rules.mk rename keyboards/shandoncodes/mino_plus/soldered/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/shandoncodes/mino_plus/soldered/rules.mk rename keyboards/sharkoon/skiller_sgk50_s2/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/sharkoon/skiller_sgk50_s2/rules.mk rename keyboards/signum/3_0/elitec/{info.json => keyboard.json} (61%) rename keyboards/signum/3_0/teensy/{info.json => keyboard.json} (61%) rename keyboards/silverbullet44/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/silverbullet44/rules.mk rename keyboards/sirius/uni660/rev1/{info.json => keyboard.json} (95%) rename keyboards/sirius/unigo66/{info.json => keyboard.json} (97%) rename keyboards/sixkeyboard/{info.json => keyboard.json} (85%) delete mode 100644 keyboards/skergo/config.h rename keyboards/skergo/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/skippys_custom_pcs/rooboard65/config.h rename keyboards/skippys_custom_pcs/rooboard65/{info.json => keyboard.json} (94%) rename keyboards/skippys_custom_pcs/roopad/{info.json => keyboard.json} (93%) rename keyboards/skmt/15k/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/skmt/15k/rules.mk rename keyboards/smallkeyboard/{info.json => keyboard.json} (92%) rename keyboards/smithrune/iron160/iron160_h/{info.json => keyboard.json} (98%) rename keyboards/smithrune/iron160/iron160_s/{info.json => keyboard.json} (99%) rename keyboards/smithrune/iron165r2/f072/{info.json => keyboard.json} (72%) delete mode 100644 keyboards/smithrune/iron165r2/f072/rules.mk rename keyboards/smithrune/iron165r2/f411/{info.json => keyboard.json} (74%) delete mode 100644 keyboards/smithrune/iron165r2/f411/rules.mk rename keyboards/snes_macropad/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/soda/cherish/config.h rename keyboards/soda/cherish/{info.json => keyboard.json} (95%) rename keyboards/spaceholdings/nebula12/{info.json => keyboard.json} (91%) rename keyboards/spaceholdings/nebula68/{info.json => keyboard.json} (97%) rename keyboards/spaceman/pancake/rev1/feather/{info.json => keyboard.json} (55%) rename keyboards/spaceman/pancake/rev1/promicro/{info.json => keyboard.json} (52%) delete mode 100644 keyboards/specskeys/config.h rename keyboards/specskeys/{info.json => keyboard.json} (95%) rename keyboards/spiderisland/split78/{info.json => keyboard.json} (97%) rename keyboards/spleeb/{info.json => keyboard.json} (100%) rename keyboards/splitkb/zima/{info.json => keyboard.json} (85%) rename keyboards/sthlmkb/lagom/{info.json => keyboard.json} (100%) rename keyboards/stront/{info.json => keyboard.json} (100%) rename keyboards/supersplit/{info.json => keyboard.json} (100%) rename keyboards/switchplate/southpaw_65/{info.json => keyboard.json} (98%) rename keyboards/sx60/{info.json => keyboard.json} (99%) rename keyboards/system76/launch_1/{info.json => keyboard.json} (96%) diff --git a/keyboards/satt/comet46/info.json b/keyboards/satt/comet46/keyboard.json similarity index 95% rename from keyboards/satt/comet46/info.json rename to keyboards/satt/comet46/keyboard.json index 5b11be662e5..0092f19c799 100644 --- a/keyboards/satt/comet46/info.json +++ b/keyboards/satt/comet46/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/satt/comet46/rules.mk b/keyboards/satt/comet46/rules.mk index 0db5166ffac..18d234d62a0 100644 --- a/keyboards/satt/comet46/rules.mk +++ b/keyboards/satt/comet46/rules.mk @@ -1,15 +1,3 @@ -# 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 = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite # project specific files diff --git a/keyboards/sekigon/grs_70ec/info.json b/keyboards/sekigon/grs_70ec/keyboard.json similarity index 96% rename from keyboards/sekigon/grs_70ec/info.json rename to keyboards/sekigon/grs_70ec/keyboard.json index 833cd747895..e940e71d884 100644 --- a/keyboards/sekigon/grs_70ec/info.json +++ b/keyboards/sekigon/grs_70ec/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x70EC", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "split": { "enabled": true, "soft_serial_pin": "D3" diff --git a/keyboards/sekigon/grs_70ec/rules.mk b/keyboards/sekigon/grs_70ec/rules.mk index ac989e7ea83..37cfffd7692 100644 --- a/keyboards/sekigon/grs_70ec/rules.mk +++ b/keyboards/sekigon/grs_70ec/rules.mk @@ -1,15 +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 = 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 CUSTOM_MATRIX = lite ANALOG_DRIVER_REQUIRED = yes diff --git a/keyboards/shandoncodes/mino_plus/hotswap/info.json b/keyboards/shandoncodes/mino_plus/hotswap/keyboard.json similarity index 98% rename from keyboards/shandoncodes/mino_plus/hotswap/info.json rename to keyboards/shandoncodes/mino_plus/hotswap/keyboard.json index b7cda6d71ff..f181c610ed1 100644 --- a/keyboards/shandoncodes/mino_plus/hotswap/info.json +++ b/keyboards/shandoncodes/mino_plus/hotswap/keyboard.json @@ -10,7 +10,9 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "oled": true, + "wpm": true }, "matrix_pins": { "cols": ["B12", "A15", "B3", "B2", "B0", "A7", "A5", "A4", "A3", "A2", "A1", "F1", "A0", "A8", "A10"], diff --git a/keyboards/shandoncodes/mino_plus/hotswap/rules.mk b/keyboards/shandoncodes/mino_plus/hotswap/rules.mk deleted file mode 100644 index 76e55c05f48..00000000000 --- a/keyboards/shandoncodes/mino_plus/hotswap/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/shandoncodes/mino_plus/soldered/info.json b/keyboards/shandoncodes/mino_plus/soldered/keyboard.json similarity index 98% rename from keyboards/shandoncodes/mino_plus/soldered/info.json rename to keyboards/shandoncodes/mino_plus/soldered/keyboard.json index 52b612e01bf..2b717c4c597 100644 --- a/keyboards/shandoncodes/mino_plus/soldered/info.json +++ b/keyboards/shandoncodes/mino_plus/soldered/keyboard.json @@ -10,7 +10,9 @@ "console": false, "extrakey": true, "mousekey": true, - "nkro": true + "nkro": true, + "oled": true, + "wpm": true }, "matrix_pins": { "cols": ["B4", "B3", "A15", "A10", "A8", "B14", "B12", "B10", "A5", "A4", "A3", "B0", "A7", "C15", "B5"], diff --git a/keyboards/shandoncodes/mino_plus/soldered/rules.mk b/keyboards/shandoncodes/mino_plus/soldered/rules.mk deleted file mode 100644 index 76e55c05f48..00000000000 --- a/keyboards/shandoncodes/mino_plus/soldered/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/sharkoon/skiller_sgk50_s2/info.json b/keyboards/sharkoon/skiller_sgk50_s2/keyboard.json similarity index 100% rename from keyboards/sharkoon/skiller_sgk50_s2/info.json rename to keyboards/sharkoon/skiller_sgk50_s2/keyboard.json diff --git a/keyboards/sharkoon/skiller_sgk50_s2/rules.mk b/keyboards/sharkoon/skiller_sgk50_s2/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/sharkoon/skiller_sgk50_s2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/signum/3_0/elitec/info.json b/keyboards/signum/3_0/elitec/keyboard.json similarity index 61% rename from keyboards/signum/3_0/elitec/info.json rename to keyboards/signum/3_0/elitec/keyboard.json index 84336ac59f4..5482e519a1a 100644 --- a/keyboards/signum/3_0/elitec/info.json +++ b/keyboards/signum/3_0/elitec/keyboard.json @@ -1,4 +1,10 @@ { + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["B4", "D7", "D0", "E6", "D4", "F6", "F4", "F7", "B1", "B3", "C6", "B2"], "rows": ["D2", "D1", "F5", "B5"] diff --git a/keyboards/signum/3_0/elitec/rules.mk b/keyboards/signum/3_0/elitec/rules.mk index 614691a01be..16051206467 100644 --- a/keyboards/signum/3_0/elitec/rules.mk +++ b/keyboards/signum/3_0/elitec/rules.mk @@ -1,16 +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 - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/signum/3_0/teensy/info.json b/keyboards/signum/3_0/teensy/keyboard.json similarity index 61% rename from keyboards/signum/3_0/teensy/info.json rename to keyboards/signum/3_0/teensy/keyboard.json index 7eae1153236..1db8479d9b0 100644 --- a/keyboards/signum/3_0/teensy/info.json +++ b/keyboards/signum/3_0/teensy/keyboard.json @@ -1,4 +1,10 @@ { + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["C6", "D2", "B7", "D3", "D0", "F7", "F5", "B6", "B5", "B4", "D1", "D7"], "rows": ["B0", "B3", "F6", "C7"] diff --git a/keyboards/signum/3_0/teensy/rules.mk b/keyboards/signum/3_0/teensy/rules.mk index 614691a01be..16051206467 100644 --- a/keyboards/signum/3_0/teensy/rules.mk +++ b/keyboards/signum/3_0/teensy/rules.mk @@ -1,16 +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 - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/keyboard.json similarity index 94% rename from keyboards/silverbullet44/info.json rename to keyboards/silverbullet44/keyboard.json index e232fdba3e8..793ec229e4b 100644 --- a/keyboards/silverbullet44/info.json +++ b/keyboards/silverbullet44/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x27DB", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "bootmagic": true, + "extrakey": false, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "ws2812": { "pin": "D3" }, diff --git a/keyboards/silverbullet44/rules.mk b/keyboards/silverbullet44/rules.mk deleted file mode 100644 index 95e92dce2a4..00000000000 --- a/keyboards/silverbullet44/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# 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 = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = no -AUDIO_ENABLE = yes # Audio output -LTO_ENABLE = yes diff --git a/keyboards/sirius/uni660/rev1/info.json b/keyboards/sirius/uni660/rev1/keyboard.json similarity index 95% rename from keyboards/sirius/uni660/rev1/info.json rename to keyboards/sirius/uni660/rev1/keyboard.json index f5b070f87e1..793edcc6858 100644 --- a/keyboards/sirius/uni660/rev1/info.json +++ b/keyboards/sirius/uni660/rev1/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x0201", "device_version": "19.1.2" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "unicode": true + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/sirius/uni660/rev1/rules.mk b/keyboards/sirius/uni660/rev1/rules.mk index 7ac75072699..18d234d62a0 100644 --- a/keyboards/sirius/uni660/rev1/rules.mk +++ b/keyboards/sirius/uni660/rev1/rules.mk @@ -1,16 +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 = yes # Console for debug -COMMAND_ENABLE = yes # 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 -UNICODE_ENABLE = yes # Unicode CUSTOM_MATRIX = lite # project specific files diff --git a/keyboards/sirius/unigo66/info.json b/keyboards/sirius/unigo66/keyboard.json similarity index 97% rename from keyboards/sirius/unigo66/info.json rename to keyboards/sirius/unigo66/keyboard.json index 866fd9abbf9..ac683a0f1db 100644 --- a/keyboards/sirius/unigo66/info.json +++ b/keyboards/sirius/unigo66/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1001", "device_version": "19.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": false, + "usb_hid": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sirius/unigo66/rules.mk b/keyboards/sirius/unigo66/rules.mk index 6cf02169cf6..56889eab51a 100644 --- a/keyboards/sirius/unigo66/rules.mk +++ b/keyboards/sirius/unigo66/rules.mk @@ -1,18 +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 = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -USB_HID_ENABLE = yes - CUSTOM_MATRIX = yes SRC += custom_matrix.cpp\ main.c diff --git a/keyboards/sixkeyboard/info.json b/keyboards/sixkeyboard/keyboard.json similarity index 85% rename from keyboards/sixkeyboard/info.json rename to keyboards/sixkeyboard/keyboard.json index 247b255a363..aff5c985f79 100644 --- a/keyboards/sixkeyboard/info.json +++ b/keyboards/sixkeyboard/keyboard.json @@ -9,6 +9,12 @@ "device_version": "0.0.1", "force_nkro": true }, + "features": { + "bootmagic": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, "processor": "atmega16u2", "bootloader": "atmel-dfu", "community_layouts": ["ortho_2x3"], diff --git a/keyboards/sixkeyboard/rules.mk b/keyboards/sixkeyboard/rules.mk index d1d7bc48818..09c02c88b0d 100644 --- a/keyboards/sixkeyboard/rules.mk +++ b/keyboards/sixkeyboard/rules.mk @@ -1,14 +1,3 @@ -# 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 -AUDIO_ENABLE = no CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h deleted file mode 100644 index a463c64167e..00000000000 --- a/keyboards/skergo/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright (C) 2021 Keyz.io Ltd. -* -* 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 3 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 . -*/ - -#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/skergo/info.json b/keyboards/skergo/keyboard.json similarity index 97% rename from keyboards/skergo/info.json rename to keyboards/skergo/keyboard.json index 0e68b6aedd7..49ff7b81b6e 100644 --- a/keyboards/skergo/info.json +++ b/keyboards/skergo/keyboard.json @@ -8,6 +8,18 @@ "pid": "0x534B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C2", "C1", "C0", "D7"], "rows": ["B0", "B4", "B3", "B2", "B1"] diff --git a/keyboards/skergo/rules.mk b/keyboards/skergo/rules.mk index 1e9f9255447..c2ee0bc86f9 100644 --- a/keyboards/skergo/rules.mk +++ b/keyboards/skergo/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# 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 diff --git a/keyboards/skippys_custom_pcs/rooboard65/config.h b/keyboards/skippys_custom_pcs/rooboard65/config.h deleted file mode 100644 index b352868d2d4..00000000000 --- a/keyboards/skippys_custom_pcs/rooboard65/config.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2021 - -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 . -*/ - -#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 less important options */ - -/* - * 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/skippys_custom_pcs/rooboard65/info.json b/keyboards/skippys_custom_pcs/rooboard65/keyboard.json similarity index 94% rename from keyboards/skippys_custom_pcs/rooboard65/info.json rename to keyboards/skippys_custom_pcs/rooboard65/keyboard.json index b6151a303c4..527884714b2 100644 --- a/keyboards/skippys_custom_pcs/rooboard65/info.json +++ b/keyboards/skippys_custom_pcs/rooboard65/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "ws2812": { "pin": "F7" }, diff --git a/keyboards/skippys_custom_pcs/rooboard65/rules.mk b/keyboards/skippys_custom_pcs/rooboard65/rules.mk index 52a18008f4a..3437a35bdf1 100644 --- a/keyboards/skippys_custom_pcs/rooboard65/rules.mk +++ b/keyboards/skippys_custom_pcs/rooboard65/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# 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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/skippys_custom_pcs/roopad/info.json b/keyboards/skippys_custom_pcs/roopad/keyboard.json similarity index 93% rename from keyboards/skippys_custom_pcs/roopad/info.json rename to keyboards/skippys_custom_pcs/roopad/keyboard.json index c44fcd1541f..0da722ff120 100644 --- a/keyboards/skippys_custom_pcs/roopad/info.json +++ b/keyboards/skippys_custom_pcs/roopad/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "rgblight": { "led_count": 21, "sleep": true, diff --git a/keyboards/skippys_custom_pcs/roopad/rules.mk b/keyboards/skippys_custom_pcs/roopad/rules.mk index d280d696f53..3437a35bdf1 100644 --- a/keyboards/skippys_custom_pcs/roopad/rules.mk +++ b/keyboards/skippys_custom_pcs/roopad/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# 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 -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/skmt/15k/info.json b/keyboards/skmt/15k/keyboard.json similarity index 99% rename from keyboards/skmt/15k/info.json rename to keyboards/skmt/15k/keyboard.json index 903a13b985e..9cf215f4d48 100644 --- a/keyboards/skmt/15k/info.json +++ b/keyboards/skmt/15k/keyboard.json @@ -4,6 +4,9 @@ "maintainer": "satorusaka", "bootloader": "rp2040", "diode_direction": "COL2ROW", + "build": { + "lto": true + }, "features": { "bootmagic": true, "command": false, diff --git a/keyboards/skmt/15k/rules.mk b/keyboards/skmt/15k/rules.mk deleted file mode 100644 index 4da205a168c..00000000000 --- a/keyboards/skmt/15k/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/keyboard.json similarity index 92% rename from keyboards/smallkeyboard/info.json rename to keyboards/smallkeyboard/keyboard.json index d5a64f465ad..9963d83a47f 100644 --- a/keyboards/smallkeyboard/info.json +++ b/keyboards/smallkeyboard/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x736B", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/smallkeyboard/rules.mk b/keyboards/smallkeyboard/rules.mk index 1dcdf891550..982989bad1d 100644 --- a/keyboards/smallkeyboard/rules.mk +++ b/keyboards/smallkeyboard/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 = 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 - -RGB_MATRIX_ENABLE = yes - RGB_MATRIX_SUPPORTED = yes diff --git a/keyboards/smithrune/iron160/iron160_h/info.json b/keyboards/smithrune/iron160/iron160_h/keyboard.json similarity index 98% rename from keyboards/smithrune/iron160/iron160_h/info.json rename to keyboards/smithrune/iron160/iron160_h/keyboard.json index 3fb14989d69..d9ada0879d5 100644 --- a/keyboards/smithrune/iron160/iron160_h/info.json +++ b/keyboards/smithrune/iron160/iron160_h/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1648", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "matrix_pins": { diff --git a/keyboards/smithrune/iron160/iron160_h/rules.mk b/keyboards/smithrune/iron160/iron160_h/rules.mk index c889da168d6..4138455538f 100644 --- a/keyboards/smithrune/iron160/iron160_h/rules.mk +++ b/keyboards/smithrune/iron160/iron160_h/rules.mk @@ -1,18 +1,2 @@ -# 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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no -LTO_ENABLE = no - EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = legacy - diff --git a/keyboards/smithrune/iron160/iron160_s/info.json b/keyboards/smithrune/iron160/iron160_s/keyboard.json similarity index 99% rename from keyboards/smithrune/iron160/iron160_s/info.json rename to keyboards/smithrune/iron160/iron160_s/keyboard.json index 91c66a3d4fb..b2a465399f5 100644 --- a/keyboards/smithrune/iron160/iron160_s/info.json +++ b/keyboards/smithrune/iron160/iron160_s/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x1653", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "matrix_pins": { diff --git a/keyboards/smithrune/iron160/iron160_s/rules.mk b/keyboards/smithrune/iron160/iron160_s/rules.mk index 2c863bbe31a..4138455538f 100644 --- a/keyboards/smithrune/iron160/iron160_s/rules.mk +++ b/keyboards/smithrune/iron160/iron160_s/rules.mk @@ -1,18 +1,2 @@ -# 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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = no -LTO_ENABLE = no - EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = legacy - diff --git a/keyboards/smithrune/iron165r2/f072/info.json b/keyboards/smithrune/iron165r2/f072/keyboard.json similarity index 72% rename from keyboards/smithrune/iron165r2/f072/info.json rename to keyboards/smithrune/iron165r2/f072/keyboard.json index 2cbbaa84f3f..e16493d0b5c 100644 --- a/keyboards/smithrune/iron165r2/f072/info.json +++ b/keyboards/smithrune/iron165r2/f072/keyboard.json @@ -1,4 +1,16 @@ { + "build": { + "lto": false + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "backlight": { "pin": "A6", "levels": 20, diff --git a/keyboards/smithrune/iron165r2/f072/rules.mk b/keyboards/smithrune/iron165r2/f072/rules.mk deleted file mode 100644 index b524e61f4bb..00000000000 --- a/keyboards/smithrune/iron165r2/f072/rules.mk +++ /dev/null @@ -1,15 +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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = no -ENCODER_ENABLE = no -BACKLIGHT_ENABLE = yes - diff --git a/keyboards/smithrune/iron165r2/f411/info.json b/keyboards/smithrune/iron165r2/f411/keyboard.json similarity index 74% rename from keyboards/smithrune/iron165r2/f411/info.json rename to keyboards/smithrune/iron165r2/f411/keyboard.json index ff685e3cdd8..d3d4b3de506 100644 --- a/keyboards/smithrune/iron165r2/f411/info.json +++ b/keyboards/smithrune/iron165r2/f411/keyboard.json @@ -1,4 +1,16 @@ { + "build": { + "lto": false + }, + "features": { + "backlight": true, + "bootmagic": true, + "command": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgblight": true + }, "eeprom": { "driver": "i2c" }, diff --git a/keyboards/smithrune/iron165r2/f411/rules.mk b/keyboards/smithrune/iron165r2/f411/rules.mk deleted file mode 100644 index f5a58ab0cb7..00000000000 --- a/keyboards/smithrune/iron165r2/f411/rules.mk +++ /dev/null @@ -1,14 +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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = no -ENCODER_ENABLE = no -BACKLIGHT_ENABLE = yes diff --git a/keyboards/snes_macropad/info.json b/keyboards/snes_macropad/keyboard.json similarity index 100% rename from keyboards/snes_macropad/info.json rename to keyboards/snes_macropad/keyboard.json diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h deleted file mode 100644 index f608132b5af..00000000000 --- a/keyboards/soda/cherish/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Álvaro "Gondolindrim" Volpato - -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 . -*/ - -#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 - -/* - * 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/soda/cherish/info.json b/keyboards/soda/cherish/keyboard.json similarity index 95% rename from keyboards/soda/cherish/info.json rename to keyboards/soda/cherish/keyboard.json index 1284c79ce4a..b256e939651 100644 --- a/keyboards/soda/cherish/info.json +++ b/keyboards/soda/cherish/keyboard.json @@ -8,6 +8,21 @@ "pid": "0xEB52", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/soda/cherish/rules.mk b/keyboards/soda/cherish/rules.mk index a8af2d4ebca..04fe1eba2ac 100644 --- a/keyboards/soda/cherish/rules.mk +++ b/keyboards/soda/cherish/rules.mk @@ -1,16 +1,2 @@ -# 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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/keyboard.json similarity index 91% rename from keyboards/spaceholdings/nebula12/info.json rename to keyboards/spaceholdings/nebula12/keyboard.json index 6638498e0c6..2b170e8e618 100755 --- a/keyboards/spaceholdings/nebula12/info.json +++ b/keyboards/spaceholdings/nebula12/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x5337", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/spaceholdings/nebula12/rules.mk b/keyboards/spaceholdings/nebula12/rules.mk index a0b1795cee0..dd548eee148 100755 --- a/keyboards/spaceholdings/nebula12/rules.mk +++ b/keyboards/spaceholdings/nebula12/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Underglow RGB - CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC += keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ drivers/led/issi/is31fl3731.c \ quantum/color.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/keyboard.json similarity index 97% rename from keyboards/spaceholdings/nebula68/info.json rename to keyboards/spaceholdings/nebula68/keyboard.json index dfc61b3a2d1..47cab7a5b02 100755 --- a/keyboards/spaceholdings/nebula68/info.json +++ b/keyboards/spaceholdings/nebula68/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x5336", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "ws2812": { "pin": "A7", "driver": "pwm" diff --git a/keyboards/spaceholdings/nebula68/rules.mk b/keyboards/spaceholdings/nebula68/rules.mk index d2484b627c3..c2507bf03df 100755 --- a/keyboards/spaceholdings/nebula68/rules.mk +++ b/keyboards/spaceholdings/nebula68/rules.mk @@ -3,24 +3,11 @@ # backlight effects. OPT_DEFS += -DNO_SUSPEND_POWER_DOWN -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -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 -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = yes # Underglow RGB - CIE1931_CURVE = yes +I2C_DRIVER_REQUIRED = yes # project specific files SRC += keyboards/wilba_tech/wt_main.c \ keyboards/wilba_tech/wt_rgb_backlight.c \ drivers/led/issi/is31fl3733.c \ quantum/color.c -I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/spaceman/pancake/rev1/feather/info.json b/keyboards/spaceman/pancake/rev1/feather/keyboard.json similarity index 55% rename from keyboards/spaceman/pancake/rev1/feather/info.json rename to keyboards/spaceman/pancake/rev1/feather/keyboard.json index 85f95a011bb..3b82e3d4999 100644 --- a/keyboards/spaceman/pancake/rev1/feather/info.json +++ b/keyboards/spaceman/pancake/rev1/feather/keyboard.json @@ -1,4 +1,13 @@ { + "features": { + "bluetooth": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["C7", "D6", "B7", "B6", "F0", "D2", "D3", "F1", "F4", "F5", "F6", "F7"], "rows": ["B5", "D7", "C6", "D0"] diff --git a/keyboards/spaceman/pancake/rev1/feather/rules.mk b/keyboards/spaceman/pancake/rev1/feather/rules.mk index 35ad61d4a17..bccd7dfa97e 100644 --- a/keyboards/spaceman/pancake/rev1/feather/rules.mk +++ b/keyboards/spaceman/pancake/rev1/feather/rules.mk @@ -1,20 +1,6 @@ # Processor frequency F_CPU = 8000000 -# 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 = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not be enabled -AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port. -BLUETOOTH_ENABLE = yes - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/spaceman/pancake/rev1/promicro/info.json b/keyboards/spaceman/pancake/rev1/promicro/keyboard.json similarity index 52% rename from keyboards/spaceman/pancake/rev1/promicro/info.json rename to keyboards/spaceman/pancake/rev1/promicro/keyboard.json index 47ab8fdcd0a..658eaa39c15 100644 --- a/keyboards/spaceman/pancake/rev1/promicro/info.json +++ b/keyboards/spaceman/pancake/rev1/promicro/keyboard.json @@ -1,4 +1,12 @@ { + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "E6", "B4", "B5", "D7", "C6", "D4", "D0", "D1"], "rows": ["B1", "B3", "B2", "B6"] diff --git a/keyboards/spaceman/pancake/rev1/promicro/rules.mk b/keyboards/spaceman/pancake/rev1/promicro/rules.mk index 96e36eba388..16051206467 100644 --- a/keyboards/spaceman/pancake/rev1/promicro/rules.mk +++ b/keyboards/spaceman/pancake/rev1/promicro/rules.mk @@ -1,16 +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 = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not be enabled -AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port. - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/specskeys/config.h b/keyboards/specskeys/config.h deleted file mode 100644 index 490ac5e5c02..00000000000 --- a/keyboards/specskeys/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Nico - -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 . -*/ - -#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 - -/* - * 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/specskeys/info.json b/keyboards/specskeys/keyboard.json similarity index 95% rename from keyboards/specskeys/info.json rename to keyboards/specskeys/keyboard.json index eb92e6f34fd..104b1ea13d9 100644 --- a/keyboards/specskeys/info.json +++ b/keyboards/specskeys/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0080", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6"], "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/specskeys/rules.mk b/keyboards/specskeys/rules.mk index 05f8c4ece5f..3437a35bdf1 100644 --- a/keyboards/specskeys/rules.mk +++ b/keyboards/specskeys/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# 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 = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/spiderisland/split78/info.json b/keyboards/spiderisland/split78/keyboard.json similarity index 97% rename from keyboards/spiderisland/split78/info.json rename to keyboards/spiderisland/split78/keyboard.json index e507a668b1d..cd49755b0f4 100644 --- a/keyboards/spiderisland/split78/info.json +++ b/keyboards/spiderisland/split78/keyboard.json @@ -8,6 +8,13 @@ "pid": "0xF4E4", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "backlight": { "pin": "D4", "breathing": true diff --git a/keyboards/spiderisland/split78/rules.mk b/keyboards/spiderisland/split78/rules.mk index db8262a763b..2d02998dd10 100644 --- a/keyboards/spiderisland/split78/rules.mk +++ b/keyboards/spiderisland/split78/rules.mk @@ -1,14 +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 -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow - # custom matrix setup CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/spleeb/info.json b/keyboards/spleeb/keyboard.json similarity index 100% rename from keyboards/spleeb/info.json rename to keyboards/spleeb/keyboard.json diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/keyboard.json similarity index 85% rename from keyboards/splitkb/zima/info.json rename to keyboards/splitkb/zima/keyboard.json index 0c6a104c528..68892960da7 100644 --- a/keyboards/splitkb/zima/info.json +++ b/keyboards/splitkb/zima/keyboard.json @@ -8,6 +8,20 @@ "pid": "0xF75B", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "audio": true, + "bootmagic": false, + "encoder": true, + "extrakey": true, + "haptic": true, + "mousekey": false, + "nkro": false, + "oled": true, + "rgblight": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/splitkb/zima/rules.mk b/keyboards/splitkb/zima/rules.mk index 3bcfccdd7bd..dea510c2ab3 100644 --- a/keyboards/splitkb/zima/rules.mk +++ b/keyboards/splitkb/zima/rules.mk @@ -1,19 +1 @@ -# 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 = 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 = yes # Audio output - -ENCODER_ENABLE = yes # ENables the use of one or more encoders -OLED_ENABLE = yes -HAPTIC_ENABLE = yes # Supported but not included by defaut HAPTIC_DRIVER = drv2605l - -LTO_ENABLE = yes diff --git a/keyboards/sthlmkb/lagom/info.json b/keyboards/sthlmkb/lagom/keyboard.json similarity index 100% rename from keyboards/sthlmkb/lagom/info.json rename to keyboards/sthlmkb/lagom/keyboard.json diff --git a/keyboards/sthlmkb/lagom/rules.mk b/keyboards/sthlmkb/lagom/rules.mk index 39bdd537d5d..2e2102e76be 100644 --- a/keyboards/sthlmkb/lagom/rules.mk +++ b/keyboards/sthlmkb/lagom/rules.mk @@ -1,8 +1,4 @@ -# Build Options -# change yes to no to disable -# -CUSTOM_MATRIX = lite # Lite custom matrix - +CUSTOM_MATRIX = lite # Project specific files SRC += matrix.c diff --git a/keyboards/stront/info.json b/keyboards/stront/keyboard.json similarity index 100% rename from keyboards/stront/info.json rename to keyboards/stront/keyboard.json diff --git a/keyboards/supersplit/info.json b/keyboards/supersplit/keyboard.json similarity index 100% rename from keyboards/supersplit/info.json rename to keyboards/supersplit/keyboard.json diff --git a/keyboards/switchplate/southpaw_65/info.json b/keyboards/switchplate/southpaw_65/keyboard.json similarity index 98% rename from keyboards/switchplate/southpaw_65/info.json rename to keyboards/switchplate/southpaw_65/keyboard.json index 19d08ee61a5..fd879349f25 100644 --- a/keyboards/switchplate/southpaw_65/info.json +++ b/keyboards/switchplate/southpaw_65/keyboard.json @@ -8,6 +8,17 @@ "pid": "0x4084", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": false, + "nkro": false, + "rgblight": true + }, "backlight": { "pin": "B5", "levels": 10 diff --git a/keyboards/switchplate/southpaw_65/rules.mk b/keyboards/switchplate/southpaw_65/rules.mk index 89d05c5487e..e11c65db028 100644 --- a/keyboards/switchplate/southpaw_65/rules.mk +++ b/keyboards/switchplate/southpaw_65/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/sx60/info.json b/keyboards/sx60/keyboard.json similarity index 99% rename from keyboards/sx60/info.json rename to keyboards/sx60/keyboard.json index 246d2892f45..42eefbc81a8 100644 --- a/keyboards/sx60/info.json +++ b/keyboards/sx60/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0010", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "backlight": { "pin": "B7" }, diff --git a/keyboards/sx60/rules.mk b/keyboards/sx60/rules.mk index 2f0d22e49f8..394c3372d21 100755 --- a/keyboards/sx60/rules.mk +++ b/keyboards/sx60/rules.mk @@ -1,15 +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 = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no CUSTOM_MATRIX = yes # project specific files diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/keyboard.json similarity index 96% rename from keyboards/system76/launch_1/info.json rename to keyboards/system76/launch_1/keyboard.json index 536b310cc03..28a505448ef 100644 --- a/keyboards/system76/launch_1/info.json +++ b/keyboards/system76/launch_1/keyboard.json @@ -7,6 +7,18 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "bootmagic": false, + "dynamic_keymap": true, + "extrakey": true, + "mousekey": false, + "nkro": true, + "raw": true, + "rgb_matrix": true + }, "ws2812": { "pin": "E2" }, diff --git a/keyboards/system76/launch_1/rules.mk b/keyboards/system76/launch_1/rules.mk index 181976b2ddc..6c4999df373 100644 --- a/keyboards/system76/launch_1/rules.mk +++ b/keyboards/system76/launch_1/rules.mk @@ -4,22 +4,7 @@ F_CPU = 8000000 # External oscillator is 16 MHz F_USB = 16000000 -# Build options -# change yes to no to disable -BOOTMAGIC_ENABLE = no # 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 -DYNAMIC_KEYMAP_ENABLE = yes # Reconfigurable keyboard without flashing firmware -NKRO_ENABLE = yes # USB N-key rollover -RAW_ENABLE = yes # Raw HID commands (used by Keyboard Configurator) -BACKLIGHT_ENABLE = no # RGB backlight (conflicts with RGB matrix) -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # RGB matrix RGB_MATRIX_CUSTOM_KB = yes # Custom keyboard effects -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes # Link-time optimization for smaller binary # Add System76 EC command interface as well as I2C and USB mux drivers SRC += system76_ec.c usb_mux.c From fffe8ee75f29ea15c558e2a4805cfe58cb09f49a Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 17 Apr 2024 07:20:42 +0100 Subject: [PATCH 6/6] Remove *_SUPPORTED = yes (#23541) --- keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/scylla/blackpill/rules.mk | 2 -- keyboards/bastardkb/scylla/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/scylla/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/scylla/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/scylla/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/scylla/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/skeletyl/blackpill/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk | 2 -- keyboards/bastardkb/tbkmini/blackpill/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v1/elitec/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v2/elitec/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk | 2 -- keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk | 2 -- keyboards/crkbd/rules.mk | 7 ------- keyboards/latincompass/latin6rgb/rules.mk | 2 -- keyboards/melgeek/mj65/rev3/rules.mk | 1 - keyboards/montsinger/rebound/rev4/rules.mk | 1 - keyboards/phase_studio/titan65/hotswap/rules.mk | 1 - keyboards/planck/ez/rules.mk | 1 - keyboards/smallkeyboard/rules.mk | 1 - 43 files changed, 86 deletions(-) delete mode 100644 keyboards/smallkeyboard/rules.mk diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk index 1bf0d489a97..d6eda5c2d10 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk index 0869ac07972..7f2338227af 100644 --- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk index 0869ac07972..7f2338227af 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk index 03b7e8ca31a..8753565dfbc 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk index 03b7e8ca31a..8753565dfbc 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk index 1bf0d489a97..d6eda5c2d10 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk index 1bf0d489a97..d6eda5c2d10 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk index 0869ac07972..7f2338227af 100644 --- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk index 0869ac07972..7f2338227af 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk index 03b7e8ca31a..8753565dfbc 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk index 03b7e8ca31a..8753565dfbc 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk index 1bf0d489a97..d6eda5c2d10 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk index e2a00339775..9e797122a74 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported. -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default. -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default. RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk index e1f2bf81f8f..808675da02b 100644 --- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported. -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default. -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default. RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk index e1f2bf81f8f..808675da02b 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported. -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default. -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default. RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk index 03b7e8ca31a..8753565dfbc 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk index 03b7e8ca31a..8753565dfbc 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk index 1bf0d489a97..d6eda5c2d10 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality POINTING_DEVICE_ENABLE = yes # Enable trackball diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk index 20c87fca307..0875a191c5d 100644 --- a/keyboards/bastardkb/scylla/blackpill/rules.mk +++ b/keyboards/bastardkb/scylla/blackpill/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk index 6221b2ef6a5..a8a3e3d5873 100644 --- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk +++ b/keyboards/bastardkb/scylla/v1/elitec/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk index 6221b2ef6a5..a8a3e3d5873 100644 --- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk +++ b/keyboards/bastardkb/scylla/v2/elitec/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk index 83407eef806..d5f1d335c89 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk index 83407eef806..d5f1d335c89 100644 --- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk index ef125eb2fea..3834385af03 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk index 20c87fca307..0875a191c5d 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk +++ b/keyboards/bastardkb/skeletyl/blackpill/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk index 6221b2ef6a5..a8a3e3d5873 100644 --- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk +++ b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk index 6221b2ef6a5..a8a3e3d5873 100644 --- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk index 83407eef806..d5f1d335c89 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk index 83407eef806..d5f1d335c89 100644 --- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk index ef125eb2fea..3834385af03 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = usart diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk index 20c87fca307..0875a191c5d 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk +++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk index 6221b2ef6a5..a8a3e3d5873 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk index 6221b2ef6a5..a8a3e3d5873 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk @@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk index 83407eef806..d5f1d335c89 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk index 83407eef806..d5f1d335c89 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = vendor diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk index ef125eb2fea..3834385af03 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk @@ -12,8 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no # Audio is not supported -RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default -RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality SERIAL_DRIVER = usart diff --git a/keyboards/crkbd/rules.mk b/keyboards/crkbd/rules.mk index a63f102097f..836587e45e6 100644 --- a/keyboards/crkbd/rules.mk +++ b/keyboards/crkbd/rules.mk @@ -1,8 +1 @@ -# Build Options -# change yes to no to disable -# - DEFAULT_FOLDER = crkbd/rev1 - -RGBLIGHT_SUPPORTED = yes -RGB_MATRIX_SUPPORTED = yes diff --git a/keyboards/latincompass/latin6rgb/rules.mk b/keyboards/latincompass/latin6rgb/rules.mk index c05a204a403..3d1f3ae6de1 100644 --- a/keyboards/latincompass/latin6rgb/rules.mk +++ b/keyboards/latincompass/latin6rgb/rules.mk @@ -13,5 +13,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes - -RGB_MATRIX_SUPPORTED = yes diff --git a/keyboards/melgeek/mj65/rev3/rules.mk b/keyboards/melgeek/mj65/rev3/rules.mk index 8b7f40c50b5..d3f22ef58ac 100644 --- a/keyboards/melgeek/mj65/rev3/rules.mk +++ b/keyboards/melgeek/mj65/rev3/rules.mk @@ -1,3 +1,2 @@ -RGB_MATRIX_SUPPORTED = yes RGBLIGHT_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/montsinger/rebound/rev4/rules.mk b/keyboards/montsinger/rebound/rev4/rules.mk index 0fc2e835d76..643c971d472 100644 --- a/keyboards/montsinger/rebound/rev4/rules.mk +++ b/keyboards/montsinger/rebound/rev4/rules.mk @@ -13,6 +13,5 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Disable unsupported hardware -RGBLIGHT_SUPPORTED = yes AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/phase_studio/titan65/hotswap/rules.mk b/keyboards/phase_studio/titan65/hotswap/rules.mk index a3b3ae4eaa8..871008928ea 100644 --- a/keyboards/phase_studio/titan65/hotswap/rules.mk +++ b/keyboards/phase_studio/titan65/hotswap/rules.mk @@ -14,4 +14,3 @@ RGB_MATRIX_ENABLE = yes AUDIO_SUPPORTED = no RGBLIGHT_SUPPORTED = no -RGB_MATRIX_SUPPORTED = yes diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk index 9d3db5cdb72..97f68215f81 100644 --- a/keyboards/planck/ez/rules.mk +++ b/keyboards/planck/ez/rules.mk @@ -14,7 +14,6 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. ENCODER_ENABLE = yes -RGB_MATRIX_SUPPORTED = yes RGBLIGHT_SUPPORTED = no BAKCLIGHT_SUPPORTED = no diff --git a/keyboards/smallkeyboard/rules.mk b/keyboards/smallkeyboard/rules.mk deleted file mode 100644 index 982989bad1d..00000000000 --- a/keyboards/smallkeyboard/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_SUPPORTED = yes